Merge from trunk.

fcbc5f60 · Paul Eggert · ef25feb4 · 16e07ee0 · fcbc5f60 · fcbc5f60
Commit fcbc5f60 authored Aug 25, 2011 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

lisp/gnus/ChangeLog lisp/gnus/ChangeLog +4 -0

lisp/gnus/gnus-msg.el lisp/gnus/gnus-msg.el +1 -1

No files found.
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
+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,

--- 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))