Synch to No Gnus 200401100427.

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

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 93681e4..457c867 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -302,9 +302,6 @@ be set in `.emacs' instead."
 (unless (fboundp 'gnus-group-remove-excess-properties)
   (defalias 'gnus-group-remove-excess-properties 'ignore))
 
-(unless (fboundp 'gnus-set-text-properties)
-  (defalias 'gnus-set-text-properties 'set-text-properties))
-
 (unless (featurep 'gnus-xmas)
   (defalias 'gnus-make-overlay 'make-overlay)
   (defalias 'gnus-delete-overlay 'delete-overlay)
@@ -967,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.
 
@@ -2536,8 +2533,7 @@ This variable can be nil, gnus or gnus-ja."
   "Gnus variables saved in the quick startup file.")
 
 (defvar gnus-product-variable-file-list
-  (let ((version (product-version (product-find 'gnus-vers)))
-       (codesys (static-if (boundp 'MULE) '*ctext* 'ctext)))
+  (let ((version (product-version (product-find 'gnus-vers))))
     `(("strict-cache"
        ((product-version ,version)
        (emacs-version)
@@ -2548,7 +2544,7 @@ This variable can be nil, gnus or gnus-ja."
        ((product-version ,version)
        (emacs-version)
        (correct-string-widths))
-       ,codesys
+       ctext
        gnus-format-specs)))
   "Alist of the methods for checking whether the contents of the T-gnus
 quick startup files are valid.  One is for the byte-compiled format
@@ -2827,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)))
@@ -2847,12 +2842,8 @@ gnus-registry.el will populate this if it's loaded.")
 ;; To make shimbun groups.
 (autoload 'gnus-group-make-shimbun-group "nnshimbun" nil t)
 
-;; A tool for the developers.
-(autoload 'find-cl-run-time-functions "gnus-clfns" nil t)
-
 ;;; gnus-sum.el thingies
 
-
 (defcustom gnus-summary-line-format "%U%R%z%I%(%[%4L: %-23,23f%]%) %s\n"
   "*The format specification of the lines in the summary buffer.
 
@@ -3310,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))