(rmail-get-summary-labels): Treat empty labels as null.

2 files changed, 26 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb21b001dbb..81c7b016383 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2009-02-03  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmail.el (rmail-convert-babyl-to-mbox): Disable undo while
+        inserting the converted mailbox.
+        (rmail-get-new-mail): Restore the loop over inboxes when two or more
+        have the same basename.  (Bug#2164)
+        Set the return value according to whether any mail was found,
+        not just in the last inbox.  Only show a message and run the hook after
+        checking all inboxes.
+        (rmail-get-new-mail-1): Move message display and running the hook to
+        rmail-get-new-mail.
+
+        * mail/rmailkwd.el (rmail-label-obarray): Initialize using
+        rmail-attr-array.
+        (rmail-make-label, rmail-read-label): Give it a doc string.
+        (rmail-add-label, rmail-kill-label): Change argument name to match the
+        doc.  Doc fix.
+        (rmail-set-label): Doc fix.  Also update summary in attr case.
+        Accept labels as a string or a symbol.  (Bug#2165)
+
+        * mail/rmailsum.el (rmail-get-summary-labels): Treat empty labels as
+        null.
+
 2009-02-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/vhdl-mode.el (vhdl-prepare-search-1)
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index eb202721353..5c250039c30 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -426,7 +426,9 @@ Returns nil if there are no labels.  The current buffer must
 already be narrowed to the message headers for the message being
 processed."
   (let ((labels (mail-fetch-field rmail-keyword-header)))
-    (if labels (format "{ %s } " labels))))
+    (and labels
+         (not (string-equal labels ""))
+         (format "{ %s } " labels))))
 
 (defun rmail-create-summary (msgnum deleted unseen lines)
   "Return the summary line for message MSGNUM.