From 61f8a07bfc2348b14a7dc194968fcf62f723f36f Mon Sep 17 00:00:00 2001 From: Sven Wischnowsky Date: Tue, 16 Apr 2002 07:48:43 +0000 Subject: make more calls to _message use the -e option (16988) --- ChangeLog | 25 +++++++++++++++++++++++++ Completion/Base/Utility/_store_cache | 2 +- Completion/Debian/Type/_deb_packages | 2 +- Completion/Redhat/Command/_rpm | 4 ++-- Completion/Unix/Command/_cvs | 14 +++++++------- Completion/Unix/Command/_gs | 6 +++--- Completion/Unix/Command/_java | 2 +- Completion/Unix/Command/_look | 2 +- Completion/Unix/Command/_mysql_utils | 4 ++-- Completion/Unix/Command/_nslookup | 2 +- Completion/Unix/Command/_pbm | 10 +++++----- Completion/Unix/Command/_perl | 2 +- Completion/Unix/Command/_rsync | 2 +- Completion/Unix/Command/_samba | 4 ++-- Completion/Unix/Command/_ssh | 6 +++--- Completion/Unix/Command/_tiff | 2 +- Completion/Unix/Command/_whois | 10 +++++----- Completion/Unix/Command/_yp | 6 +++--- Completion/Unix/Type/_perl_modules | 2 +- Completion/Unix/Type/_urls | 2 +- Completion/X/Command/_x_utils | 6 +++--- Completion/X/Command/_xauth | 6 +++--- Completion/X/Command/_xmodmap | 2 +- Completion/X/Command/_xwit | 4 ++-- Completion/X/Type/_x_borderwidth | 2 +- Completion/X/Type/_x_geometry | 2 +- Completion/X/Type/_x_locale | 2 +- Completion/X/Type/_x_name | 2 +- Completion/X/Type/_x_resource | 2 +- Completion/X/Type/_x_selection_timeout | 2 +- Completion/X/Type/_x_title | 2 +- Completion/X/Type/_xt_session_id | 2 +- Completion/Zsh/Command/_compdef | 2 +- Completion/Zsh/Command/_limit | 2 +- Completion/Zsh/Command/_sched | 2 +- Completion/Zsh/Command/_zstyle | 18 +++++++++--------- Completion/Zsh/Context/_subscript | 2 +- 37 files changed, 97 insertions(+), 72 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2fdf3c32..acaf1e095 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2002-04-16 Sven Wischnowsky + + * 16988: Completion/Base/Utility/_store_cache, + Completion/Debian/Type/_deb_packages, + Completion/Redhat/Command/_rpm, Completion/Unix/Command/_cvs, + Completion/Unix/Command/_gs, Completion/Unix/Command/_java, + Completion/Unix/Command/_look, + Completion/Unix/Command/_mysql_utils, + Completion/Unix/Command/_nslookup, Completion/Unix/Command/_pbm, + Completion/Unix/Command/_perl, Completion/Unix/Command/_rsync, + Completion/Unix/Command/_samba, Completion/Unix/Command/_ssh, + Completion/Unix/Command/_tiff, Completion/Unix/Command/_whois, + Completion/Unix/Command/_yp, Completion/Unix/Type/_perl_modules, + Completion/Unix/Type/_urls, Completion/X/Command/_x_utils, + Completion/X/Command/_xauth, Completion/X/Command/_xmodmap, + Completion/X/Command/_xwit, Completion/X/Type/_x_borderwidth, + Completion/X/Type/_x_geometry, Completion/X/Type/_x_locale, + Completion/X/Type/_x_name, Completion/X/Type/_x_resource, + Completion/X/Type/_x_selection_timeout, + Completion/X/Type/_x_title, Completion/X/Type/_xt_session_id, + Completion/Zsh/Command/_compdef, Completion/Zsh/Command/_limit, + Completion/Zsh/Command/_sched, Completion/Zsh/Command/_zstyle, + Completion/Zsh/Context/_subscript: make more calls to _message + use the -e option + 2002-04-12 Clint Adams * 16973: Completion/Debian/Command/_apt: complete package name diff --git a/Completion/Base/Utility/_store_cache b/Completion/Base/Utility/_store_cache index 2fe7dfcb6..962c4f381 100644 --- a/Completion/Base/Utility/_store_cache +++ b/Completion/Base/Utility/_store_cache @@ -15,7 +15,7 @@ if zstyle -t ":completion:${curcontext}:" use-cache; then else mkdir -p "$_cache_dir" if [[ ! -d "$_cache_dir" ]]; then - _message "Couldn't create cache-dir $_cache_dir" + _message "couldn't create cache-dir $_cache_dir" return 1 fi fi diff --git a/Completion/Debian/Type/_deb_packages b/Completion/Debian/Type/_deb_packages index cc5eaf109..2486a7b0c 100644 --- a/Completion/Debian/Type/_deb_packages +++ b/Completion/Debian/Type/_deb_packages @@ -47,7 +47,7 @@ _deb_packages () { fi [[ "$command" = (installed|uninstalled|avail) ]] || { - _message "_deb_packages:unknown command: $command" + _message "unknown command: $command" return } diff --git a/Completion/Redhat/Command/_rpm b/Completion/Redhat/Command/_rpm index 228480039..893545fbc 100644 --- a/Completion/Redhat/Command/_rpm +++ b/Completion/Redhat/Command/_rpm @@ -237,11 +237,11 @@ _rpm () { compadd -M 'm:{a-z}={A-Z}' -S '\}' - \ "${(@)${(@f)$(_call_program tags rpm --querytags 2> /dev/null)}#RPMTAG_}" && ret=0 else - _message 'RPM format' + _message -e formats 'RPM format' fi ;; capability) - _message 'RPM capability' + _message -e capabilities 'RPM capability' ;; relocate) if compset -P '*='; then diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs index d4768ec73..a18044e90 100644 --- a/Completion/Unix/Command/_cvs +++ b/Completion/Unix/Command/_cvs @@ -115,7 +115,7 @@ _cvs_admin () { (( $+functions[_cvs_admin_t] )) || _cvs_admin_t () { if compset -P -; then - _message 'descriptive text' + _message -e descriptions 'descriptive text' else _files "$@" fi @@ -644,7 +644,7 @@ _cvs_user_variable () { if compset -P '*='; then _default else - _message "variable=value" + _message -e variables "variable" fi } @@ -679,7 +679,7 @@ _cvs_k () { (( $+functions[_cvs_m] )) || _cvs_m () { - _message "log message" + _message -e messages "log message" } (( $+functions[_cvs_modules] )) || @@ -717,7 +717,7 @@ _cvs_top_modules () { _wanted modules expl 'module name' \ compadd -a _cvs_top_modules_cache_mods else - _message 'module name' + _message -e modules 'module name' fi fi } @@ -741,7 +741,7 @@ _cvs_sub_modules () { _wanted modules expl 'module name' \ compadd -qS/ -a _cvs_sub_modules_cache_mods else - _message 'module name' + _message -e modules 'module name' fi fi } @@ -793,7 +793,7 @@ _cvs_vendor_branches () { if (( $#vendor_branch )); then _wanted values expl 'vendor branch' compadd -a vendor_branch else - _message 'vendor branch' + _message -e branches 'vendor branch' fi } @@ -854,7 +854,7 @@ _cvs_revisions () { if (( $#_cvs_revisions_cache )); then _wanted values expl revision compadd -a _cvs_revisions_cache else - _message revision + _message -e revisions revision fi } diff --git a/Completion/Unix/Command/_gs b/Completion/Unix/Command/_gs index 530edbe91..345be0208 100644 --- a/Completion/Unix/Command/_gs +++ b/Completion/Unix/Command/_gs @@ -4,7 +4,7 @@ if compset -N --; then if [[ CURRENT -eq 1 ]]; then _pspdf else - _message 'userdict ARGUMENTS' + _message -e arguments 'userdict ARGUMENTS' return 1 fi else @@ -23,7 +23,7 @@ else case "$state" in dname) if [[ "$PREFIX" = *\=* ]]; then - _message 'systemdict definition value' + _message -e definition-values 'systemdict definition value' else _wanted names expl 'systemdict definition name' \ compadd -M 'm:{a-z}={A-Z}' - \ @@ -43,7 +43,7 @@ else _files "$expl[@]" && ret=0 ;; *) - _message 'systemdict value' + _message -e values 'systemdict value' return 1 esac else diff --git a/Completion/Unix/Command/_java b/Completion/Unix/Command/_java index b7b012894..baa51d16c 100644 --- a/Completion/Unix/Command/_java +++ b/Completion/Unix/Command/_java @@ -499,7 +499,7 @@ property) if compset -P '*='; then _default else - _message 'property name' + _message -e property-names 'property name' fi ;; diff --git a/Completion/Unix/Command/_look b/Completion/Unix/Command/_look index 06cf2c4ec..b80a70824 100644 --- a/Completion/Unix/Command/_look +++ b/Completion/Unix/Command/_look @@ -15,7 +15,7 @@ string) if [[ -n "$PREFIX" ]]; then _wanted values expl 'word prefix' compadd - $(_call_program values $words[1] $PREFIX) else - _message 'word prefix' + _message -e prefixes 'word prefix' fi ;; esac diff --git a/Completion/Unix/Command/_mysql_utils b/Completion/Unix/Command/_mysql_utils index c613583d5..4bd2d2d3e 100644 --- a/Completion/Unix/Command/_mysql_utils +++ b/Completion/Unix/Command/_mysql_utils @@ -214,10 +214,10 @@ _mysqladmin_commands () { _wanted mysqldbs expl "MySQL databases" _mysql_databases ;; (kill) - _message 'thread ids' + _message -e ids 'thread ids' ;; (password) - _message 'new password' + _message -e passwords 'new password' ;; esac fi diff --git a/Completion/Unix/Command/_nslookup b/Completion/Unix/Command/_nslookup index 45f878b54..9bc80ab2b 100644 --- a/Completion/Unix/Command/_nslookup +++ b/Completion/Unix/Command/_nslookup @@ -94,7 +94,7 @@ if [[ -n "$compcontext" ]]; then return 1 ;; finger) - _message 'finger name' + _message -e names 'finger name' return 1 ;; ls) diff --git a/Completion/Unix/Command/_pbm b/Completion/Unix/Command/_pbm index 388249f9d..c33e09140 100644 --- a/Completion/Unix/Command/_pbm +++ b/Completion/Unix/Command/_pbm @@ -69,7 +69,7 @@ macptopbm) pbmclean) if [[ "$PREFIX" = -* ]]; then - _message 'maximum number of identical neighbours' + _message -e neighbours 'maximum number of identical neighbours' else _pbm fi @@ -344,12 +344,12 @@ pnmflip) pnmgamma) if [[ CURRENT -eq 2 ]]; then - _message 'gamma value or red gamma value' + _message -e gamma-values 'gamma value or red gamma value' elif [[ CURRENT -eq 3 ]]; then _pbm && ret=0 - _message 'green gamma value' + _message -e gamma-values 'green gamma value' elif [[ CURRENT -eq 4 ]]; then - _message 'blue gamma value' + _message -e gamma-values 'blue gamma value' elif [[ CURRENT -eq 5 ]]; then _pbm && ret=0 fi @@ -592,7 +592,7 @@ ppmquant) else _wanted options expl option compadd - -map && ret=0 fi - _message 'number of colors' + _message -e numbers 'number of colors' return ret elif [[ CURRENT -eq 3 && "$words[2]" = -map ]]; then diff --git a/Completion/Unix/Command/_perl b/Completion/Unix/Command/_perl index 29016e333..3bffafcce 100644 --- a/Completion/Unix/Command/_perl +++ b/Completion/Unix/Command/_perl @@ -39,7 +39,7 @@ _perl_m_opt () { compset -P '-' if compset -P '*='; then - _message 'module arguments, comma separated' + _message -e module-arguments 'module arguments, comma separated' else _perl_modules -S= -q fi diff --git a/Completion/Unix/Command/_rsync b/Completion/Unix/Command/_rsync index 5f2e87fb8..d111b38ba 100644 --- a/Completion/Unix/Command/_rsync +++ b/Completion/Unix/Command/_rsync @@ -48,7 +48,7 @@ elif [[ -prefix 1 *: ]]; then _wanted files expl 'remote files and directories' \ compadd -S/ -d remdispd ${${(M)remfiles:#*/}/\\/(#e)/} else - _message 'remote files' + _message -e remote-files 'remote files' fi elif [[ -prefix 1 *@ ]]; then diff --git a/Completion/Unix/Command/_samba b/Completion/Unix/Command/_samba index 8e9d4aefe..faad69ba4 100644 --- a/Completion/Unix/Command/_samba +++ b/Completion/Unix/Command/_samba @@ -19,8 +19,8 @@ case $service in profile) _wanted parameter expl 'parameter' compadd on off flush count ;; - debug) _message 'debug level' ;; - ping) _message 'number of ping messages' ;; + debug) _message -e levels 'debug level' ;; + ping) _message -e numbers 'number of ping messages' ;; esac ;; *) diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh index 2d0ad0fe1..80f4100c9 100644 --- a/Completion/Unix/Command/_ssh +++ b/Completion/Unix/Command/_ssh @@ -23,7 +23,7 @@ _remote_files () { (( ret )) || return 0 done else - _message 'remote file' + _message -e remote-files 'remote file' fi } @@ -229,12 +229,12 @@ _ssh () { forward) if compset -P 1 '*:'; then if compset -P '*:'; then - _message 'port number' + _message -e port-numbers 'port number' else _wanted hosts expl host _ssh_hosts -qS: fi else - _message 'listen-port number' + _message -e port-numbers 'listen-port number' fi return ;; diff --git a/Completion/Unix/Command/_tiff b/Completion/Unix/Command/_tiff index c5c7c3c35..0b3d55df3 100644 --- a/Completion/Unix/Command/_tiff +++ b/Completion/Unix/Command/_tiff @@ -185,7 +185,7 @@ if [[ -n "$state" ]]; then 'fill[byte-align EOL codes]' && ret=0 ;; jpeg) - _message 'compression quality (0-100), or `r'"'"' (output RGB)' + _message -e values 'compression quality (0-100), or `r'"'"' (output RGB)' ret=0 ;; lzw|zip) diff --git a/Completion/Unix/Command/_whois b/Completion/Unix/Command/_whois index 76d5a5b4a..2dd04f9cd 100644 --- a/Completion/Unix/Command/_whois +++ b/Completion/Unix/Command/_whois @@ -137,7 +137,7 @@ _whois_single () { if (( $+functions[_whois:$host] )); then "_whois:$host" "$expl[@]" else - _message "identifier" + _message -e identifiers "identifier" fi ;; esac @@ -164,7 +164,7 @@ _whois_multi () { if (( $+functions[_whois:$host] )); then "_whois:$host" "$expl[@]" else - _message "identifier" + _message -e identifiers "identifier" fi ;; esac @@ -183,7 +183,7 @@ _whois_fwhois () { if (( $+functions[_whois:$host] )); then "_whois:$host" "$@" else - _message "identifier" + _message -e identifiers "identifier" fi fi } @@ -206,7 +206,7 @@ _whois:whois.internic.net () { _wanted strings expl string compadd HELP DOMAIN HOST else - _message 'string' + _message -e strings 'string' fi } @@ -217,7 +217,7 @@ _whois:whois.nic.ad.jp () { _wanted strings expl string compadd HELP DOM NET HOST PERSON CONN COM else - _message 'string' + _message -e strings 'string' fi } diff --git a/Completion/Unix/Command/_yp b/Completion/Unix/Command/_yp index 96e50ebb4..128de36b7 100644 --- a/Completion/Unix/Command/_yp +++ b/Completion/Unix/Command/_yp @@ -78,12 +78,12 @@ ypxfr) ':map name:->map' && ret=0 ;; domainname) - _message 'new domain name' + _message -e new-domains 'new domain name' return 1 ;; esac -[[ "$state" = keymap ]] && _message 'key' +[[ "$state" = keymap ]] && _message -e keys 'key' if [[ "$state" = map* ]]; then local expl @@ -107,7 +107,7 @@ elif [[ "$state" = servers ]]; then if compset -P '*,'; then _wanted hosts expl server _hosts -qS, && ret=0 else - _message 'domain name' + _message -e domains 'domain name' fi fi diff --git a/Completion/Unix/Type/_perl_modules b/Completion/Unix/Type/_perl_modules index 9bfc0463d..7e4a206c9 100644 --- a/Completion/Unix/Type/_perl_modules +++ b/Completion/Unix/Type/_perl_modules @@ -56,7 +56,7 @@ _perl_modules () { else # If perl isn't there, one wonders why the user's trying to # complete Perl modules. Maybe her $path is wrong? - _message "Didn't find perl on \$PATH; guessing @INC ..." + _message "didn't find perl on \$PATH; guessing @INC ..." inc=( /usr/lib/perl5{,/{site_perl/,}<5->.([0-9]##)}(N) ${(s.:.)PERL5LIB} ) diff --git a/Completion/Unix/Type/_urls b/Completion/Unix/Type/_urls index 32b994c76..e6e9a38d4 100644 --- a/Completion/Unix/Type/_urls +++ b/Completion/Unix/Type/_urls @@ -137,7 +137,7 @@ if ! compset -P '(#b)([^:/]#)([:/])'; then fi host="$match[1]" -[[ $match[2] = ':' ]] && ! compset -P '<->/' && _message 'port number' && return 0 +[[ $match[2] = ':' ]] && ! compset -P '<->/' && _message -e ports 'port number' && return 0 # Complete part after hostname diff --git a/Completion/X/Command/_x_utils b/Completion/X/Command/_x_utils index e286dd3b3..183f5efb9 100644 --- a/Completion/X/Command/_x_utils +++ b/Completion/X/Command/_x_utils @@ -88,9 +88,9 @@ xhost) case "$type" in inet) _hosts && ret=0;; - dnet) _message 'DECnet host';; - nis) _message 'Secure RPC network name';; - krb) _message 'Kerberos V5 principal';; + dnet) _message -e decnet-hosts 'DECnet host';; + nis) _message -e network-names 'Secure RPC network name';; + krb) _message -e principals 'Kerberos V5 principal';; esac else _alternative \ diff --git a/Completion/X/Command/_xauth b/Completion/X/Command/_xauth index d702e5f0a..14dfc8400 100644 --- a/Completion/X/Command/_xauth +++ b/Completion/X/Command/_xauth @@ -37,9 +37,9 @@ while [[ -n "$state" ]]; do state=protocolname else case "$words[CURRENT-1]" in - timeout) _message 'timeout(seconds)';; - group) _message 'group-id';; - data) _message 'hexdata';; + timeout) _message -e values 'timeout (seconds)';; + group) _message -e ids 'group-id';; + data) _message -e values 'hexdata';; *) _wanted options expl 'xauth generate options' \ compadd trusted untrusted timeout group data && ret=0 diff --git a/Completion/X/Command/_xmodmap b/Completion/X/Command/_xmodmap index 5c7fcf3fe..928b6b243 100644 --- a/Completion/X/Command/_xmodmap +++ b/Completion/X/Command/_xmodmap @@ -27,7 +27,7 @@ if [[ -n "$state" ]]; then PREFIX='' compadd -S ' ' '=' && ret=0 else - _message 'key code or `any'"'" + _message -e keys 'key code or `any'"'" fi ;; keysym*) diff --git a/Completion/X/Command/_xwit b/Completion/X/Command/_xwit index 8676ef484..5c6a7f650 100644 --- a/Completion/X/Command/_xwit +++ b/Completion/X/Command/_xwit @@ -70,9 +70,9 @@ _regex_arguments _xwit_parse \ "/$word/" ':option-iconmove-y:y:' \ \| "/-id$nul/" "$guard" "/$word/" ':option-id:window id:_x_window' \ \| "/-(no|)keyrepeat$nul/" "$guard" \ - \( "/[0-9]##$nul/" ':option-keyrepeat-keycode:keycode:{[[ -prefix [0-9]# ]] && _message keycode}' \ + \( "/[0-9]##$nul/" ':option-keyrepeat-keycode:keycode:{[[ -prefix [0-9]# ]] && _message -e keycodes keycode}' \ \( "/-$nul/" "/[0-9]##$nul/" \ - ':option-keyrepeat-last-keycode:last keycode:{[[ -prefix [0-9]# ]] && _message "last keycode"}' \| \) \) \# \ + ':option-keyrepeat-last-keycode:last keycode:{[[ -prefix [0-9]# ]] && _message -e keycodes "last keycode"}' \| \) \) \# \ \| "/-names$nul/" "$guard" \ "/$word/" ':option-names:window name:_x_window -n' \# \ \| "/[]/" ':options:option:_xwit_compopts' \ diff --git a/Completion/X/Type/_x_borderwidth b/Completion/X/Type/_x_borderwidth index c2f0eec83..9e20f0258 100644 --- a/Completion/X/Type/_x_borderwidth +++ b/Completion/X/Type/_x_borderwidth @@ -5,5 +5,5 @@ local x="$argv[(I)-X]" if (( x )); then _message -r "$argv[x + 1]" else - _message 'border width' + _message -e values 'border width' fi diff --git a/Completion/X/Type/_x_geometry b/Completion/X/Type/_x_geometry index a15dd16d9..32ea9cb1a 100644 --- a/Completion/X/Type/_x_geometry +++ b/Completion/X/Type/_x_geometry @@ -5,5 +5,5 @@ local x="$argv[(I)-X]" if (( x )); then _message -r "$argv[x + 1]" else - _message 'geometry' + _message -e geometries 'geometry' fi diff --git a/Completion/X/Type/_x_locale b/Completion/X/Type/_x_locale index 2321b1a5b..be8eded8d 100644 --- a/Completion/X/Type/_x_locale +++ b/Completion/X/Type/_x_locale @@ -5,5 +5,5 @@ local x="$argv[(I)-X]" if (( x )); then _message -r "$argv[x + 1]" else - _message 'locale' + _message -e locales 'locale' fi diff --git a/Completion/X/Type/_x_name b/Completion/X/Type/_x_name index 38d4c26d3..58626fde6 100644 --- a/Completion/X/Type/_x_name +++ b/Completion/X/Type/_x_name @@ -5,5 +5,5 @@ local x="$argv[(I)-X]" if (( x )); then _message -r "$argv[x + 1]" else - _message 'name' + _message -e names 'name' fi diff --git a/Completion/X/Type/_x_resource b/Completion/X/Type/_x_resource index a0b8e0f21..0aa3ae9ac 100644 --- a/Completion/X/Type/_x_resource +++ b/Completion/X/Type/_x_resource @@ -5,5 +5,5 @@ local x="$argv[(I)-X]" if (( x )); then _message -r "$argv[x + 1]" else - _message 'resource' + _message -e resources 'resource' fi diff --git a/Completion/X/Type/_x_selection_timeout b/Completion/X/Type/_x_selection_timeout index d6dfd8a13..6430b301e 100644 --- a/Completion/X/Type/_x_selection_timeout +++ b/Completion/X/Type/_x_selection_timeout @@ -5,5 +5,5 @@ local x="$argv[(I)-X]" if (( x )); then _message -r "$argv[x + 1]" else - _message 'selection timeout' + _message -e values 'selection timeout' fi diff --git a/Completion/X/Type/_x_title b/Completion/X/Type/_x_title index fe2ab7b9f..fd73db68c 100644 --- a/Completion/X/Type/_x_title +++ b/Completion/X/Type/_x_title @@ -5,5 +5,5 @@ local x="$argv[(I)-X]" if (( x )); then _message -r "$argv[x + 1]" else - _message 'title' + _message -e titles 'title' fi diff --git a/Completion/X/Type/_xt_session_id b/Completion/X/Type/_xt_session_id index fcb0192ef..3db911c7e 100644 --- a/Completion/X/Type/_xt_session_id +++ b/Completion/X/Type/_xt_session_id @@ -1,3 +1,3 @@ #autoload -_message 'session ID' +_message -e ids 'session ID' diff --git a/Completion/Zsh/Command/_compdef b/Completion/Zsh/Command/_compdef index 469b135c4..aad1358b9 100644 --- a/Completion/Zsh/Command/_compdef +++ b/Completion/Zsh/Command/_compdef @@ -36,7 +36,7 @@ _arguments -C -s -S \ if [[ $state = multi ]]; then case $(( CURRENT % 3 )) in - 0) _message key + 0) _message -e keys key return 1;; 1) state=cfun;; 2) state=style;; diff --git a/Completion/Zsh/Command/_limit b/Completion/Zsh/Command/_limit index ba384f980..852c55c1c 100644 --- a/Completion/Zsh/Command/_limit +++ b/Completion/Zsh/Command/_limit @@ -5,5 +5,5 @@ if ! ((CURRENT % 2)); then elif [[ $PREFIX = u* ]]; then compadd unlimited else - _message "number and scaling factor" + _message -e values "number and scaling factor" fi diff --git a/Completion/Zsh/Command/_sched b/Completion/Zsh/Command/_sched index 82b8a7c91..e8ff5ab87 100644 --- a/Completion/Zsh/Command/_sched +++ b/Completion/Zsh/Command/_sched @@ -14,7 +14,7 @@ if [[ CURRENT -eq 2 ]]; then compadd "$disp[@]" - {1..$#lines} return else - _message 'time specification' + _message -e times 'time specification' return 1 fi fi diff --git a/Completion/Zsh/Command/_zstyle b/Completion/Zsh/Command/_zstyle index 5abfe824e..99ee8f72b 100644 --- a/Completion/Zsh/Command/_zstyle +++ b/Completion/Zsh/Command/_zstyle @@ -197,7 +197,7 @@ while (( $#state )); do ;; argument) - _message argument + _message -e arguments argument ;; bool) @@ -290,9 +290,9 @@ while (( $#state )); do tag-order) if compset -P '*:*:'; then - _message description + _message -e descriptions description elif compset -P '*:'; then - _message 'tag alias' + _message -e aliases 'tag alias' else suf=() compset -S ':*' || suf=( -qS: ) @@ -302,11 +302,11 @@ while (( $#state )); do filepat) if compset -P '*:*:'; then - _message description + _message -e descriptions description elif compset -P '*:'; then - _message tag + _message -e tags tag else - _message 'glob patterns' + _message -e patterns 'glob patterns' fi ;; @@ -341,7 +341,7 @@ while (( $#state )); do ;; fake-files) - _message 'prefix and names' + _message -e fakes 'prefix and names' ;; fake-params) @@ -375,11 +375,11 @@ while (( $#state )); do ;; preserve-prefix) - _message 'pattern matching prefix to keep' + _message -e prefixes 'pattern matching prefix to keep' ;; separator) - _message 'separator string' + _message -e separators 'separator string' ;; urgh) diff --git a/Completion/Zsh/Context/_subscript b/Completion/Zsh/Context/_subscript index 052848ffe..84510d263 100644 --- a/Completion/Zsh/Context/_subscript +++ b/Completion/Zsh/Context/_subscript @@ -22,7 +22,7 @@ elif compset -P '\('; then local f=$match[1] d=$match[2] e=$match[2] v=$match[3] [[ $f = s && ${(Pt)${compstate[parameter]}} != scalar* ]] && return 1 if [[ -z $d ]]; then - _message 'delimiter' + _message -e delimiters 'delimiter' return else case $d in -- cgit 1.4.1