diff options
| author | Lars Magne Ingebrigtsen | 2011-09-11 22:50:22 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2011-09-11 22:50:22 +0000 |
| commit | 0afb49a1bf4435b06d1296ecf00fd032da386cd6 (patch) | |
| tree | 4e8ab6959c99530b7db9d19e7de37bed8ae96ca4 /lisp | |
| parent | 20f53c697985dffdec6a29a2f8b0aa6fa5ee820a (diff) | |
| download | emacs-0afb49a1bf4435b06d1296ecf00fd032da386cd6.tar.gz emacs-0afb49a1bf4435b06d1296ecf00fd032da386cd6.zip | |
Merge changes made in Gnus trunk.
gnus.texi (Listing Groups): Explain `gnus-group-list-limit'.
(Finding the News): Doc clarification.
(Terminology): Mention naming.
gnus-group.el (gnus-group-list-limit): Explain what the command does.
gnus-sum.el (gnus-fetch-headers): Bump message level.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/gnus/gnus-agent.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-group.el | 7 | ||||
| -rw-r--r-- | lisp/gnus/gnus-msg.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-sum.el | 4 |
5 files changed, 21 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index b1fcb5429d6..501ff5b59d0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -8,12 +8,23 @@ | |||
| 8 | 8 | ||
| 9 | 2011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org> | 9 | 2011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 10 | 10 | ||
| 11 | * gnus-group.el (gnus-group-list-limit): Explain what the command | ||
| 12 | does. | ||
| 13 | |||
| 14 | * gnus-sum.el (gnus-fetch-headers): Bump message level. | ||
| 15 | |||
| 16 | 2011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 17 | |||
| 11 | * gnus-dup.el (gnus-dup-suppress-articles): Move "Suppressing | 18 | * gnus-dup.el (gnus-dup-suppress-articles): Move "Suppressing |
| 12 | duplicates" to a higher level. | 19 | duplicates" to a higher level. |
| 13 | 20 | ||
| 14 | * gnus-util.el (gnus-verbose): Lower default to 6 to get rid of the | 21 | * gnus-util.el (gnus-verbose): Lower default to 6 to get rid of the |
| 15 | most egregious messages. | 22 | most egregious messages. |
| 16 | 23 | ||
| 24 | 2011-09-10 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 25 | |||
| 26 | * gnus-msg.el (gnus-summary-mail-forward): Minuscule doc fix. | ||
| 27 | |||
| 17 | 2011-09-10 Tetsuo Tsukamoto <tt.tetsuo.tsukamoto@gmail.com> (tiny change) | 28 | 2011-09-10 Tetsuo Tsukamoto <tt.tetsuo.tsukamoto@gmail.com> (tiny change) |
| 18 | 29 | ||
| 19 | * nnrss.el (nnrss-retrieve-groups): Decode the charset before looking | 30 | * nnrss.el (nnrss-retrieve-groups): Decode the charset before looking |
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 26222119b98..669f9675536 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el | |||
| @@ -1933,7 +1933,7 @@ article numbers will be returned." | |||
| 1933 | (with-current-buffer nntp-server-buffer | 1933 | (with-current-buffer nntp-server-buffer |
| 1934 | (if articles | 1934 | (if articles |
| 1935 | (progn | 1935 | (progn |
| 1936 | (gnus-message 7 "Fetching headers for %s..." | 1936 | (gnus-message 8 "Fetching headers for %s..." |
| 1937 | (gnus-agent-decoded-group-name group)) | 1937 | (gnus-agent-decoded-group-name group)) |
| 1938 | 1938 | ||
| 1939 | ;; Fetch them. | 1939 | ;; Fetch them. |
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 36fb9e8343b..f6cf7248a27 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el | |||
| @@ -4636,7 +4636,12 @@ This command may read the active file." | |||
| 4636 | (gnus-group-list-plus args))) | 4636 | (gnus-group-list-plus args))) |
| 4637 | 4637 | ||
| 4638 | (defun gnus-group-list-limit (&optional args) | 4638 | (defun gnus-group-list-limit (&optional args) |
| 4639 | "List groups limited within the current selection." | 4639 | "List groups limited within the current selection. |
| 4640 | If you've limited the groups, you can further limit the selection | ||
| 4641 | with this command. If you've first limited to groups with | ||
| 4642 | dormant articles with `A ?', you can then further limit with | ||
| 4643 | `A / c', which will then limit to groups with cached articles, giving | ||
| 4644 | you the groups that have both dormant articles and cached articles." | ||
| 4640 | (interactive "P") | 4645 | (interactive "P") |
| 4641 | (let ((gnus-group-list-option 'limit)) | 4646 | (let ((gnus-group-list-option 'limit)) |
| 4642 | (gnus-group-list-plus args))) | 4647 | (gnus-group-list-plus args))) |
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index d60c7165abd..e6a06a0500d 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el | |||
| @@ -1225,7 +1225,7 @@ if ARG is 3, decode message and forward as an rfc822 MIME section; | |||
| 1225 | if ARG is 4, forward message directly inline; | 1225 | if ARG is 4, forward message directly inline; |
| 1226 | otherwise, use flipped `message-forward-as-mime'. | 1226 | otherwise, use flipped `message-forward-as-mime'. |
| 1227 | If POST, post instead of mail. | 1227 | If POST, post instead of mail. |
| 1228 | For the `inline' alternatives, also see the variable | 1228 | For the \"inline\" alternatives, also see the variable |
| 1229 | `message-forward-ignored-headers'." | 1229 | `message-forward-ignored-headers'." |
| 1230 | (interactive "P") | 1230 | (interactive "P") |
| 1231 | (if (cdr (gnus-summary-work-articles nil)) | 1231 | (if (cdr (gnus-summary-work-articles nil)) |
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 7e63237c676..8651b583757 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el | |||
| @@ -5543,7 +5543,7 @@ or a straight list of headers." | |||
| 5543 | (defun gnus-fetch-headers (articles &optional limit force-new dependencies) | 5543 | (defun gnus-fetch-headers (articles &optional limit force-new dependencies) |
| 5544 | "Fetch headers of ARTICLES." | 5544 | "Fetch headers of ARTICLES." |
| 5545 | (let ((name (gnus-group-decoded-name gnus-newsgroup-name))) | 5545 | (let ((name (gnus-group-decoded-name gnus-newsgroup-name))) |
| 5546 | (gnus-message 5 "Fetching headers for %s..." name) | 5546 | (gnus-message 7 "Fetching headers for %s..." name) |
| 5547 | (prog1 | 5547 | (prog1 |
| 5548 | (if (eq 'nov | 5548 | (if (eq 'nov |
| 5549 | (setq gnus-headers-retrieved-by | 5549 | (setq gnus-headers-retrieved-by |
| @@ -5560,7 +5560,7 @@ or a straight list of headers." | |||
| 5560 | (gnus-get-newsgroup-headers-xover | 5560 | (gnus-get-newsgroup-headers-xover |
| 5561 | articles force-new dependencies gnus-newsgroup-name t) | 5561 | articles force-new dependencies gnus-newsgroup-name t) |
| 5562 | (gnus-get-newsgroup-headers dependencies force-new)) | 5562 | (gnus-get-newsgroup-headers dependencies force-new)) |
| 5563 | (gnus-message 5 "Fetching headers for %s...done" name)))) | 5563 | (gnus-message 7 "Fetching headers for %s...done" name)))) |
| 5564 | 5564 | ||
| 5565 | (defun gnus-select-newsgroup (group &optional read-all select-articles) | 5565 | (defun gnus-select-newsgroup (group &optional read-all select-articles) |
| 5566 | "Select newsgroup GROUP. | 5566 | "Select newsgroup GROUP. |