(gnus-replace-in-string): Prefer

replace-regexp-in-string over of replace-in-string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20df819..06fa197 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-util.el (gnus-replace-in-string): Prefer
+       replace-regexp-in-string over of replace-in-string.
+
 2006-04-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-util.el (gnus-select-frame-set-input-focus): Use

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index d29e238..c051ea7 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -60,8 +60,11 @@
 
 (eval-and-compile
   (cond
-   ((fboundp 'replace-in-string)
-    (defalias 'gnus-replace-in-string 'replace-in-string))
+   ;; Prefer `replace-regexp-in-string' (present in Emacs, XEmacs 21.5,
+   ;; SXEmacs 22.1.4) over `replace-in-string'.  The later leads to inf-loops
+   ;; on empty matches:
+   ;;   (replace-in-string "foo" "/*$" "/")
+   ;;   (replace-in-string "xe" "\\(x\\)?" "")
    ((fboundp 'replace-regexp-in-string)
     (defun gnus-replace-in-string  (string regexp newtext &optional literal)
       "Replace all matches for REGEXP with NEWTEXT in STRING.
@@ -69,7 +72,9 @@ If LITERAL is non-nil, insert NEWTEXT literally.  Return a new
 string containing the replacements.
 
 This is a compatibility function for different Emacsen."
-      (replace-regexp-in-string regexp newtext string nil literal)))))
+      (replace-regexp-in-string regexp newtext string nil literal)))
+   ((fboundp 'replace-in-string)
+    (defalias 'gnus-replace-in-string 'replace-in-string))))
 
 (defun gnus-boundp (variable)
   "Return non-nil if VARIABLE is bound and non-nil."
@@ -1565,6 +1570,7 @@ predicate on the elements."
                (concat codename
                        (when system-v ", ")))
              (when system-v system-v)
+             ", " (if (featurep 'mule) "" "no ") "Mule"
              ")"))
      (t emacs-version))))