Merge changes made in Gnus trunk.

gnus.el (debbugs-gnu): Renamed from debbugs-emacs.
message.el (message-reply): Work around mysterious bug where `message-mode' seems to overwrite the locally bound `subject' variable.

3 files changed, 22 insertions, 17 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e3321ab30c5..9491612a883 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.el (debbugs-gnu): Renamed from debbugs-emacs.
+
+        * message.el (message-reply): Work around mysterious bug where
+        `message-mode' seems to overwrite the locally bound `subject' variable.
+
 2011-07-14  Andrew Cohen  <cohen@andy.bu.edu>
 
         * nnimap.el (nnimap-request-thread): Ensure search is performed in
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index ac7db0e1d69..b66d5f22474 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -4381,12 +4381,11 @@ prompt the user for the name of an NNTP server to use."
     (gnus-1 arg dont-connect slave)
     (gnus-final-warning)))
 
-(autoload 'debbugs-emacs "debbugs-gnu")
+(autoload 'debbugs-gnu "debbugs-gnu")
 (defun gnus-list-debbugs ()
   "List all open Gnus bug reports."
   (interactive)
-  (debbugs-emacs '("important" "normal" "minor" "wishlist")
-                 "gnus"))
+  (debbugs-gnu nil "gnus"))
 
 ;; Allow redefinition of Gnus functions.
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 7d7cc01225b..ffc6a680ef8 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6878,20 +6878,19 @@ Useful functions to put in this list include:
       (unless follow-to
         (setq follow-to (message-get-reply-headers wide to-address))))
 
-    (unless (message-mail-user-agent)
-      (message-pop-to-buffer
-       (message-buffer-name
-        (if wide "wide reply" "reply") from
-        (if wide to-address nil))
-       switch-function))
-
-    (setq message-reply-headers
-          (vector 0 subject from date message-id references 0 0 ""))
-
-    (message-setup
-     `((Subject . ,subject)
-       ,@follow-to)
-     cur)))
+    (let ((headers
+           `((Subject . ,subject)
+             ,@follow-to)))
+      (unless (message-mail-user-agent)
+        (message-pop-to-buffer
+         (message-buffer-name
+          (if wide "wide reply" "reply") from
+          (if wide to-address nil))
+         switch-function))
+      (setq message-reply-headers
+            (vector 0 (cdr (assq 'Subject headers))
+                    from date message-id references 0 0 ""))
+      (message-setup headers cur))))
 
 ;;;###autoload
 (defun message-wide-reply (&optional to-address)