# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1234421743 0
# Node ID 5edae205a1ff9d4819eaff393afd828e45ad66e9
# Parent  214450de83bc992d8b876a9e94b97df44ed74c21
(rmail-set-label): Fix the test for a label being already present.  (Bug#2210)

diff -r 214450de83bc -r 5edae205a1ff lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 12 06:28:59 2009 +0000
+++ b/lisp/ChangeLog	Thu Feb 12 06:55:43 2009 +0000
@@ -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 -r 214450de83bc -r 5edae205a1ff lisp/mail/rmailkwd.el
--- a/lisp/mail/rmailkwd.el	Thu Feb 12 06:28:59 2009 +0000
+++ b/lisp/mail/rmailkwd.el	Thu Feb 12 06:55:43 2009 +0000
@@ -106,9 +106,8 @@
 	  ;; 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.