Update copyright year to 2015

[gnu-emacs] / lisp / mail / rmailkwd.el

diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 1dab426e20f155afef80f0db99616f4a6d0dadc3..f46a687d152cdae5ab518e9cff2eb58bb315a4d9 100644 (file)
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -1,10 +1,11 @@
 ;;; rmailkwd.el --- part of the "RMAIL" mail reader for Emacs
 
-;; Copyright (C) 1985, 1988, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1988, 1994, 2001-2015 Free Software Foundation,
+;; Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
+;; Package: rmail
 
 ;; This file is part of GNU Emacs.
 
@@ -46,7 +47,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 +55,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))
 
@@ -64,20 +65,24 @@ LABEL may be a symbol or string."
 Completions are chosen from `rmail-label-obarray'.  The default
 is `rmail-last-label', if that is non-nil.  Updates `rmail-last-label'
 according to the choice made, and returns a symbol."
-  (let* ((old (rmail-get-keywords))
-       (result
-        (progn
-          ;; Offer any existing labels as choices.
-          (if old (mapc 'rmail-make-label (split-string old ", ")))
-          (completing-read (concat prompt
-                                   (if rmail-last-label
-                                       (concat " (default "
-                                               (symbol-name rmail-last-label)
-                                               "): ")
-                                     ": "))
-                           rmail-label-obarray
-                           nil
-                           nil))))
+  (let* ((old nil)
+        (result
+         (progn
+           ;; If the summary exists, we've already read all the
+           ;; existing labels.  If not, read the ones in this message.
+           (or (eq major-mode 'rmail-summary-mode)
+               (rmail-summary-exists)
+               (and (setq old (rmail-get-keywords))
+                    (mapc 'rmail-make-label (split-string old ", "))))
+           (completing-read (concat prompt
+                                    (if rmail-last-label
+                                        (concat " (default "
+                                                (symbol-name rmail-last-label)
+                                                "): ")
+                                      ": "))
+                            rmail-label-obarray
+                            nil
+                            nil))))
     (if (string= result "")
        rmail-last-label
       (setq rmail-last-label (rmail-make-label result)))))
@@ -88,9 +93,12 @@ 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))
+    (if (zerop (or msg (setq msg rmail-current-message)))
+       (error "No message"))
     ;; Force recalculation of summary for this message.
     (aset rmail-summary-vector (1- msg) nil)
     (let (attr-index)
@@ -102,9 +110,10 @@ 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))
+       (let* ((header (rmail-get-keywords msg))
               (regexp (concat ", " (regexp-quote label) ","))
-              (present (string-match regexp (concat ", " header ","))))
+              (present (not (null
+                             (string-match regexp (concat ", " header ","))))))
          ;; If current state is not correct,
          (unless (eq present state)
            ;; either add it or delete it.
@@ -122,7 +131,9 @@ LABEL may be a symbol or string."
                                       (min (length header)
                                            (- (match-end 0) 1)))))
                 (cond ((string= before "")
-                       after)
+                       ;; If before and after both empty, delete the header.
+                       (unless (string= after "")
+                         after))
                       ((string= after "")
                        before)
                       (t (concat before ", " after))))))))))
@@ -150,6 +161,7 @@ With prefix argument N moves backward N messages with these labels."
 LABELS should be a comma-separated list of label names.
 If LABELS is empty, the last set of labels specified is used.
 With prefix argument N moves forward N messages with these labels."
+  ;; FIXME show the default in the prompt.
   (interactive "p\nsMove to next msg with labels: ")
   (if (string= labels "")
       (setq labels rmail-last-multi-labels))
@@ -175,9 +187,12 @@ With prefix argument N moves forward N messages with these labels."
        (error "No previous message with labels %s" labels)
       (if (> n 0)
          (error "No following message with labels %s" labels)
-       (rmail-show-message lastwin)))))
+       (rmail-show-message-1 lastwin)))))
 
 (provide 'rmailkwd)
 
-;; arch-tag: 1149979c-8e47-4333-9629-cf3dc887a6a7
+;; Local Variables:
+;; generated-autoload-file: "rmail.el"
+;; End:
+
 ;;; rmailkwd.el ends here