summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Unix/Command/_screen8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a7d28943..e5a483d90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2005-06-11 Doug Kearns <djkea2@gus.gscit.monash.edu.au>
+ * 21320: Completion/Unix/Command/_screen: complete -D and -R with the
+ appropriate session types; fix incorrect completion of -c and -dmS
+ options
+
* 21321: Completion/Unix/Command/_antiword: update antiword completion
for version 0.36
diff --git a/Completion/Unix/Command/_screen b/Completion/Unix/Command/_screen
index c2ecd0382..43747fcf8 100644
--- a/Completion/Unix/Command/_screen
+++ b/Completion/Unix/Command/_screen
@@ -58,10 +58,10 @@ scr_cmds=(
_arguments -C \
"-a[force all capabilities into each window's termcap]" \
'-A[adapt all windows to the new display width & height]' \
- "-c[read configuration file instead of '.screenrc']:config file:_files -/" \
+ "-c[read configuration file instead of '.screenrc']:config file:_files" \
'-d[detach the elsewhere running screen (with -r: reattach here)]: :->attached-sessions' \
- '-dmS[start as daemon, screen session in detached mode]: :->detached-sessions' \
- '-D[detach and logout remote (with -r: reattach here)]' \
+ '-dmS[start as daemon, screen session in detached mode]:session name' \
+ '-D[detach and logout remote (with -r: reattach here)]: :->attached-sessions' \
'-e[change command characters]:command characters' \
'-f-[set flow control]:flow control:((n\:flow\ control\ off a\:flow\ control\ auto \:flow\ control\ on))' \
'-h[set the size of the scrollback history buffer]:buffer size' \
@@ -75,7 +75,7 @@ _arguments -C \
'-p[preselect the named window]:window number or name:((\=\:windowlist -\:blank\ window \:window\ number))' \
'-q[quiet startup, exit with non-zero return code if unsuccessful]' \
'-r[reattach to a detached screen process]: :->detached-sessions' \
- '-R[reattach if possible, otherwise start a new session]' \
+ '-R[reattach if possible, otherwise start a new session]: :->detached-sessions' \
'-s[shell to execute rather than $SHELL]:shell name: _command_names -e' \
'-S[name this session <pid>.sockname instead of <pid>.<tty>.<host>]:session name' \
"-t[set title (window's name)]:title" \