[Emacs-diffs] trunk r116286: lisp/gnus/gnus-msg.el (gnus-summary-cancel-article): Allow cancelling articles that have a differing From address (bug#10808)

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 116286
revision-id: address@hidden
parent: address@hidden
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2014-02-06 05:43:50 +0000
message:
  lisp/gnus/gnus-msg.el (gnus-summary-cancel-article): Allow cancelling 
articles that have a differing From address (bug#10808)
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-msg.el          gnusmsg.el-20091113204419-o5vbwnq5f7feedwu-1127

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-02-05 04:35:29 +0000
+++ b/lisp/gnus/ChangeLog       2014-02-06 05:43:50 +0000
@@ -1,3 +1,9 @@
+2014-02-06  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-int.el (gnus-request-accept-article): Doc fix.

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2014-01-01 07:43:34 +0000
+++ b/lisp/gnus/gnus-msg.el     2014-02-06 05:43:50 +0000
@@ -862,7 +862,7 @@
   (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 @@
            (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))