Synch to No Gnus 200401100427.

[elisp/gnus.git-] / lisp / gnus.el

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 51a6f23..457c867 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -964,10 +964,10 @@ be set in `.emacs' instead."
 
 (eval-when (load)
   (let ((command (format "%s" this-command)))
-    (if (and (string-match "gnus" command)
-            (not (string-match "gnus-other-frame" command)))
-       (gnus-splash)
-      (gnus-get-buffer-create gnus-group-buffer))))
+    (when (string-match "gnus" command)
+      (if (string-match "gnus-other-frame" command)
+         (gnus-get-buffer-create gnus-group-buffer)
+       (gnus-splash)))))
 
 ;;; Do the rest.
 
@@ -2823,9 +2823,8 @@ gnus-registry.el will populate this if it's loaded.")
 
 (eval-and-compile
   (unless (featurep 'xemacs)
-    (if (>= emacs-major-version 21)
-       (autoload 'x-face-decode-message-header "x-face-e21")
-      (autoload 'x-face-mule-gnus-article-display-x-face "x-face-mule"))))
+    (autoload 'x-face-decode-message-header "x-face-e21")
+    (autoload 'x-face-mule-gnus-article-display-x-face "x-face-mule")))
 
 (unless (and (fboundp 'base64-encode-string)
             (subrp (symbol-function 'base64-encode-string)))
@@ -3302,7 +3301,7 @@ that that variable is buffer-local to the summary buffers."
 (defun gnus-generate-new-group-name (leaf)
   (let ((name leaf)
        (num 0))
-    (while (gnus-gethash name gnus-newsrc-hashtb)
+    (while (gnus-group-entry name)
       (setq name (concat leaf "<" (int-to-string (setq num (1+ num))) ">")))
     name))