# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1228431050 0
# Node ID eb0db38d20d1fbd6fb52c2a1e5eba7c19aa1cdca
# Parent  ecb3dba6e9322cf1bd3768bb1c9c7ab329088cb6
(pmail-retry-failure): Remove call to non-existent function
pmail-clear-headers.
(pmail-message-labels-p): New function.

diff -r ecb3dba6e932 -r eb0db38d20d1 lisp/mail/pmail.el
--- a/lisp/mail/pmail.el	Thu Dec 04 22:49:30 2008 +0000
+++ b/lisp/mail/pmail.el	Thu Dec 04 22:50:50 2008 +0000
@@ -2628,6 +2628,15 @@
 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 @@
 	    (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))