[Emacs-diffs] emacs/lisp ChangeLog mail/rmailkwd.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/12 06:55:46

Modified files:
        lisp           : ChangeLog 
        lisp/mail      : rmailkwd.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15310&r2=1.15311
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmailkwd.el?cvsroot=emacs&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15310
retrieving revision 1.15311
diff -u -b -r1.15310 -r1.15311
--- ChangeLog   12 Feb 2009 05:48:41 -0000      1.15310
+++ ChangeLog   12 Feb 2009 06:55:43 -0000      1.15311
@@ -1,3 +1,8 @@
+2009-02-12  Glenn Morris  <address@hidden>
+
+       * mail/rmailkwd.el (rmail-set-label): Fix the test for a label being
+       already present.  (Bug#2210)
+
 2009-02-12  Kenichi Handa  <address@hidden>
 
        * international/characters.el (?.): New character category for

Index: mail/rmailkwd.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmailkwd.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- mail/rmailkwd.el    12 Feb 2009 03:28:53 -0000      1.36
+++ mail/rmailkwd.el    12 Feb 2009 06:55:46 -0000      1.37
@@ -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.