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.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 5dd5e3e4fdc9e931d1de0d8d8d45a80cb166284c..50f0e4e45b96cc97d047e446bca2b696bbaf9bb1 100644 (file)
--- 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 7d61ffd9efa83dd948df490e7c9a900e3f87d495..48d0028e452a9dc717179ef75baa7936b1b79e4a 100644 (file)
--- 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5164207a5ce6cdec3d01c3386e279e8c954d459f..6d4e8424f748c2d505ec4a045794fd303fd8f0a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * calendar/time-date.el (format-seconds): Use assoc instead of
+       assoc-string to avoid warning on XEmacs.
+
+2011-03-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * calendar/time-date.el (format-seconds): Use assoc instead of
+       assoc-string, since assoc-string doesn't exist in XEmacs.
+
 2011-03-17  Juanma Barranquero  <lekktu@gmail.com>
 
        * custom.el (custom-known-themes): Reflow docstring.

diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index a1bfad3a5f5a86ca9d1cf91406cd214dc6d3a13f..62203600612344a3ebb88eceb1a006fe08ba887d 100644 (file)
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -308,13 +308,9 @@ This function does not work for SECONDS greater than `most-positive-fixnum'."
       (setq start (match-end 0)
             spec (match-string 1 string))
       (unless (string-equal spec "%")
-       ;; `assoc-string' is not available in XEmacs.  So when compiling
-       ;; Gnus (`time-date.el' is part of Gnus) with XEmacs, we get
-       ;; a warning here.  But `format-seconds' is not used anywhere in
-       ;; Gnus so it's not a real problem. --rsteib
-        (or (setq match (assoc-string spec units t))
+        (or (setq match (assoc (downcase spec) units))
             (error "Bad format specifier: `%s'" spec))
-        (if (assoc-string spec usedunits t)
+        (if (assoc (downcase spec) usedunits)
             (error "Multiple instances of specifier: `%s'" spec))
         (if (string-equal (car match) "z")
             (setq zeroflag t)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b22ed7397afa63e26a6da1990cc276d9c6e0bfaf..04b80159e50549a03930a538eedd492d3d27feba 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,28 @@
+2011-03-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * 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.
+
+2011-03-17  Antoine Levitt  <antoine.levitt@gmail.com>
+
+       * 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.
+
+2011-03-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el (shr-visit-file): New command.
+
+       * nnimap.el (nnimap-fetch-inbox): Rewrite slightly last patch.
+
+2011-03-17  Bjørn Mork  <bjorn@mork.no>
+
+       * nnimap.el (nnimap-fetch-inbox): Don't download bodies on ver4-capable
+       servers.
+
 2011-03-16  Julien Danjou  <julien@danjou.info>
 
        * mm-uu.el (mm-uu-dissect-text-parts): Only dissect handle that are

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index b994a2839bc177111cbaf8d0a7c4a792e8dec547..7c7e053192634e9316b4c735195f6af42f57876b 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -44,6 +44,7 @@
 (require 'wid-edit)
 (require 'mm-uu)
 (require 'message)
+(require 'mouse)
 
 (autoload 'gnus-msg-mail "gnus-msg" nil t)
 (autoload 'gnus-button-mailto "gnus-msg")

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index e928811b55805a79cdaba84a3de8f99a5f0978e4..c265538e19cbd69f8227bb740d00e43e1965f9fa 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -697,7 +697,8 @@ simple manner.")
   "M" gnus-group-list-all-matching
   "l" gnus-group-list-level
   "c" gnus-group-list-cached
-  "?" gnus-group-list-dormant)
+  "?" gnus-group-list-dormant
+  "!" gnus-group-list-ticked)
 
 (gnus-define-keys (gnus-group-list-limit-map "/" gnus-group-list-map)
   "k"  gnus-group-list-limit
@@ -849,7 +850,8 @@ simple manner.")
        ["List all groups matching..." gnus-group-list-all-matching t]
        ["List active file" gnus-group-list-active t]
        ["List groups with cached" gnus-group-list-cached t]
-       ["List groups with dormant" gnus-group-list-dormant t])
+       ["List groups with dormant" gnus-group-list-dormant t]
+       ["List groups with ticked" gnus-group-list-ticked t])
        ("Sort"
        ["Default sort" gnus-group-sort-groups t]
        ["Sort by method" gnus-group-sort-groups-by-method t]
@@ -4536,6 +4538,28 @@ This command may read the active file."
   (goto-char (point-min))
   (gnus-group-position-point))
 
+(defun gnus-group-list-ticked (level &optional lowest)
+  "List all groups with ticked articles.
+If the prefix LEVEL is non-nil, it should be a number that says which
+level to cut off listing groups.
+If LOWEST, don't list groups with level lower than LOWEST.
+
+This command may read the active file."
+  (interactive "P")
+  (when level
+    (setq level (prefix-numeric-value level)))
+  (when (or (not level) (>= level gnus-level-zombie))
+    (gnus-cache-open))
+  (funcall gnus-group-prepare-function
+          (or level gnus-level-subscribed)
+          #'(lambda (info)
+              (let ((marks (gnus-info-marks info)))
+                (assq 'tick marks)))
+          lowest
+          'ignore)
+  (goto-char (point-min))
+  (gnus-group-position-point))
+
 (defun gnus-group-listed-groups ()
   "Return a list of listed groups."
   (let (point groups)

diff --git a/lisp/gnus/gravatar.el b/lisp/gnus/gravatar.el
index 0c97080d8471dc8bcbd93dd33d1388bfe76efd2f..4b0c9a16283210bd44c1a8a3e7280d91b4dc871d 100644 (file)
--- a/lisp/gnus/gravatar.el
+++ b/lisp/gnus/gravatar.el
@@ -129,8 +129,10 @@ You can provide a list of argument to pass to CB in CBARGS."
   "Retrieve MAIL-ADDRESS gravatar and returns it."
   (let ((url (gravatar-build-url mail-address)))
     (if (gravatar-cache-expired url)
-        (with-current-buffer (url-retrieve-synchronously url)
-          (when gravatar-automatic-caching
+        (with-current-buffer (if (featurep 'xemacs)
+                                (url-retrieve url)
+                              (url-retrieve-synchronously url))
+         (when gravatar-automatic-caching
             (url-store-in-cache (current-buffer)))
           (let ((data (gravatar-data->image)))
             (kill-buffer (current-buffer))

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index e0804f81e2e7f797aa571259563025be71ed5baf..bcbe7b678d5c269f1bc2e88c6b629a66a9b38234 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1762,11 +1762,15 @@ textual parts.")
     (format "(UID %s%s)"
            (format
             (if (nnimap-ver4-p)
-                "BODY.PEEK[HEADER] BODY.PEEK"
+                "BODY.PEEK"
               "RFC822.PEEK"))
-           (if nnimap-split-download-body-default
-               "[]"
-             "[1]")))
+           (cond
+            (nnimap-split-download-body-default
+             "[]")
+            ((nnimap-ver4-p)
+             "[HEADER]")
+            (t
+             "[1]"))))
    t))
 
 (defun nnimap-split-incoming-mail ()

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index c9c5bd5ff1cc417cd952542f1af45ef775cd9b2d..113137a0046aaf7e7a77c22ade7948ded4036726 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -113,6 +113,15 @@ cid: URL as the argument.")
 
 ;; Public functions and commands.
 
+(defun shr-visit-file (file)
+  (interactive "fHTML file name: ")
+  (pop-to-buffer "*html*")
+  (erase-buffer)
+  (shr-insert-document
+   (with-temp-buffer
+     (insert-file-contents file)
+     (libxml-parse-html-region (point-min) (point-max)))))
+
 ;;;###autoload
 (defun shr-insert-document (dom)
   (setq shr-content-cache nil)