(rmail-reply): Don't try to add a References header when replying to

mail without References or Message-Id.  (Bug#4525)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca6b63f7c87186aacbb08a73b5d7f4930f40cdb4..a6f543e957edd4e2954dfc93c997c6f055f01cc2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-23  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmail.el (rmail-reply): Don't try to add a References header when
+       replying to mail without References or Message-Id.  (Bug#4525)
+
 2009-09-23  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
        * term/ns-win.el (ns-reg-to-script): New variable.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 078a4518adf1071ea11d8debbf4b7a8f2223e28a..41f8fc05cb15a02a761c9f66be1b1979640e9a13 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3537,10 +3537,12 @@ use \\[mail-yank-original] to yank the original message into it."
                   (aref rmail-msgref-vector msgnum))
                 rmail-answered-attr-index))
      nil
-     (list (cons "References" (if references
-                                 (concat (mapconcat 'identity references " ")
-                                         " " message-id)
-                               message-id))))))
+     (if (or references message-id)
+        (list (cons "References" (if references
+                                     (concat
+                                      (mapconcat 'identity references " ")
+                                      " " message-id)
+                                   message-id)))))))
 \f
 (defun rmail-mark-message (buffer msgnum-list attribute)
   "Give BUFFER's message number in MSGNUM-LIST the attribute ATTRIBUTE.