From: Glenn Morris <rgm@gnu.org>
Date: Thu, 12 Feb 2009 06:55:43 +0000 (+0000)
Subject: (rmail-set-label): Fix the test for a label being already present.  (Bug#2210)
X-Git-Tag: emacs-pretest-23.0.91~268
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e8fc1b6f6da17ba948f35f167c1d0f250b59093;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a635e65ba23..d68d8e24001 100644
--- 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 c1c712ba579..03f48ad91a7 100644
--- 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.