Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 186-191)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-595

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0b686410943c8125f06193a4d9511ad24349b79f..a56f9ff15366d56e7779098b1dcd62a5e2952578 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,4 +1,4 @@
-2007-01-06  Reiner Steib  <Reiner.Steib@gmx.de>
+2007-01-07  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-soup.el: Add missing :group in previous change.
 
@@ -7,6 +7,32 @@
        * gnus-soup.el (gnus-soup): New custom group.  Make user variables
        customizable.
 
+2007-01-03  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * nnweb.el (nnweb-gmane-create-mapping): Put back code to merge the
+       headers read from disk with the ones newly found in the current search.
+       This should no longer cause problems, because the article numbers in
+       Gmane's `nov.php' output are ignored since the previous change.
+
+2006-01-03  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * nnweb.el (nnweb-gmane-create-mapping): Keep the mapping stable for
+       solid groups.
+
+2006-01-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnweb.el (nnweb-gmane-create-mapping): Use the article number from
+       the headers when creating the mapping to avoid mismappings.
+       (nnweb-gmane-create-mapping): Always nix out old mapping.
+
+2007-01-02  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * gmm-utils.el (gmm-tool-bar-style): Fix custom type.
+
+2007-01-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-decode.el (mm-display-external): Use itimer function for XEmacs.
+
 2006-12-30  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
        * gnus-sum.el (gnus-summary-insert-dormant-articles): Fix typo in

diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 59d02927008430f63ef08266a84df9edac684ce5..18b1a528c293f1288da824bd4c2a4bde2c4208bf 100644 (file)
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -203,8 +203,8 @@ This is copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
       'gnome
     'retro)
   "Prefered tool bar style."
-  :type '(choice (const :tag "GNOME style" 'gnome)
-                (const :tag "Retro look"  'retro))
+  :type '(choice (const :tag "GNOME style" gnome)
+                (const :tag "Retro look"  retro))
   :group 'gmm)
 
 (defvar tool-bar-map)

diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 7e6f93be1f1249e1f0a0b07060a11d8e25684393..361c83cfa7cd1c8b76dafd9fda78c93d3b9b56eb 100644 (file)
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -883,13 +883,21 @@ external if displayed external."
                          ;; a vector in Emacs but is a list in XEmacs)
                          ;; requires that it is lexically scoped.
                          (timer (run-at-time 2.0 nil 'ignore)))
-                      (lambda (process state)
-                        (when (eq 'exit (process-status process))
-                          (if (memq timer timer-list)
-                              (timer-set-function timer fn)
-                            (funcall fn))
-                          (ignore-errors (eval fm))
-                          (message "%s" done))))))
+                      (if (boundp 'itimer-list)
+                          (lambda (process state)
+                            (when (eq 'exit (process-status process))
+                              (if (memq timer itimer-list)
+                                  (set-itimer-function timer fn)
+                                (funcall fn))
+                              (ignore-errors (eval fm))
+                              (message "%s" done)))
+                        (lambda (process state)
+                          (when (eq 'exit (process-status process))
+                            (if (memq timer timer-list)
+                                (timer-set-function timer fn)
+                              (funcall fn))
+                            (ignore-errors (eval fm))
+                            (message "%s" done)))))))
                (mm-handle-set-external-undisplayer
                 handle (cons file buffer)))
              (message "Displaying %s..." command))

diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index d020d533aea123301a79bf5fc806e8ef13dbccbf..54c57879d5b3ecf6257f72c49673e75cd816bb7e 100644 (file)
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -480,7 +480,7 @@ Valid types include `google', `dejanews', and `gmane'.")
                    (from (mail-header-from header))
                    (subject (mail-header-subject header))
                    (rfc2047-encoding-type 'mime))
-               (when (string-match " \\([^:]+\\):\\([0-9]+\\)" xref)
+               (when (string-match " \\([^:]+\\)[:/]\\([0-9]+\\)" xref)
                  (mail-header-set-xref
                   header
                   (format "http://article.gmane.org/%s/%s/raw"
@@ -496,11 +496,8 @@ Valid types include `google', `dejanews', and `gmane'.")
                                         (rfc2047-encode-string subject))
 
                (unless (nnweb-get-hashtb (mail-header-xref header))
-                 (push
-                  (list
-                   (incf (cdr active))
-                   header)
-                  map)
+                 (mail-header-set-number header (incf (cdr active)))
+                 (push (list (mail-header-number header) header) map)
                  (nnweb-set-hashtb (cadar map) (car map))))))
          (forward-line 1)))
       (nnheader-message 7 "Searching Gmane...done")