diff options
author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-09-21 22:34:54 +0000 |
---|---|---|
committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-09-21 22:34:54 +0000 |
commit | a5166359b9fc59e0086172d198d68126da76bf14 (patch) | |
tree | 92975b9cb0aab90779f922d48df79c80067f5e91 /doc/misc | |
parent | e233ce558d12fdf9e0e69ea30c4558ec7477fea4 (diff) | |
download | emacs-a5166359b9fc59e0086172d198d68126da76bf14.tar.gz |
Merge changes made in Gnus trunk.
gnus.texi (Archived Messages): Note the default (bug#9552).
message.el (message-indent-citation): Really make sure there's a newline at the end.
nnimap.el (nnimap-parse-flags): Make regexp less prone to overflows. Fix suggested by John Wiegley.
pop3.el (pop3-open-server): Fix +OK end-of-command regexp.
gnus-art.el (gnus-treat-hide-citation): Add doc.
message.el (message-default-send-rename-function): Break out into its own function.
ecomplete.el (ecomplete-display-matches): Revert patch since it doesn't work under XEmacs.
nnimap.el (nnimap-map-port): New function to connect to 993 instead of "imaps" to word around Windows problems.
(nnimap-open-connection-1): Use it.
message.el (message-indent-citation): Revert last change which made `F' not work.
Diffstat (limited to 'doc/misc')
-rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
-rw-r--r-- | doc/misc/gnus.texi | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 78d762b0b8f..6af229bbdda 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-09-21 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * gnus.texi (Archived Messages): Note the default (bug#9552). + 2011-09-21 Bill Wohler <wohler@newt.com> Release MH-E manual version 8.3. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 59c39893c13..211bfdb5509 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -12617,7 +12617,7 @@ Messages will be saved in all those groups. When a key ``matches'', the result is used. @item @code{nil} -No message archiving will take place. This is the default. +No message archiving will take place. @end table Let's illustrate: |