From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 4 Dec 2008 22:50:50 +0000 (+0000)
Subject: (pmail-retry-failure): Remove call to non-existent function
X-Git-Tag: emacs-pretest-23.0.90~1267
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=faa2c8ba6af53ef0009860890d0983b5c7c80164;p=emacs.git

(pmail-retry-failure): Remove call to non-existent function
pmail-clear-headers.
(pmail-message-labels-p): New function.
---

diff --git a/lisp/mail/pmail.el b/lisp/mail/pmail.el
index 8f922f09a3b..e3e683bdae8 100644
--- a/lisp/mail/pmail.el
+++ b/lisp/mail/pmail.el
@@ -2628,6 +2628,15 @@ match for the regexp ATTRS."
 Return non-nil if the unseen attribute is set, nil otherwise."
   (pmail-message-attr-p msgnum "......U"))
 
+;; Return t if the attributes/keywords line of msg number MSG
+;; contains a match for the regexp LABELS.
+(defun pmail-message-labels-p (msg labels)
+  (save-excursion
+    (save-restriction
+      (widen)
+      (goto-char (pmail-msgbeg msg))
+      (forward-char 3)
+      (re-search-backward labels (prog1 (point) (end-of-line)) t))))
 
 ;;;; *** Pmail Message Selection And Support ***
 
@@ -4042,8 +4051,6 @@ specifying headers which should not be copied into the new message."
 	    (goto-char (point-min))
 	    (if bounce-indent
 		(indent-rigidly (point-min) (point-max) bounce-indent))
-	    (pmail-clear-headers pmail-retry-ignored-headers)
-	    (pmail-clear-headers "^sender:\\|^return-path:\\|^received:")
 	    (mail-sendmail-delimit-header)
 	    (save-restriction
 	      (narrow-to-region (point-min) (mail-header-end))