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) --- 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 +++--- 14 files changed, 36 insertions(+), 36 deletions(-) (limited to 'Completion/Unix/Command') 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 -- cgit 1.4.1