(gnus-replace-in-string): Remove Emacs 20 code.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 771376b..9cf03a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-08  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-util.el (gnus-replace-in-string): Remove Emacs 20 code.
+
 2003-11-15  Simon Josefsson  <jas@extundo.com>
 
        * pgg-gpg.el (pgg-gpg-lookup-all-secret-keys)

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index e1f22b7..016f960 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -57,15 +57,7 @@
     (defalias 'gnus-replace-in-string 'replace-in-string))
    ((fboundp 'replace-regexp-in-string)
     (defun gnus-replace-in-string  (string regexp newtext &optional literal)
-      (replace-regexp-in-string regexp newtext string nil literal)))
-   (t
-    (defun gnus-replace-in-string (string regexp newtext &optional literal)
-      (let ((start 0) tail)
-       (while (string-match regexp string start)
-         (setq tail (- (length string) (match-end 0)))
-         (setq string (replace-match newtext nil literal string))
-         (setq start (- (length string) tail))))
-      string))))
+      (replace-regexp-in-string regexp newtext string nil literal)))))
 
 ;;; bring in the netrc functions as aliases
 (defalias 'gnus-netrc-get 'netrc-get)