Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-592
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-593
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-594
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-595
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-596
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-597
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-598
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-186
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-187
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-188
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-189
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-190
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-191
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-593

5 files changed, 66 insertions, 23 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ec7476b8758..a56f9ff1536 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,8 +1,38 @@
+2007-01-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-soup.el: Add missing :group in previous change.
+
 2007-01-05  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* 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 59d02927008..18b1a528c29 100644
--- 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/gnus-soup.el b/lisp/gnus/gnus-soup.el
index 31074cb8c77..d5b1a9fad88 100644
--- a/lisp/gnus/gnus-soup.el
+++ b/lisp/gnus/gnus-soup.el
@@ -45,18 +45,21 @@
 (defcustom gnus-soup-directory (nnheader-concat gnus-home-directory "SoupBrew/")
   "Directory containing an unpacked SOUP packet."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'directory)
+  :type 'directory
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-replies-directory
   (nnheader-concat gnus-soup-directory "SoupReplies/")
   "Directory where Gnus will do processing of replies."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'directory)
+  :type 'directory
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-prefix-file "gnus-prefix"
   "Name of the file where Gnus stores the last used prefix."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'file)
+  :type 'file
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-packer "tar cf - %s | gzip > $HOME/Soupout%d.tgz"
   "Format string command for packing a SOUP packet.
@@ -64,28 +67,33 @@ The SOUP files will be inserted where the %s is in the string.
 This string MUST contain both %s and %d.  The file number will be
 inserted where %d appears."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'string)
+  :type 'string
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-unpacker "gunzip -c %s | tar xvf -"
   "Format string command for unpacking a SOUP packet.
 The SOUP packet file name will be inserted at the %s."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'string)
+  :type 'string
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-packet-directory gnus-home-directory
   "Where gnus-soup will look for REPLIES packets."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'directory)
+  :type 'directory
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-packet-regexp "Soupin"
   "Regular expression matching SOUP REPLIES packets in `gnus-soup-packet-directory'."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'regexp)
+  :type 'regexp
+  :group 'gnus-soup)
 
 (defcustom gnus-soup-ignored-headers "^Xref:"
   "Regexp to match headers to be removed when brewing SOUP packets."
   :version "22.1" ;; Gnus 5.10.9
-  :type 'regexp)
+  :type 'regexp
+  :group 'gnus-soup)
 
 ;;; Internal Variables:
 
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 7e6f93be1f1..361c83cfa7c 100644
--- 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 d020d533aea..54c57879d5b 100644
--- 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")