Mercurial > emacs
comparison lisp/gnus/gnus-sum.el @ 112432:27320025ed54
Merge chages made in Gnus trunk.
mailcap.el (mailcap-mime-extensions): Rename text/org to text/x-org.
gnus-draft.el (gnus-group-send-queue): Update the queue group in the group buffer after sending the queue.
gnus-draft.el (gnus-group-send-queue): Really refresh the queue group after sending.
gnus-agent.el (gnus-agent-send-mail): Ditto.
gnus-group.el (gnus-group-refresh-group): New convenience function.
message.el (message-bogus-addresses): Remove commented-out value.
message.el (message-check-recipients): Display the encoded version of the bogus address if they differ.
flow-fill.el (fill-flowed): Make `delete-space' option correspond to "DelSp" parameter in RFC3676.
gnus-sum.el (gnus-summary-move-article): Protect against backends (i.e., nnimap) returning nil as the article number.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 23 Jan 2011 00:34:08 +0000 |
parents | 417b1e4d63cd |
children |
comparison
equal
deleted
inserted
replaced
112431:7a578da192b9 | 112432:27320025ed54 |
---|---|
9834 (when (and info | 9834 (when (and info |
9835 (memq action '(move copy))) | 9835 (memq action '(move copy))) |
9836 (unless (member to-group to-groups) | 9836 (unless (member to-group to-groups) |
9837 (push to-group to-groups)) | 9837 (push to-group to-groups)) |
9838 | 9838 |
9839 (unless (memq article gnus-newsgroup-unreads) | 9839 (when (and (not (memq article gnus-newsgroup-unreads)) |
9840 (cdr art-group)) | |
9840 (push 'read to-marks) | 9841 (push 'read to-marks) |
9841 (gnus-info-set-read | 9842 (gnus-info-set-read |
9842 info (gnus-add-to-range (gnus-info-read info) | 9843 info (gnus-add-to-range (gnus-info-read info) |
9843 (list (cdr art-group))))) | 9844 (list (cdr art-group))))) |
9844 | 9845 |
9851 gnus-article-mark-lists)))) | 9852 gnus-article-mark-lists)))) |
9852 (to-article (cdr art-group))) | 9853 (to-article (cdr art-group))) |
9853 | 9854 |
9854 ;; Enter the article into the cache in the new group, | 9855 ;; Enter the article into the cache in the new group, |
9855 ;; if that is required. | 9856 ;; if that is required. |
9856 (when gnus-use-cache | 9857 (when (and to-article |
9858 gnus-use-cache) | |
9857 (gnus-cache-possibly-enter-article | 9859 (gnus-cache-possibly-enter-article |
9858 to-group to-article | 9860 to-group to-article |
9859 (memq article gnus-newsgroup-marked) | 9861 (memq article gnus-newsgroup-marked) |
9860 (memq article gnus-newsgroup-dormant) | 9862 (memq article gnus-newsgroup-dormant) |
9861 (memq article gnus-newsgroup-unreads))) | 9863 (memq article gnus-newsgroup-unreads))) |
9862 | 9864 |
9863 (when gnus-preserve-marks | 9865 (when (and gnus-preserve-marks |
9866 to-article) | |
9864 ;; Copy any marks over to the new group. | 9867 ;; Copy any marks over to the new group. |
9865 (when (and (equal to-group gnus-newsgroup-name) | 9868 (when (and (equal to-group gnus-newsgroup-name) |
9866 (not (memq article gnus-newsgroup-unreads))) | 9869 (not (memq article gnus-newsgroup-unreads))) |
9867 ;; Mark this article as read in this group. | 9870 ;; Mark this article as read in this group. |
9868 (push (cons to-article gnus-read-mark) | 9871 (push (cons to-article gnus-read-mark) |