1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Merge from gnus--rel--5.10

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-164
This commit is contained in:
Miles Bader 2007-12-16 05:04:28 +00:00
parent a2586785fb
commit c317b5634a
4 changed files with 23 additions and 6 deletions

View file

@ -1,3 +1,16 @@
2007-12-14 Johan Bockg,Ae(Brd <bojohan@gnu.org>
* gnus-sum.el (gnus-summary-mark-unread-as-read)
(gnus-summary-mark-read-and-unread-as-read)
(gnus-summary-mark-current-read-and-unread-as-read)
(gnus-summary-mark-unread-as-ticked): Doc fix.
`gnus-mark-article-hook', not `gnus-summary-mark-article-hook'.
2007-12-14 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-sum.el (gnus-summary-prev-article): Fix doc string. Reported by
Christoph Conrad <christoph.conrad@gmx.de>.
2007-12-03 Reiner Steib <Reiner.Steib@gmx.de>
* message.el (message-ignored-supersedes-headers): Add "X-ID".

View file

@ -7492,7 +7492,7 @@ If BACKWARD, the previous article is selected instead of the next."
(gnus-summary-article-subject))))
(defun gnus-summary-prev-article (&optional unread subject)
"Select the article after the current one.
"Select the article before the current one.
If UNREAD is non-nil, only unread articles are selected."
(interactive "P")
(gnus-summary-next-article unread subject t))
@ -10393,12 +10393,12 @@ The difference between N and the number of marks cleared is returned."
(gnus-summary-mark-forward (- n) gnus-unread-mark))
(defun gnus-summary-mark-unread-as-read ()
"Intended to be used by `gnus-summary-mark-article-hook'."
"Intended to be used by `gnus-mark-article-hook'."
(when (memq gnus-current-article gnus-newsgroup-unreads)
(gnus-summary-mark-article gnus-current-article gnus-read-mark)))
(defun gnus-summary-mark-read-and-unread-as-read (&optional new-mark)
"Intended to be used by `gnus-summary-mark-article-hook'."
"Intended to be used by `gnus-mark-article-hook'."
(let ((mark (gnus-summary-article-mark)))
(when (or (gnus-unread-mark-p mark)
(gnus-read-mark-p mark))
@ -10406,7 +10406,7 @@ The difference between N and the number of marks cleared is returned."
(or new-mark gnus-read-mark)))))
(defun gnus-summary-mark-current-read-and-unread-as-read (&optional new-mark)
"Intended to be used by `gnus-summary-mark-article-hook'."
"Intended to be used by `gnus-mark-article-hook'."
(let ((mark (gnus-summary-article-mark)))
(when (or (gnus-unread-mark-p mark)
(gnus-read-mark-p mark))
@ -10414,7 +10414,7 @@ The difference between N and the number of marks cleared is returned."
(or new-mark gnus-read-mark)))))
(defun gnus-summary-mark-unread-as-ticked ()
"Intended to be used by `gnus-summary-mark-article-hook'."
"Intended to be used by `gnus-mark-article-hook'."
(when (memq gnus-current-article gnus-newsgroup-unreads)
(gnus-summary-mark-article gnus-current-article gnus-ticked-mark)))