changeset 111030:fdb969225593

message.el (message-get-reply-headers): If we're fed `to-address', then always use that. gnus-agent.el (gnus-agent-toggle-plugged): Use the right minor mode name in the mode line spec so that the mode line menu works (bug #2431).
author Katsumi Yamaoka <yamaoka@jpl.org>
date Mon, 18 Oct 2010 23:41:03 +0000
parents fc6dc700cc9f
children 4bed37ddc92b
files lisp/gnus/ChangeLog lisp/gnus/gnus-agent.el lisp/gnus/message.el
diffstat 3 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Mon Oct 18 22:09:28 2010 +0000
+++ b/lisp/gnus/ChangeLog	Mon Oct 18 23:41:03 2010 +0000
@@ -1,5 +1,12 @@
 2010-10-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-agent.el (gnus-agent-toggle-plugged): Use the right minor mode
+	name in the mode line spec so that the mode line menu works
+	(bug #2431).
+
+	* message.el (message-get-reply-headers): If we're fed `to-address',
+	then always use that.
+
 	* gnus-art.el (gnus-article-make-menu-bar): The article/group menus
 	aren't so wide as to need to switch off the edit menu.
 
--- a/lisp/gnus/gnus-agent.el	Mon Oct 18 22:09:28 2010 +0000
+++ b/lisp/gnus/gnus-agent.el	Mon Oct 18 23:41:03 2010 +0000
@@ -513,8 +513,8 @@
     ;; Set up the menu.
     (when (gnus-visual-p 'agent-menu 'menu)
       (funcall (intern (format "gnus-agent-%s-make-menu-bar" buffer))))
-    (unless (assq 'gnus-agent-mode minor-mode-alist)
-      (push gnus-agent-mode-status minor-mode-alist))
+    (unless (assq mode minor-mode-alist)
+      (push (cons mode (cdr gnus-agent-mode-status)) minor-mode-alist))
     (unless (assq mode minor-mode-map-alist)
       (push (cons mode (symbol-value (intern (format "gnus-agent-%s-mode-map"
 						     buffer))))
--- a/lisp/gnus/message.el	Mon Oct 18 22:09:28 2010 +0000
+++ b/lisp/gnus/message.el	Mon Oct 18 23:41:03 2010 +0000
@@ -6568,6 +6568,10 @@
     (save-match-data
       ;; Build (textual) list of new recipient addresses.
       (cond
+       (to-address
+	(setq recipients (concat ", " to-address))
+	;; If the author explicitly asked for a copy, we don't deny it to them.
+	(if mct (setq recipients (concat recipients ", " mct))))
        ((not wide)
 	(setq recipients (concat ", " author)))
        (address-headers
@@ -6603,10 +6607,6 @@
 You may customize the variable `message-use-mail-followup-to', if you
 want to get rid of this query permanently.")))
 	(setq recipients (concat ", " mft)))
-       (to-address
-	(setq recipients (concat ", " to-address))
-	;; If the author explicitly asked for a copy, we don't deny it to them.
-	(if mct (setq recipients (concat recipients ", " mct))))
        (t
 	(setq recipients (if never-mct "" (concat ", " author)))
 	(if to (setq recipients (concat recipients ", " to)))