[gnus git] branch master updated: m0-9-41-g33dd489 =2= ChangeLog belonging to the previous checkin ; Allow cancelling articles that have a differing From address

       via  33dd489ed216af5aa2f70ce77f9b02b64b04aa5c (commit)
       via  2f35819ed103533a412e58b82b251cc924f77838 (commit)
      from  8da1336efbd60db3a837c2dd77c91bc6f1116661 (commit)


- Log -----------------------------------------------------------------
commit 33dd489ed216af5aa2f70ce77f9b02b64b04aa5c
Author: Lars Ingebrigtsen <[email protected]>
Date:   Wed Feb 5 18:46:44 2014 -0800

    ChangeLog belonging to the previous checkin

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15f9f77..06f9e27 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-06  Lars Ingebrigtsen  <[email protected]>
+
+	* gnus-msg.el (gnus-summary-cancel-article): `user-mail-address' is
+	buffer-local in some buffers, so bind it explicitly in the buffer we're
+	trying to cancel the article in (bug#10808).
+
 2014-02-05  Katsumi Yamaoka  <[email protected]>
 
 	* gnus.el, gnus-xmas.el (gnus-copy-overlay, gnus-overlays-at):

commit 2f35819ed103533a412e58b82b251cc924f77838
Author: Lars Ingebrigtsen <[email protected]>
Date:   Wed Feb 5 18:45:38 2014 -0800

    Allow cancelling articles that have a differing From address
    
    * gnus-msg.el (gnus-summary-cancel-article): `user-mail-address' is
    buffer-local in some buffers, so bind it explicitly in the buffer we're
    trying to cancel the article in (bug#10808).

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 2ff7007..1c8635c 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -862,7 +862,7 @@ post using the current select method."
   (let ((message-post-method
 	 `(lambda (arg)
 	    (gnus-post-method (eq ',symp 'a) ,gnus-newsgroup-name)))
-	(user-mail-address user-mail-address))
+	(custom-address user-mail-address))
     (dolist (article (gnus-summary-work-articles n))
       (when (gnus-summary-select-article t nil nil article)
 	;; Pretend that we're doing a followup so that we can see what
@@ -872,12 +872,13 @@ post using the current select method."
 	    (gnus-summary-followup nil)
 	    (let ((from (message-fetch-field "from")))
 	      (when from
-		(setq user-mail-address
+		(setq custom-address
 		      (car (mail-header-parse-address from)))))
 	    (kill-buffer (current-buffer))))
 	;; Now cancel the article using the From header we got.
 	(when (gnus-eval-in-buffer-window gnus-original-article-buffer
-		(message-cancel-news))
+		(let ((user-mail-address (or custom-address user-mail-address)))
+		  (message-cancel-news)))
 	  (gnus-summary-mark-as-read article gnus-canceled-mark)
 	  (gnus-cache-remove-article 1))
 	(gnus-article-hide-headers-if-wanted))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    6 ++++++
 lisp/gnus-msg.el |    7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project