(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 efd3044b653b678db6d19f114fee482e772f6e96..e29ac965947798a52ed81c255b0dd466331e362c 100644 (file)
--- 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."