Commit 28e50631 authored by Glenn Morris's avatar Glenn Morris
Browse files

(rmail-read-label): Don't scan for labels if the summary exists, since

it's already done.
parent 5c9b1aaa
......@@ -64,20 +64,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)))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment