X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnmail.el;h=5be449e9a6b8a4c08012defa15c4e0dffca66627;hb=6c74b53e357ecec4f6e48c1dbba4d60129d874dc;hp=988e1cdc131505089ada9ef5b5c14cd28c7f3ce1;hpb=dae6632b59369b37baaee9a752b09b6fb61cd8d9;p=gnus

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 988e1cdc1..5be449e9a 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1,6 +1,6 @@
 ;;; nnmail.el --- mail support functions for the Gnus mail backends
 
-;; Copyright (C) 1995-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1995-2013 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
@@ -40,6 +40,8 @@
 
 (autoload 'gnus-add-buffer "gnus")
 (autoload 'gnus-kill-buffer "gnus")
+(eval-when-compile
+  (autoload 'mail-send-and-exit "sendmail" nil t))
 
 (defgroup nnmail nil
   "Reading mail with Gnus."
@@ -177,7 +179,7 @@ is to be performed in, and it should return an integer that says how
 many days an article can be stored before it is considered \"old\".
 It can also return the values `never' and `immediate'.
 
-Eg.:
+E.g.:
 
 \(setq nnmail-expiry-wait-function
       (lambda (newsgroup)
@@ -289,7 +291,7 @@ directory.  This hook is called after the incoming mail box has been
 emptied, and can be used to call any mail box programs you have
 running (\"xwatch\", etc.)
 
-Eg.
+E.g.:
 
 \(add-hook 'nnmail-read-incoming-hook
 	  (lambda ()
@@ -557,7 +559,7 @@ parameter.  It should return nil, `warn' or `delete'."
   "Extra headers to parse.
 In addition to the standard headers, these extra headers will be
 included in NOV headers (and the like) when backends parse headers."
-  :version "24.2"
+  :version "24.3"
   :group 'nnmail
   :type '(repeat symbol))
 
@@ -1950,9 +1952,13 @@ If TIME is nil, then return the cutoff time for oldness instead."
        ((and (equal header 'to-from)
 	     (or (string-match (cadr regexp-target-pair) from)
 		 (and (string-match (cadr regexp-target-pair) to)
-		      (let ((rmail-dont-reply-to-names
-			     (message-dont-reply-to-names)))
-			(equal (rmail-dont-reply-to from) "")))))
+		      (let* ((mail-dont-reply-to-names
+			      (message-dont-reply-to-names))
+			     (rmail-dont-reply-to-names ; obsolete since 24.1
+			      mail-dont-reply-to-names))
+			(equal (if (fboundp 'rmail-dont-reply-to)
+				   (rmail-dont-reply-to from)
+				 (mail-dont-reply-to from)) "")))))
 	(setq target (format-time-string (caddr regexp-target-pair) date)))
        ((and (not (equal header 'to-from))
 	     (string-match (cadr regexp-target-pair)