(elmo-collect-separators-internal): Add 2nd

optional argument `separators'.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 6011264..420e57b 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-13  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-util.el (elmo-collect-separators-internal): Add 2nd
+       optional argument `separators'.
+
 2006-02-26  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo.el (cache-changed): Abolish.

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 7a60871..feecd12 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1535,21 +1535,19 @@ ELT must be a string.  Upper-case and lower-case letters are treated as equal."
       (and result
           (char-list-to-string (elmo-uniq-list result #'delq))))))
 
-(defun elmo-collect-separators-internal (specs)
-  (let (separators)
-    (while specs
-      (let ((spec (car specs)))
-       (cond
-        ((listp spec)
-         (setq separators (nconc (elmo-collect-separators-internal spec)
-                                 separators)
-               specs (cdr specs)))
-        ((characterp spec)
-         (setq separators (cons spec separators)
-               specs nil))
-        (t
-         (setq specs nil)))))
-    separators))
+(defun elmo-collect-separators-internal (specs &optional separators)
+  (while specs
+    (let ((spec (car specs)))
+      (cond
+       ((listp spec)
+       (setq separators (elmo-collect-separators-internal spec separators)
+             specs (cdr specs)))
+       ((characterp spec)
+       (setq separators (cons spec separators)
+             specs nil))
+       (t
+       (setq specs nil)))))
+  separators)
 
 (defun elmo-collect-trail-separators (element specs)
   (cond