From 6dd50fed29f6c99b106bcf92d79fab07d7e2f7dc Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 9 Apr 2009 16:50:36 +0000 Subject: [PATCH] * mail/rmailkwd.el (rmail-set-label): Warn if multipe labels spec'd. (rmail-kill-label, rmail-add-label): Doc fixes. --- lisp/ChangeLog | 3 +++ lisp/mail/rmailkwd.el | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 00bc4b3d71d..47f8c1e2d6d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-04-09 Richard M Stallman + * 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 --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el index 5c69daa6d33..b52ad4897f8 100644 --- a/lisp/mail/rmailkwd.el +++ b/lisp/mail/rmailkwd.el @@ -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 @@ LABEL may be a symbol or string." (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 @@ according to the choice made, and returns a symbol." "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)) -- 2.39.2