From cf8a1938e36b8a8617870b41d051bfbd26350910 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 6 Feb 2014 05:43:50 +0000 Subject: [PATCH] lisp/gnus/gnus-msg.el (gnus-summary-cancel-article): Allow cancelling articles that have a differing From address (bug#10808) --- lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/gnus-msg.el | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 560d03439c1..df676146a70 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2014-02-06 Lars Ingebrigtsen + + * 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 Lars Ingebrigtsen * gnus-int.el (gnus-request-accept-article): Doc fix. diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index 2ff70071b1c..1c8635c5992 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/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)) -- 2.39.2