# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1239295836 0
# Node ID 8b13a9b37672251499bb3ef709d34cd3cb1b49a3
# Parent  497d7a904c673ea05e529c9a815c277f12499276
* mail/rmailkwd.el (rmail-set-label): Warn if multipe labels spec'd.
(rmail-kill-label, rmail-add-label): Doc fixes.

diff -r 497d7a904c67 -r 8b13a9b37672 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Apr 09 16:48:25 2009 +0000
+++ b/lisp/ChangeLog	Thu Apr 09 16:50:36 2009 +0000
@@ -1,5 +1,8 @@
 2009-04-09  Richard M Stallman  <rms@gnu.org>
 
+	* 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.
 
diff -r 497d7a904c67 -r 8b13a9b37672 lisp/mail/rmailkwd.el
--- a/lisp/mail/rmailkwd.el	Thu Apr 09 16:48:25 2009 +0000
+++ b/lisp/mail/rmailkwd.el	Thu Apr 09 16:50:36 2009 +0000
@@ -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))