(rmail-read-label): Since rmail-keywords is a list

of symbols, we need to transform it into an alist for completion.

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index f4290a0d3a715d631ee0b321f4f0b8401d6948ce..b04edceaadc2290f41d8bf6f3e40b4041cf6d289 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-02  Alex Schroeder  <alex@gnu.org>
+
+       * rmailkwd.el (rmail-read-label): Since rmail-keywords is a list
+       of symbols, we need to transform it into an alist for completion.
+
 2006-03-01  Alex Schroeder  <alex@gnu.org>
 
        * rmailsum.el (rmail-summary-kill-label): Use rmail-kill-label

diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 8c294a4b36dda610bef08b628c6c40aa0df2020a..fa59ff91d8599d28966ecd43281bcd88be21579f 100644 (file)
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -137,7 +137,8 @@ message."
                       (concat prompt (if rmail-last-label
                                          (concat " (default " default "): ")
                                        ": "))
-                      rmail-keywords nil nil nil nil default)))))
+                      (mapcar 'list rmail-keywords)
+                      nil nil nil nil default)))))
       (setq rmail-last-label (rmail-make-label result t))
       ;; return the string, not the symbol
       result)))