From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 28 Jan 2009 15:54:46 +0000 (+0000)
Subject: (rmail-toggle-header): Don't reset
X-Git-Tag: emacs-pretest-23.0.90~110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8372c367bd2829d8c8a45d95c5446dfd915f6495;p=emacs.git

(rmail-toggle-header): Don't reset
rmail-header-style permanently (bug#2016).
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index efd3044b653..e29ac965947 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2368,12 +2368,12 @@ the message.  Point is at the beginning of the message."
 With argument ARG, show the message header pruned if ARG is greater than zero;
 otherwise, show it in full."
   (interactive "P")
-  (setq rmail-header-style
-	(cond
-	 ((and (numberp arg) (> arg 0)) 'normal)
-	 ((eq rmail-header-style 'full) 'normal)
-	 (t 'full)))
-  (rmail-show-message-maybe))
+  (let ((rmail-header-style
+	 (cond
+	  ((and (numberp arg) (> arg 0)) 'normal)
+	  ((eq rmail-header-style 'full) 'normal)
+	  (t 'full))))
+    (rmail-show-message-maybe)))
 
 (defun rmail-beginning-of-message ()
   "Show current message starting from the beginning."