about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_webbrowser2
-rw-r--r--Completion/X/Command/_mozilla17
3 files changed, 24 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 96a00c031..6ec6f2cb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-08  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* based on 23038: Completion/Unix/Command/_webbrowser,
+	Completion/X/Command/_mozilla: remove firefox from _webbrowser,
+	it's handled by Completion/X/Command/_mozilla; add some
+	firefox-specific options.
+
 2006-12-08  Clint Adams  <clint@zsh.org>
 
 	* 23039: Completion/X/Command/_mozilla: handle iceweasel as
diff --git a/Completion/Unix/Command/_webbrowser b/Completion/Unix/Command/_webbrowser
index 112838612..d97d5457a 100644
--- a/Completion/Unix/Command/_webbrowser
+++ b/Completion/Unix/Command/_webbrowser
@@ -1,3 +1,3 @@
-#compdef amaya arena chimera dillo express firefox galeon grail gzilla hotjava konqueror light mmm Mosaic netrik opera phoenix retawq skipstone www xmosaic zen
+#compdef amaya arena chimera dillo express galeon grail gzilla hotjava konqueror light mmm Mosaic netrik opera phoenix retawq skipstone www xmosaic zen
 
 _alternative 'files:file:_files' 'urls:URL:_urls'
diff --git a/Completion/X/Command/_mozilla b/Completion/X/Command/_mozilla
index 2972870e4..eef72d2aa 100644
--- a/Completion/X/Command/_mozilla
+++ b/Completion/X/Command/_mozilla
@@ -9,7 +9,22 @@ local -a mozopts
 if [[ $service = *remote* ]]; then
   state=remote
 else
-  if [[ $service != *firefox* ]]; then
+  if [[ $service = *firefox* ]]; then
+    mozopts=(
+    '-browser[open browser window]' \
+    '-console[start with debugging console]' \
+    '-h[output help message]' \
+    '-help[output help message]' \
+    '-inspector[start with DOM Inspector]:URL to inspect:->location' \
+    '-install-global-extension[install an extension]:extension to install:_files' \
+    '-new-window[load URL in new window]:URL to load:->location' \
+    '-new-tab[load URL in new tab]:URL to load:->location' \
+    '-no-remote[run with multiple profiles]' \
+    '-profile[specify profile file]:profile file:_files' \
+    '-v[show version]' \
+    '-version[show version]' \
+    )
+  else
     mozopts=(
       "($popts)-installer[start with 4.x migration window]"
       "($popts)-CreateProfile:profile"