From 4f688bc1fb1275c72b0fa59be53801c3e17c27c4 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Sat, 11 Oct 2003 14:57:33 +0000
Subject: [PATCH] Synch to Gnus 200310101613.

---
 lisp/ChangeLog        |   13 +++++++++++++
 lisp/gnus-registry.el |    8 ++++++++
 lisp/mm-decode.el     |    2 +-
 lisp/spam.el          |   17 +++++++----------
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2db82d9..03368e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2003-10-10  Jesper Harder  <harder@ifa.au.dk>
+
+	* mm-decode.el (mm-file-name-delete-gotchas): Avoid infloop in
+	XEmacs.
+
+2003-10-10  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el (spam-initialize): new function, does the spam-face
+	update and all the hooks, replaces spam-install-hooks-function
+
+	* gnus-registry.el (gnus-registry-initialize): new autoloaded
+	function to explicitly initialize the registry
+
 2003-10-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-decode.el (mm-w3m-safe-url-regexp): Doc fix.
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 8160c81..e3b9177 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -569,6 +569,14 @@ Returns the first place where the trail finds a group name."
   (setq gnus-registry-hashtb (alist-to-hashtable gnus-registry-alist))
   (setq gnus-registry-dirty t))
 
+;;;###autoload
+(defun gnus-registry-initialize ()
+  (interactive)
+  (setq gnus-registry-install t)
+  (gnus-registry-install-hooks)
+  (gnus-registry-read))
+
+;;;###autoload
 (defun gnus-registry-install-hooks ()
   "Install the registry hooks."
   (interactive)
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 04b352a..fe7eed1 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1041,7 +1041,7 @@ string if you do not like underscores."
 (defun mm-file-name-delete-gotchas (filename)
   "Delete shell gotchas from FILENAME."
   (setq filename (gnus-replace-in-string filename "[<>|]" ""))
-  (gnus-replace-in-string filename "^[.-]*" ""))
+  (gnus-replace-in-string filename "^[.-]+" ""))
 
 (defun mm-save-part (handle)
   "Write HANDLE to a file."
diff --git a/lisp/spam.el b/lisp/spam.el
index c592b51..d50e448 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -367,13 +367,6 @@ spamoracle database."
   "Msx" gnus-summary-mark-as-spam
   "\M-d" gnus-summary-mark-as-spam)
 
-;;; How to highlight a spam summary line.
-
-;; TODO: How do we redo this every time spam-face is customized?
-
-(push '((eq mark gnus-spam-mark) . spam-face)
-      gnus-summary-highlight)
-
 ;; convenience functions
 (defun spam-group-ham-mark-p (group mark &optional spam)
   (when (stringp group)
@@ -1221,9 +1214,13 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
 ;;;; Hooks
 
 ;;;###autoload
-(defun spam-install-hooks-function ()
-  "Install the spam.el hooks"
+(defun spam-initialize ()
+  "Install the spam.el hooks and do other initialization"
   (interactive)
+  (setq spam-install-hooks t)
+  ;; TODO: How do we redo this every time spam-face is customized?
+  (push '((eq mark gnus-spam-mark) . spam-face)
+	gnus-summary-highlight)
   ;; Add hooks for loading and saving the spam stats
   (when spam-use-stat
     (add-hook 'gnus-save-newsrc-hook 'spam-maybe-spam-stat-save)
@@ -1244,7 +1241,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
   (remove-hook 'gnus-get-new-news-hook 'spam-setup-widening))
 
 (when spam-install-hooks
-  (spam-install-hooks-function))
+  (spam-initialize))
 
 (provide 'spam)
 
-- 
1.7.10.4