(nnmail-split-fancy-with-parent): Correct `mapconcat'

syntax.  Protect string-match against nil string and regexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e50e0d8..5b1450e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
 2001-08-04  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * nnmail.el (nnmail-split-fancy-with-parent): Correct `mapconcat'
-       syntax.
+       syntax.  Protect string-match against nil string and regexp.
 
 2001-08-03 19:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index ff18422..1901e19 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1496,7 +1496,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
       (mapcar (lambda (x)
                (setq res (or (nnmail-cache-fetch-group x) res))
                (when (or (string= "drafts" res)
-                         (and regexp (string-match regexp res)))
+                         (and regexp res (string-match regexp res)))
                  (setq res nil)))
              references)
       res)))