procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge bugfixes done in Gnus trunk

Browse source 
Those changes fix only the bugs having appeared in the bug list.
Many other Gnus changes not yet merged to Emacs are in:
   ftp://ftp.jpl.org/pub/tmp/MaGnus-to-Emacs.patch
(or http://www.jpl.org/ftp/pub/tmp/MaGnus-to-Emacs.patch)

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-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).
This commit is contained in:
Katsumi Yamaoka 2012-06-08 04:38:56 +00:00
parent 3d10db47a7
commit d52ba5afda
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/gnus/ChangeLog
View file

@ -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

20
lisp/gnus/gnus-msg.el
View file

@ -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)