[Emacs-diffs] emacs/lisp ChangeLog mail/rmail.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/01/28 02:50:43

Modified files:
        lisp           : ChangeLog 
        lisp/mail      : rmail.el 

Log message:
        (rmail-expunge-and-save): Always show a message,
        even when called from the summary.  (Bug#2075)
        (rmail-no-mail-p): New func, extracted from rmail-show-message-maybe.
        (rmail-show-message-maybe): Use rmail-no-mail-p.
        (rmail-show-message): If empty folder, do nothing.  (Bug#2076)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15196&r2=1.15197
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.473&r2=1.474

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15196
retrieving revision 1.15197
diff -u -b -r1.15196 -r1.15197
--- ChangeLog   28 Jan 2009 02:16:45 -0000      1.15196
+++ ChangeLog   28 Jan 2009 02:50:41 -0000      1.15197
@@ -1,3 +1,24 @@
+2009-01-28  Glenn Morris  <address@hidden>
+
+       * mail/rmail.el (rmail-expunge-and-save): Always show a message,
+       even when called from the summary.  (Bug#2075)
+       (rmail-no-mail-p): New func, extracted from rmail-show-message-maybe.
+       (rmail-show-message-maybe): Use rmail-no-mail-p.
+       (rmail-show-message): If empty folder, do nothing.  (Bug#2076)
+
+       (rmail-get-labels): Separate status and label fields with a semicolon,
+       rather than a comma, for consistency with old Rmail.
+
+       * mail/rmailsum.el (rmail-message-recipients-p-1): Don't bother
+       starting from the beginning, since mail-fetch-field does not care.
+       (rmail-create-summary-line): Fix unseen handling.  (Bug#2089)
+       (rmail-get-summary-status): New name for old rmail-get-summary-labels.
+       (rmail-get-summary-labels): New function.  Returns labels rather than
+       status (edited, etc).
+       (rmail-create-summary): Insert an extra space after the status
+       flags, for consistency with old rmail, and with current
+       rmail-summary-font-lock-keywords.
+
 2009-01-28  Chong Yidong  <address@hidden>
 
        * progmodes/perl-mode.el (perl-indent-line-command): Call
@@ -84,7 +105,8 @@
        (batch-unrmail, unrmail): Doc fix.
 
        * mail/rmailsum.el (rmail-message-recipients-p-1)
-       (rmail-message-regexp-p-1): Avoid clobbering the mark.
+       (rmail-message-regexp-p-1): Ensure searches start from the
+       beginning of the header.
 
 2009-01-27  Chong Yidong  <address@hidden>
 

Index: mail/rmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -b -r1.473 -r1.474
--- mail/rmail.el       27 Jan 2009 23:02:00 -0000      1.473
+++ mail/rmail.el       28 Jan 2009 02:50:43 -0000      1.474
@@ -1392,8 +1392,8 @@
   (rmail-swap-buffers-maybe)
   (save-buffer)
   (if (rmail-summary-exists)
-      (rmail-select-summary (set-buffer-modified-p nil))
-    (rmail-show-message)))
+      (rmail-select-summary (set-buffer-modified-p nil)))
+  (rmail-show-message))
 
 (defun rmail-quit ()
   "Quit out of RMAIL.
@@ -2051,7 +2051,8 @@
     (if (string= keywords "")
        (setq keywords nil))
     (cond
-     ((and attr-names keywords) (concat " " attr-names ", " keywords))
+     ;; FIXME ? old rmail did not have spaces in the comma-separated lists.
+     ((and attr-names keywords) (concat " " attr-names "; " keywords))
      (attr-names (concat " " attr-names))
      (keywords (concat " " keywords))
      (t ""))))
@@ -2429,6 +2430,14 @@
   (rmail-swap-buffers-maybe)
   (widen))
 
+(defun rmail-no-mail-p ()
+  "Return nil if there is mail, else \"No mail.\"."
+  (if (zerop rmail-total-messages)
+      (save-excursion
+       (with-current-buffer rmail-view-buffer
+         (erase-buffer)
+         "No mail."))))
+
 (defun rmail-show-message-maybe (&optional n no-summary)
   "Show message number N (prefix argument), counting from start of file.
 If summary buffer is currently displayed, update current message there also."
@@ -2439,12 +2448,8 @@
   (rmail-maybe-set-message-counters)
   (widen)
   (let ((msgnum (or n rmail-current-message))
-       blurb)
-    (if (zerop rmail-total-messages)
-       (save-excursion
-         (with-current-buffer rmail-view-buffer
-           (erase-buffer)
-           (setq blurb "No mail.")))
+       (blurb (rmail-no-mail-p)))
+    (unless blurb
       (setq blurb (rmail-show-message msgnum))
       (when mail-mailing-lists
        (rmail-unknown-mail-followup-to))
@@ -2484,6 +2489,7 @@
        blurb beg end body-start coding-system character-coding is-text-message)
     (if (not msg)
        (setq msg rmail-current-message))
+    (unless (setq blurb (rmail-no-mail-p))
     (cond ((<= msg 0)
           (setq msg 1
                 rmail-current-message 1
@@ -2554,7 +2560,7 @@
        (buffer-swap-text rmail-view-buffer)
        (set-buffer-modified-p modp))
       (setq rmail-buffer-swapped t)
-      (run-hooks 'rmail-show-message-hook))
+       (run-hooks 'rmail-show-message-hook)))
     blurb))
 
 (defun rmail-copy-headers (beg end &optional ignored-headers)