Merge from trunk.

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ad3e26f0f51..076afdd2323 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-msg.el (gnus-setup-message): Remove extra apostrophe.
+
 2011-08-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * nnmail.el (nnmail-get-new-mail-1): If one mail source bugs out,
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 9d3ec25c03a..d60c7165abd 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -435,7 +435,7 @@ Thank you for your help in stamping out bugs.
            (progn
              ,@forms)
          (gnus-inews-add-send-actions ,winconf ,buffer ,article ,config
-                                      ,yanked ',winconf-name)
+                                      ,yanked ,winconf-name)
          (setq gnus-message-buffer (current-buffer))
          (set (make-local-variable 'gnus-message-group-art)
               (cons ,group ,article))