(rmail-set-label): Fix the test for a label being already present. (Bug#2210)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a635e65ba2369c0736ef753ca5c0e7e1f013d5f6..d68d8e2400122a9403eacefe5685136e216bf367 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-12  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmailkwd.el (rmail-set-label): Fix the test for a label being
+       already present.  (Bug#2210)
+
 2009-02-12  Kenichi Handa  <handa@m17n.org>
 
        * international/characters.el (?.): New character category for

diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index c1c712ba579c29edce518681f6c8dd7d01b3dbc2..03f48ad91a773ffbbc5e757bbd9d98ac7b7e64a9 100644 (file)
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -106,9 +106,8 @@ LABEL may be a symbol or string."
          ;; If so, set it as an attribute.
          (rmail-set-attribute attr-index state msg)
        ;; Is this keyword already present in msg's keyword list?
-       (let* ((header (rmail-get-header rmail-keyword-header msg))
-              (regexp (concat ", " (regexp-quote label) ","))
-              (present (string-match regexp (concat ", " header ","))))
+       (let* ((header (rmail-get-keywords msg))
+              (present (not (null (member label (split-string header ", "))))))
          ;; If current state is not correct,
          (unless (eq present state)
            ;; either add it or delete it.