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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/12 03:28:53

Modified files:
        lisp/mail      : rmailkwd.el 

Log message:
        (rmail-read-label): Don't scan for labels if the summary exists, since
        it's already done.

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

Patches:
Index: rmailkwd.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmailkwd.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- rmailkwd.el 11 Feb 2009 04:01:35 -0000      1.35
+++ rmailkwd.el 12 Feb 2009 03:28:53 -0000      1.36
@@ -64,11 +64,15 @@
 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))
+  (let* ((old nil)
        (result
         (progn
-          ;; Offer any existing labels as choices.
-          (if old (mapc 'rmail-make-label (split-string old ", ")))
+           ;; 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 "