summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2011-03-18 13:45:04 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-03-18 13:45:04 +0000
commit1518e4f02dab44ba5388cd8b0699749ee30d3eff (patch)
tree6097746516e201f86c3d5c72394dc6cf941e23ac /doc
parentfffe2e140420f75d6ad06ab9356b337570572b9b (diff)
downloademacs-1518e4f02dab44ba5388cd8b0699749ee30d3eff.tar.gz
Merge changes made in Gnus trunk.
message.texi (Various Commands): Document format specs in the ellipsis. time-date.el (format-seconds): Use assoc instead of assoc-string to avoid warning on XEmacs. gnus-art.el: Require mouse, which the build bot seems to say is needed. gravatar.el (gravatar-retrieve-synchronously): Use `url-retrieve' on XEmacs, since it doesn't have url-retrieve-synchronously. time-date.el (format-seconds): Use assoc instead of assoc-string, since assoc-string doesn't exist in XEmacs. gnus-group.el (gnus-group-list-ticked): New function. (gnus-group-make-menu-bar): Provide a menu entry for it. (gnus-group-list-map): Provide a binding for it. shr.el (shr-visit-file): New command. nnimap.el (nnimap-fetch-inbox): Rewrite slightly last patch. nnimap.el (nnimap-fetch-inbox): Don't download bodies on ver4-capable servers.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/message.texi4
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 5dd5e3e4fdc..50f0e4e45b9 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -2,6 +2,11 @@
* calc.texi (Logarithmic Units): Update the function names.
+2011-03-15 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * message.texi (Various Commands): Document format specs in the
+ ellipsis.
+
2011-03-15 Antoine Levitt <antoine.levitt@gmail.com>
* message.texi (Insertion Variables): Document message-cite-style.
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 7d61ffd9efa..48d0028e452 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1202,6 +1202,10 @@ The text is killed and replaced with the contents of the variable
@code{message-elide-ellipsis}. The default value is to use an ellipsis
(@samp{[...]}).
+This is a format-spec string, and you can use @samp{%l} to say how
+many lines were removed, and @samp{%c} to say how many characters were
+removed.
+
@item C-c M-k
@kindex C-c M-k
@findex message-kill-address