Sync.

diff --git a/ChangeLog b/ChangeLog
index 0516088..d27f4f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,5 @@
 2000-05-08  Katsumi Yamaoka <yamaoka@jpl.org>
 
-       * lisp/gnus-ems.el (subst-char-in-string): New function defined by
-       `defun-maybe'.
-
-2000-05-08  Katsumi Yamaoka <yamaoka@jpl.org>
-
        * lisp/gnus-vers.el (T-gnus): Update to 6.14.4.
 
        * README.T-gnus: Update.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02307dc..d94b6ef 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-08 22:34:24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-group.el (gnus-group-list-cached): Don't use
+       `subst-char-in-string'.
+       
 2000-05-08  Dave Love  <fx@gnu.org>
 
        * pop3.el (pop3-open-server): Fix creating name of trace buffer.

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index c66def9..b737b97 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -272,18 +272,6 @@ for XEmacs."
       (setq alist (cdr alist)))
     element))
 
-(defun-maybe subst-char-in-string (fromchar tochar string &optional inplace)
-  "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
-Unless optional argument INPLACE is non-nil, return a new string.
-\[Emacs 20.4 emulating function]."
-  (let ((i (length string))
-       (newstr (if inplace string (copy-sequence string))))
-    (while (> i 0)
-      (setq i (1- i))
-      (if (eq (aref newstr i) fromchar)
-         (aset newstr i tochar)))
-    newstr))
-
 \f
 ;;; Language support staffs.
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 8b7f2eb..42e5a02 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -3659,7 +3659,9 @@ This command may read the active file."
                                        ;; Cache active file might use "." 
                                        ;; instead of ":".
                                        (gnus-gethash 
-                                        (subst-char-in-string ?: ?. group)
+                                        (mapconcat 'identity
+                                                   (split-string group ":")
+                                                   ".")
                                         gnus-cache-active-hashtb))))
   (goto-char (point-min))
   (gnus-group-position-point))