# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 962979248 0
# Node ID d2611d5071d05edd4a36fb2f69ce31fc8208bf7a
# Parent  cdd9c822e9943e5826d3a0eb2ef6772a4333708e
(rmail-clear-headers): Don't throw an error
if rmail-ignored-headers is nil.
(rmail-retry-failure): Bind rmail-ignored-headers and
rmail-displayed-headers to nil.

diff -r cdd9c822e994 -r d2611d5071d0 lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Fri Jul 07 13:02:53 2000 +0000
+++ b/lisp/mail/rmail.el	Fri Jul 07 14:14:08 2000 +0000
@@ -1834,9 +1834,10 @@
 	(or ignored-headers (setq ignored-headers rmail-ignored-headers))
 	(save-restriction
 	  (narrow-to-region (point-min) (point))
-	  (while (progn
-		   (goto-char (point-min))
-		   (re-search-forward ignored-headers nil t))
+	  (while (and ignored-headers
+		      (progn
+			(goto-char (point-min))
+			(re-search-forward ignored-headers nil t)))
 	    (beginning-of-line)
 	    (delete-region (point)
 			   (if (re-search-forward "\n[^ \t]" nil t)
@@ -3193,7 +3194,9 @@
 	  ;; Insert original text as initial text of new draft message.
 	  ;; Bind inhibit-read-only since the header delimiter
 	  ;; of the previous message was probably read-only.
-	  (let ((inhibit-read-only t))
+	  (let ((inhibit-read-only t)
+		rmail-displayed-headers
+		rmail-ignored-headers)
 	    (erase-buffer)
 	    (insert-buffer-substring rmail-this-buffer bounce-start bounce-end)
 	    (goto-char (point-min))