From: Henrik Enberg <henrik.enberg@telia.com>
Date: Wed, 25 Jan 2006 20:22:06 +0000 (+0000)
Subject: (rmail-output): Make sure headers are properly
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=439547c159b2fe2cdebb7ec9f4956918df6bd6de;p=emacs.git

(rmail-output): Make sure headers are properly
hidden after output.  Avoid pointless with-current-buffer call.
---

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index c7b7c24da7d..ffd555d6ac5 100644
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -7,7 +7,8 @@
 
 	* rmailout.el (rmail-delete-unwanted-fields): Handle mbox format.
 	(rmail-output): Error when target is a BABYL file.  Handle MIME
-	charset.
+	charset.  Make sure headers are properly hidden after output.
+	Avoid pointless with-current-buffer call.
 
 2006-01-24  Alex Schroeder  <alex@gnu.org>
 
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index fa99880ff8e..db11cceae05 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -203,7 +203,8 @@ The optional fourth argument FROM-GNUS is set when called from GNUS."
 		      (insert msg-string)))))))
 	  (unless noattribute
 	    (when (equal major-mode 'rmail-mode)
-	      (rmail-set-attribute "filed" t)))
+	      (rmail-set-attribute "filed" t)
+	      (rmail-header-hide-headers)))
 	  (setq count (1- count))
 	  (unless from-gnus
 	    (let ((next-message-p
@@ -212,12 +213,9 @@ The optional fourth argument FROM-GNUS is set when called from GNUS."
 		     (when (> count 0)
 		       (rmail-next-undeleted-message 1))))
 		  (num-appended (- orig-count count)))
-	      (when (and next-message-p original-headers-p)
-		(rmail-toggle-header))
 	      (when (and (> count 0) (not next-message-p))
-		(error (with-current-buffer rmailbuf
-			 (format "Only %d message%s appended" num-appended
-				 (if (= num-appended 1) "" "s"))))
+		(error (format "Only %d message%s appended" num-appended
+			       (if (= num-appended 1) "" "s")))
 		(setq count 0)))))))))
 
 ;;;###autoload