2 files changed, 28 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a51b9401caf..df3fa715751 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-msg.el (gnus-msg-mail): Warn the user about Gnus not running
+        (bug#11514).
+
 2012-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * nntp.el: Stop the `letf' madness.
@@ -98,6 +103,12 @@
         * gnus-start.el (gnus-read-newsrc-el-file): Protect against broken
         .newsrc.el files.
 
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-msg.el (gnus-summary-cancel-article): See what From header we
+        would have gotten if we posted to the group, and use that to compare
+        against the message we want to cancel (bug#10808).
+
 2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * auth-source.el (auth-source-netrc-create): Quote tokens that contain
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index c6d0c3213a0..a041a85d444 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -487,8 +487,10 @@ If Gnus isn't running, a plain `message-mail' setup is used
 instead."
   (interactive)
   (if (not (gnus-alive-p))
-      (message-mail to subject other-headers continue
-                    nil yank-action send-actions return-action)
+      (progn
+        (message "Gnus not running; using plain Message mode")
+        (message-mail to subject other-headers continue
+                      nil yank-action send-actions return-action))
     (let ((buf (current-buffer))
           (gnus-newsgroup-name (or gnus-newsgroup-name ""))
           mail-buf)
@@ -810,9 +812,21 @@ post using the current select method."
   (interactive (gnus-interactive "P\ny"))
   (let ((message-post-method
          `(lambda (arg)
-            (gnus-post-method (eq ',symp 'a) ,gnus-newsgroup-name))))
+            (gnus-post-method (eq ',symp 'a) ,gnus-newsgroup-name)))
+        (user-mail-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
+        ;; the From header would have ended up being.
+        (save-window-excursion
+          (save-excursion
+            (gnus-summary-followup nil)
+            (let ((from (message-fetch-field "from")))
+              (when from
+                (setq user-mail-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))
           (gnus-summary-mark-as-read article gnus-canceled-mark)