22056: Restore MIME style defaults

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a80c8dff9..81e37b1d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-07  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 22056: Functions/MIME/zsh-mime-handler: restore original default
+	settings for current-shell and never-background styles.
+
 2005-12-07  Clint Adams  <clint@zsh.org>
 
 	* 22054: Completion/Linux/Command/_fusermount:
@@ -33,6 +38,7 @@
 	is not changed; add most-specific zstyle necessary to identify the
 	all-expansions group within _expand_word_and_keep.
 
+>>>>>>> 1.2956
 2005-12-03  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 22049: Src/init.c: "exit" within sourced file within shell
diff --git a/Functions/MIME/zsh-mime-handler b/Functions/MIME/zsh-mime-handler
index 297b637be..0165cc630 100644
--- a/Functions/MIME/zsh-mime-handler
+++ b/Functions/MIME/zsh-mime-handler
@@ -53,12 +53,12 @@ zstyle -s $context flags flags ||
 
 # Set to yes if we use eval instead of sh -c for complicated mailcap lines
 # Can possibly break some mailcap entries which expect sh compatibility,
-# is faster, as a new process is not spawned.
-zstyle -T $context current-shell && no_sh=yes
+# but is faster, as a new process is not spawned.
+zstyle -t $context current-shell && no_sh=yes
 
 # Set to yes if the process shouldn't be backgrounded even if it doesn't need a
 # terminal and display is set.
-zstyle -T $context never-background && no_bg=yes
+zstyle -t $context never-background && no_bg=yes
 
 local -a files
 local hasmeta stdin