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

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       09/04/09 16:50:39

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

Log message:
        * mail/rmailkwd.el (rmail-set-label): Warn if multipe labels spec'd.
        (rmail-kill-label, rmail-add-label): Doc fixes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15570&r2=1.15571
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmailkwd.el?cvsroot=emacs&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15570
retrieving revision 1.15571
diff -u -b -r1.15570 -r1.15571
--- ChangeLog   9 Apr 2009 16:48:25 -0000       1.15570
+++ ChangeLog   9 Apr 2009 16:50:36 -0000       1.15571
@@ -1,5 +1,8 @@
 2009-04-09  Richard M Stallman  <address@hidden>
 
+       * mail/rmailkwd.el (rmail-set-label): Warn if multipe labels spec'd.
+       (rmail-kill-label, rmail-add-label): Doc fixes.
+
        * mail/rmailout.el (rmail-output): If file is visited,
        check the buffer's format.
 

Index: mail/rmailkwd.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/rmailkwd.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- mail/rmailkwd.el    13 Feb 2009 07:44:18 -0000      1.41
+++ mail/rmailkwd.el    9 Apr 2009 16:50:39 -0000       1.42
@@ -46,7 +46,7 @@
 (defun rmail-add-label (label)
   "Add LABEL to labels associated with current RMAIL message.
 Completes (see `rmail-read-label') over known labels when reading.
-LABEL may be a symbol or string."
+LABEL may be a symbol or string.  Only one label is allowed."
   (interactive (list (rmail-read-label "Add label")))
   (rmail-set-label label t))
 
@@ -54,7 +54,7 @@
 (defun rmail-kill-label (label)
   "Remove LABEL from labels associated with current RMAIL message.
 Completes (see `rmail-read-label') over known labels when reading.
-LABEL may be a symbol or string."
+LABEL may be a symbol or string.  Only one label is allowed."
   (interactive (list (rmail-read-label "Remove label")))
   (rmail-set-label label nil))
 
@@ -92,6 +92,8 @@
   "Set LABEL as present or absent according to STATE in message MSG.
 LABEL may be a symbol or string."
   (or (stringp label) (setq label (symbol-name label)))
+  (if (string-match "," label)
+      (error "More than one label specified"))
   (with-current-buffer rmail-buffer
     (rmail-maybe-set-message-counters)
     (or msg (setq msg rmail-current-message))