From e66dce41bccc73867efde01958d8d51f11041706 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Sun, 19 Feb 2006 21:20:43 +0000
Subject: 22285: assorted fixes: _imagemagick files intro.yo list of other
 manual pages pick-web-browser: add firefox zsh-mime-setup: list consistent
 with styles for zsh-mime-handler

---
 ChangeLog                            | 11 +++++++++++
 Completion/Unix/Command/_imagemagick |  2 +-
 Doc/Zsh/intro.yo                     |  2 ++
 Functions/MIME/pick-web-browser      |  5 ++++-
 Functions/MIME/zsh-mime-setup        | 16 ++++++++++++----
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf97827a2..f7ececb92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-19  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 22285:
+	Completion/Unix/Command/_imagemagick: handling of file arguments
+	didn't work.
+	Doc/Zsh/intro.yo: zshtcpsys and zshcontrib manual pages weren't
+	listed.
+	Functions/MIME/pick-web-browser: add Firefox.
+	Functions/MIME/zsh-mime-setup: take account of handler and flags
+	styles when listing.
+	
 2006-02-19  Clint Adams  <clint@zsh.org>
 
 	* 22284: configure.ac, Src/glob.c, Src/hashtable.c, Src/init.c,
diff --git a/Completion/Unix/Command/_imagemagick b/Completion/Unix/Command/_imagemagick
index 5abae4425..56d530326 100644
--- a/Completion/Unix/Command/_imagemagick
+++ b/Completion/Unix/Command/_imagemagick
@@ -14,7 +14,7 @@ typeset -A opt_args
 formats=jpg:jpeg:tiff:miff:ras:bmp:cgm:dcx:ps:eps:fig:fits:fpx:gif:mpeg:pbm:pgm:ppm:pcd:pcl:pdf:pcx:png:rad:rgb:rgba:rle:sgi:html:shtml:tga:ttf:uil:xwd:xbm:xpm:yuv
 
 if (( $# )); then
-  _files "$@" "$expl[@]" -g '*.(#i)(${~format//:/|})(-.)'
+  _files "$@" -g "*.(#i)(${~formats//:/|})(-.)"
   return
 fi
 
diff --git a/Doc/Zsh/intro.yo b/Doc/Zsh/intro.yo
index 065f53b0e..c56dcaedd 100644
--- a/Doc/Zsh/intro.yo
+++ b/Doc/Zsh/intro.yo
@@ -26,7 +26,9 @@ list(em(zshcompwid)   Zsh completion widgets)
 list(em(zshcompsys)   Zsh completion system)
 list(em(zshcompctl)   Zsh completion control)
 list(em(zshmodules)   Zsh loadable modules)
+list(em(zshtcpsys)    Zsh built-in TCP functions)
 list(em(zshzftpsys)   Zsh built-in FTP client)
+list(em(zshcontrib)   Additional zsh functions and utilities)
 ifzshone(\
 list(em(zshall)       Meta-man page containing all of the above)
 )\
diff --git a/Functions/MIME/pick-web-browser b/Functions/MIME/pick-web-browser
index 1a73b4de7..665b0db54 100644
--- a/Functions/MIME/pick-web-browser
+++ b/Functions/MIME/pick-web-browser
@@ -28,7 +28,7 @@ local -a xbrowsers ttybrowsers
 # a remote URL.  You can change the order of preference.
 # If none is already running, starts the first in the array.
 zstyle -a :mime: x-browsers xbrowsers ||
-  xbrowsers=(mozilla netscape opera konqueror)
+  xbrowsers=(firefox mozilla netscape opera konqueror)
 # Preferred command line browser.  Used if there is on $DISPLAY set.
 zstyle -a :mime: tty-browsers ttybrowsers ||
   ttybrowsers=(links lynx)
@@ -89,6 +89,9 @@ if [[ -n $DISPLAY ]]; then
 	# MIME handling, not just web pages.
 	kfmclient openURL $url ||
 	  dcop $(dcop|grep konqueror) default openBrowserWindow $url
+      elif [[ $browser = firefox ]]; then
+	  # open in new tab: should make this customizable
+	  $browser -new-tab $url
       else
 	# Mozilla bells and whistles are described at:
 	# http://www.mozilla.org/unix/remote.html
diff --git a/Functions/MIME/zsh-mime-setup b/Functions/MIME/zsh-mime-setup
index 150d4c07f..9a3e69610 100644
--- a/Functions/MIME/zsh-mime-setup
+++ b/Functions/MIME/zsh-mime-setup
@@ -32,11 +32,19 @@ done
 
 
 if [[ -n $o_list ]]; then
-  # List and return.
+  # List and return.  Remember that suffixes may be overridden by styles.
+  # However, we require some sort of standard handler to be present,
+  # so we don't need to search styles for suffixes that aren't
+  # handled.  Yet.
+  local list_word
   for suffix in ${(ko)zsh_mime_handlers}; do
-      print ${(r.10.)suffix}${zsh_mime_handlers[$suffix]}
-      if [[ -n ${zsh_mime_flags[$suffix]} ]]; then
-	print "  flags: ${zsh_mime_flags[$suffix]}"
+      zstyle -s ":mime:.$suffix:" handler list_word ||
+        list_word=${zsh_mime_handlers[$suffix]}
+      print ${(r.10.)suffix}$list_word
+      zstyle -s ":mime:.$suffix:" flags list_word ||
+        list_word=${zsh_mime_flags[$suffix]}
+      if [[ -n $list_word ]]; then
+	print "  flags: $list_word"
       fi
   done
   return 0
-- 
cgit 1.4.1