aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2006-06-29 22:54:24 +0000
committerMiles Bader2006-06-29 22:54:24 +0000
commit827dc73d41369de7abfc2582895b6e9e8f09bd79 (patch)
tree1ae50ffe6922e0a84a3342ccbbb0caeb075cb45a
parent1937adc20b67c468cd3e6f1ebd2bc3b2159ccece (diff)
downloademacs-827dc73d41369de7abfc2582895b6e9e8f09bd79.tar.gz
emacs-827dc73d41369de7abfc2582895b6e9e8f09bd79.zip
Merge from gnus--rel--5.10
Patches applied: * gnus--rel--5.10 (patch 111-112) - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo. - Update from CVS Revision: emacs@sv.gnu.org/emacs--devo--0--patch-333
-rw-r--r--lisp/gnus/ChangeLog10
-rw-r--r--lisp/gnus/gnus-diary.el2
-rw-r--r--lisp/gnus/gnus-group.el5
-rw-r--r--man/ChangeLog4
-rw-r--r--man/gnus.texi2
5 files changed, 21 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1eec8b26fdf..d1f63c63324 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
12006-06-26 Reiner Steib <Reiner.Steib@gmx.de>
2
3 * gnus-diary.el (gnus-user-format-function-d)
4 (gnus-user-format-function-D): Autoload.
5
62006-06-26 Lars Magne Ingebrigtsen <larsi@gnus.org>
7
8 * gnus-group.el (gnus-group-select-group): Doc fix.
9 [ See 2004-05-19 change on the trunk. ]
10
12006-06-20 Katsumi Yamaoka <yamaoka@jpl.org> 112006-06-20 Katsumi Yamaoka <yamaoka@jpl.org>
2 12
3 * rfc2231.el (rfc2231-parse-string): Allow `*'s in parameter values. 13 * rfc2231.el (rfc2231-parse-string): Allow `*'s in parameter values.
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 5dfbd56af24..e4834131aa7 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -213,6 +213,7 @@ There are currently two built-in format functions:
213;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any 213;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any
214;; message, with all fields set to nil here. I don't know what it is for, and 214;; message, with all fields set to nil here. I don't know what it is for, and
215;; I just ignore it. 215;; I just ignore it.
216;;;###autoload
216(defun gnus-user-format-function-d (header) 217(defun gnus-user-format-function-d (header)
217 ;; Returns an aproximative delay string for the next occurence of this 218 ;; Returns an aproximative delay string for the next occurence of this
218 ;; message. The delay is given only in the first non zero unit. 219 ;; message. The delay is given only in the first non zero unit.
@@ -249,6 +250,7 @@ There are currently two built-in format functions:
249;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any 250;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any
250;; message, with all fields set to nil here. I don't know what it is for, and 251;; message, with all fields set to nil here. I don't know what it is for, and
251;; I just ignore it. 252;; I just ignore it.
253;;;###autoload
252(defun gnus-user-format-function-D (header) 254(defun gnus-user-format-function-D (header)
253 ;; Returns a formatted time string for the next occurence of this message. 255 ;; Returns a formatted time string for the next occurence of this message.
254 (let* ((extras (mail-header-extra header)) 256 (let* ((extras (mail-header-extra header))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index f3ca6248811..c34e339c5b1 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2039,7 +2039,10 @@ group."
2039No article is selected automatically. 2039No article is selected automatically.
2040If the group is opened, just switch the summary buffer. 2040If the group is opened, just switch the summary buffer.
2041If ALL is non-nil, already read articles become readable. 2041If ALL is non-nil, already read articles become readable.
2042If ALL is a number, fetch this number of articles." 2042If ALL is a positive number, fetch this number of the latest
2043articles in the group.
2044If ALL is a negative number, fetch this number of the earliest
2045articles in the group."
2043 (interactive "P") 2046 (interactive "P")
2044 (when (and (eobp) (not (gnus-group-group-name))) 2047 (when (and (eobp) (not (gnus-group-group-name)))
2045 (forward-line -1)) 2048 (forward-line -1))
diff --git a/man/ChangeLog b/man/ChangeLog
index 5879c980185..f87040fb806 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -51,6 +51,10 @@
51 * files.texi (Visiting): Document case-insensitive wildcard matching 51 * files.texi (Visiting): Document case-insensitive wildcard matching
52 under find-file-wildcards. 52 under find-file-wildcards.
53 53
542006-06-24 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
55
56 * gnus.texi (Summary Buffer Lines): Fix typo.
57
542006-06-23 Carsten Dominik <dominik@science.uva.nl> 582006-06-23 Carsten Dominik <dominik@science.uva.nl>
55 59
56 * org.texi (Embedded LaTeX): New chapter. 60 * org.texi (Embedded LaTeX): New chapter.
diff --git a/man/gnus.texi b/man/gnus.texi
index 91c223155b1..48a0f64281b 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -4579,7 +4579,7 @@ specification(s) are understood:
4579Article number. 4579Article number.
4580@item S 4580@item S
4581Subject string. List identifiers stripped, 4581Subject string. List identifiers stripped,
4582@code{gnus-list-identifies}. @xref{Article Hiding}. 4582@code{gnus-list-identifiers}. @xref{Article Hiding}.
4583@item s 4583@item s
4584Subject if the article is the root of the thread or the previous article 4584Subject if the article is the root of the thread or the previous article
4585had a different subject, @code{gnus-summary-same-subject} otherwise. 4585had a different subject, @code{gnus-summary-same-subject} otherwise.