Synch to Oort Gnus 200304170917.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c1ea21d..3d8bbd6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,3 @@
-2003-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * lpath.el: Fbind compare-strings for XEmacs.
-
 2003-04-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-srvr.el (gnus-browse-make-menu-bar): Fix typo.
@@ -18,6 +14,11 @@
 
 2003-04-17  Steve Youngs  <youngs@xemacs.org>
 
+       * dgnushack.el: 'setenv' is in env.el for XEmacsen <= 21.4, but in
+       process.el in XEmacsen >= 21.5.
+
+2003-04-17  Steve Youngs  <youngs@xemacs.org>
+
        * dgnushack.el: Add a whole swag of autoloads and defaliases to
        satisfy the byte-compiler when building with XEmacs.
 

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 190dfe6..831f4b9 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1146,17 +1146,14 @@ Return the modified alist."
        (remove-text-properties start end properties object))
     t))
 
-(if (fboundp 'compare-strings)
-    ;; Reduce consing.  (Assume multibyte conversion `compare-strings'
-    ;; can do isn't relevant.)
-    (defun gnus-string-equal (x y)
-      "Like `string-equal', except it compares case-insensitively."
-      (eq t (compare-strings x nil nil y nil nil t)))
-  (defun gnus-string-equal (x y)
-    "Like `string-equal', except it compares case-insensitively."
-    (and (= (length x) (length y))
-        (or (string-equal x y)
-            (string-equal (downcase x) (downcase y))))))
+;; This might use `compare-strings' to reduce consing in the
+;; case-insensitive case, but it has to cope with null args.
+;; (`string-equal' uses symbol print names.)
+(defun gnus-string-equal (x y)
+  "Like `string-equal', except it compares case-insensitively."
+  (and (= (length x) (length y))
+       (or (string-equal x y)
+          (string-equal (downcase x) (downcase y)))))
 
 (defcustom gnus-use-byte-compile t
   "If non-nil, byte-compile crucial run-time codes.

diff --git a/lisp/lpath.el b/lisp/lpath.el
index bbb0eb9..06d2bd1 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -33,7 +33,7 @@
       (maybe-fbind '(Info-directory
                     Info-menu ccl-execute-on-string char-charset charsetp
                     coding-system-get coding-system-list coding-system-p
-                    compare-strings decode-coding-region decode-coding-string
+                    decode-coding-region decode-coding-string
                     define-ccl-program delete-overlay detect-coding-region
                     encode-coding-region encode-coding-string
                     event-click-count event-end event-start
@@ -81,7 +81,7 @@
        ((boundp 'MULE)
         '(charsetp
           coding-system-base coding-system-get coding-system-list
-          coding-system-to-mime-charset compare-strings compose-mail
+          coding-system-to-mime-charset compose-mail
           file-name-extension find-coding-systems-for-charsets
           find-coding-systems-region function-max-args get-charset-property
           smiley-encode-buffer smtpmail-send-it))