Merge from emacs-24; up to 2012-04-24T08:35:02Z!lekktu@gmail.com

2 files changed, 6 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 50ce9075dc0..3060c08ec51 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-msg.el (gnus-msg-mail): Ensure that gnus-newsgroup-name is
+        a string so that Gcc works (bug#11514).
+
 2012-05-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * legacy-gnus-agent.el (gnus-agent-unhook-expire-days):
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 815bd9e44a6..c6d0c3213a0 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -490,6 +490,7 @@ instead."
       (message-mail to subject other-headers continue
                     nil yank-action send-actions return-action)
     (let ((buf (current-buffer))
+          (gnus-newsgroup-name (or gnus-newsgroup-name ""))
           mail-buf)
       (gnus-setup-message 'message
         (message-mail to subject other-headers continue