aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2003-12-17 10:50:00 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2003-12-17 10:50:00 +0000
commitf93857ab6585d1042eb422e99eead7159666e269 (patch)
tree3fa68a53b39888278d18822947ae8db23d801324
parentc2d6f04741c527fc697f44b14b5ce6bf728e9abb (diff)
downloadzsh-f93857ab6585d1042eb422e99eead7159666e269.tar.gz
zsh-f93857ab6585d1042eb422e99eead7159666e269.tar.xz
zsh-f93857ab6585d1042eb422e99eead7159666e269.zip
merge changes from 4.1
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Unix/Command/_elinks1
-rw-r--r--Completion/Unix/Command/_screen30
3 files changed, 22 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 52b809890..ecf2606d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,10 +31,16 @@
8-bit characters didn't work in character classes where
chars were signed.
+2003-11-28 Doug Kearns <djkea2@mugca.its.monash.edu.au>
+
+ * unposted: Completion/Unix/Command/_elinks: update for version 0.4.3
+
2003-11-21 Oliver Kiddle <opk@zsh.org>
* 19265: Completion/X/Command/_mozilla: update for newer version
+ * unposted: Completion/Unix/Command/_screen: tidy up descriptions
+
2003-11-19 Clint Adams <clint@zsh.org>
* 19258: Doc/Zsh/mod_terminfo.yo, Src/Modules/terminfo.c:
diff --git a/Completion/Unix/Command/_elinks b/Completion/Unix/Command/_elinks
index 6e2832daf..b3e204261 100644
--- a/Completion/Unix/Command/_elinks
+++ b/Completion/Unix/Command/_elinks
@@ -14,6 +14,7 @@ _arguments -C -A '-*' \
'*-dump-charset[codepage to use with -dump]:codepage:' \
'*-dump-width[width of document formatted with -dump]:width:' \
'*-eval[evaluate given configuration option]:configuration option:' \
+ '*-force-html[assume the file is HTML]' \
'(- 1)-'{\?,h,help}'[print usage help and exit]' \
'(- 1)-long-help[print detailed usage help and exit]' \
'(- 1)-config-help[print help for configuration options]' \
diff --git a/Completion/Unix/Command/_screen b/Completion/Unix/Command/_screen
index 6995dfdec..173e1a45b 100644
--- a/Completion/Unix/Command/_screen
+++ b/Completion/Unix/Command/_screen
@@ -39,44 +39,44 @@ scr_cmds=(
windows wrap writebuf writelock xoff
xon zombie
)
-
+
_arguments \
"-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 -/" \
'-d[detach the elsewhere running screen (with -r: reattach here)]:session name:->sessionname' \
- '-dmS[start as daemon, screen session in detached mode]' \
+ '-dmS[start as daemon, screen session in detached mode]:session name:->sessionname' \
'-D[detach and logout remote (with -r: reattach here)]' \
- '-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:' \
+ '-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' \
'-i[interrupt output sooner when flow control is on]' \
- '(-l)-ln[login mode off (do not update /var/run/utmp)]' \
- '(-ln)-l[login mode on (update /var/run/utmp)]' \
+ '(-l)-ln[login mode off (do not update utmp database)]' \
+ '(-ln)-l[login mode on (update utmp database)]' \
'(-)'{-ls,-list}'[list sessions/socket directory]' \
"-L[terminal's last character can be safely updated]" \
'-m[ignore $STY variable, do create a new screen session]' \
'-O[choose optimal output rather than exact vt100 emulation]' \
- '-p[preselect the named window]:window number or name:(( \=\:windowlist -\:blank\ window \:window\ number))' \
- '-q[quiet startup. exits with non-zero return code if unsuccessful]' \
+ '-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]:session name:->sessionname' \
'-R[reattach if possible, otherwise start a new session]' \
'-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:" \
+ '-S[name this session <pid>.sockname instead of <pid>.<tty>.<host>]:session name' \
+ "-t[set title (window's name)]:title" \
'-T[use term as $TERM for windows, rather than "screen"]:terminal type:_terminals' \
'-U[tell screen to use UTF-8 encoding]' \
'(-)-v[print screen version]' \
'(-)-wipe[do nothing, clean up SockDir]' \
- '-x[attach to a not detached screen. (Multi display mode).]' \
- '-X[execute <cmd> as a screen command in the specified session.]:screencmd:(${scr_cmds[@]})' \
+ '-x[attach to a not detached screen (multi display mode)]' \
+ '-X[execute command as a screen command in the specified session]:screencmd:(${scr_cmds[@]})' \
'*::arguments: _normal'
case $state in
sessionname)
# Complete session names
local screendir
- screendir=( ${${${(M)${(f)"$(_call_program screen-session $words[1] -ls)"}:#*Socket*}%.}##* } )
- _wanted screen-session expl 'screen process' _path_files -W screendir
+ screendir=( ${${${(M)${(f)"$(_call_program screen-sessions $words[1] -ls)"}:#*Socket*}%.}##* } )
+ _wanted screen-sessions expl 'screen process' _path_files -W screendir
;;
esac