summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Functions/MIME/zsh-mime-setup8
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f39330d88..6df46a3e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-18  Clint Adams  <clint@zsh.org>
+
+	* 27048: Functions/MIME/zsh-mime-setup: avoid multiline prints
+	which break CSH_JUNKIE_QUOTES.
+
 2009-06-05  Peter Stephenson  <pws@csr.com>
 
 	* 27305: Functions/Misc/run-help: use POSIXLY_CORRECT with man
@@ -11837,5 +11842,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4714 $
+* $Revision: 1.4715 $
 *****************************************************
diff --git a/Functions/MIME/zsh-mime-setup b/Functions/MIME/zsh-mime-setup
index 59693b09a..7c2269014 100644
--- a/Functions/MIME/zsh-mime-setup
+++ b/Functions/MIME/zsh-mime-setup
@@ -293,8 +293,8 @@ for file in $cap_files; do
 	  else
 	    print -r "Adding" >&2
 	  fi
-	  print -r " handler for type $type:
-  $line" >&2
+	  print -r " handler for type $type:" >&2
+	  print -r "  $line" >&2
 	fi
 	type_handler_map[$type]=$line
 	type_flags_map[$type]=$flags
@@ -305,8 +305,8 @@ for file in $cap_files; do
 	  print -r "  with flags $flags" >&2
 	fi
       elif [[ -n $o_verbose ]]; then
-	print -r "Skipping handler for already defined type $type:
-  $line" >&2
+	print -r "Skipping handler for already defined type $type:" >&2
+	print -r "  $line" >&2
 	if [[ -n $flags ]]; then
 	  print -r " with flags $flags" >&2
 	fi