summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/gnus/ChangeLog7
-rw-r--r--lisp/gnus/gnus-agent.el4
-rw-r--r--lisp/gnus/message.el8
3 files changed, 13 insertions, 6 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 47124f39810..ea8672b7dd7 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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.
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 04bdb3be626..7fdd5b4ea76 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -513,8 +513,8 @@ manipulated as follows:
;; 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))))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index c9ddba42896..ce72984c886 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6568,6 +6568,10 @@ The function is called with one parameter, a cons cell ..."
(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 @@ responses here are directed to other addresses.
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)))