aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2003-12-17 10:41:55 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2003-12-17 10:41:55 +0000
commitc2d6f04741c527fc697f44b14b5ce6bf728e9abb (patch)
tree0a8359c4b0cc58adde3cfec03a70c2b15f57a57f
parent066a24c46bbf11032bcdde5f019e415af6505962 (diff)
downloadzsh-c2d6f04741c527fc697f44b14b5ce6bf728e9abb.tar.gz
zsh-c2d6f04741c527fc697f44b14b5ce6bf728e9abb.tar.xz
zsh-c2d6f04741c527fc697f44b14b5ce6bf728e9abb.zip
merge change from 4.1
-rw-r--r--ChangeLog4
-rw-r--r--Completion/X/Command/_mozilla72
2 files changed, 46 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index be9a63e3a..52b809890 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,10 @@
8-bit characters didn't work in character classes where
chars were signed.
+2003-11-21 Oliver Kiddle <opk@zsh.org>
+
+ * 19265: Completion/X/Command/_mozilla: update for newer version
+
2003-11-19 Clint Adams <clint@zsh.org>
* 19258: Doc/Zsh/mod_terminfo.yo, Src/Modules/terminfo.c:
diff --git a/Completion/X/Command/_mozilla b/Completion/X/Command/_mozilla
index 30cfe8dc9..3a7df895b 100644
--- a/Completion/X/Command/_mozilla
+++ b/Completion/X/Command/_mozilla
@@ -1,35 +1,39 @@
-#compdef mozilla
+#compdef mozilla mozilla-firebird mozilla-xremote-client
local curcontext="$curcontext" state line ret=1 suf
typeset -A opt_args
-_x_arguments -C \
- '-height[height of startup window]:height:' \
- '(-h)-help[show usage message]' \
- '(-help)-h[show usage message]' \
- '-installer[start with 4.x migration window]' \
- '-width[width of startup window]:width:' \
- '(-v)-version[show the version number and build date]' \
- '(-version)-v[show the version number and build date]' \
- '-CreateProfile:profile:' \
- '-P[start with profile]:profile:' \
- '-ProfileWizard[start with profile wizard]' \
- '-ProfileManager[start with profile manager]' \
- '-SelectProfile[start with profile selection dialog]' \
- '-UILocale:locale:' \
- '-contentLocale:locale:' \
- '-remote[execute a command in an existing Mozilla]:remote command:->remote' \
- '-splash[enable splash screen]' \
- '-chat[start with IRC client]' \
- '-news[start with news]' \
- '-jsconsole[start with JavaScript Console]' \
- '-venkman[start with JavaScript debugger]' \
- '-terminal[start with command line terminal]' \
- '-edit[start with editor]:url:_urls' \
- '-chrome[load the specified chrome]:url:_urls' \
- '-mail[start with mail]' \
- '-compose[start with messenger compose]:url:_urls' \
- '*:location:->urls' && ret=0
+local popts="-installer -CreateProfile -P -ProfileWizard -ProfileManager -SelectProfile"
+
+if [[ $service = *remote* ]]; then
+ state=remote
+else
+ _x_arguments -C \
+ '-height[height of startup window]:height' \
+ '(-)'{-h,-help}'[show usage message]' \
+ "($popts)-installer[start with 4.x migration window]" \
+ '-width[width of startup window]:width' \
+ '(-)'{-v,-version}'[show the version number and build date]' \
+ "($popts)-CreateProfile:profile" \
+ "($popts)-P[start with profile]:profile:compadd ~/.mozilla/*/*.slt(\:h\:t)" \
+ "($popts)-ProfileWizard[start with profile wizard]" \
+ "($popts)-ProfileManager[start with profile manager]" \
+ "($popts)-SelectProfile[start with profile selection dialog]" \
+ '-UILocale:locale' \
+ '-contentLocale:locale' \
+ '-remote[execute a command in an existing Mozilla]:remote command:->remote' \
+ '-splash[enable splash screen]' \
+ '-chat[start with IRC client]' \
+ '-news[start with news]' \
+ '-jsconsole[start with JavaScript Console]' \
+ '-venkman[start with JavaScript debugger]' \
+ '-terminal[start with command line terminal]' \
+ '-edit[start with editor]:url:_urls' \
+ '-chrome[load the specified chrome]:url:_urls' \
+ '-mail[start with mail]' \
+ '-compose[start with messenger compose]:url:_urls' \
+ '*:location:->urls' && ret=0
+fi
[[ "$state" = "urls" ]] &&
_files "$@" && return 0
@@ -37,7 +41,7 @@ _x_arguments -C \
# Handle mozilla remote commands
if [[ "$state" = "remote" ]]; then
local -a remote_commands
- remote_commands=(openURL openFile saveAs mailto addBookmark)
+ remote_commands=(openURL openFile saveAs mailto addBookmark ping)
compset -P '*\('
if compset -S '(|\\)\)*'; then
@@ -46,7 +50,15 @@ if [[ "$state" = "remote" ]]; then
set - -S"${${QIPREFIX:+)}:-\)}$compstate[quote] " "$@"
fi
case $IPREFIX in
- openURL*|addBookmark*) state=urls;;
+ openURL*)
+ if compset -P "*,"; then
+ _wanted option expl 'option' compadd "$@" new-tab new-window && ret=0
+ else
+ compset -S ',*'
+ state=urls
+ fi
+ ;;
+ addBookmark*) state=urls;;
openFile*) _files "$@" -W ~;;
saveAs*)
if compset -P "*,"; then