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

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       09/03/22 14:50:42

Modified files:
        lisp/mail      : rmail.el 

Log message:
        (rmail-expunge): Without DONT-SHOW, show the message even after
        updating summary.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.529&r2=1.530

Patches:
Index: rmail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -b -r1.529 -r1.530
--- rmail.el    22 Mar 2009 14:12:34 -0000      1.529
+++ rmail.el    22 Mar 2009 14:50:42 -0000      1.530
@@ -3265,17 +3265,18 @@
   (interactive)
   (when (rmail-expunge-confirmed)
     (let ((was-deleted (rmail-message-deleted-p rmail-current-message))
-         (was-swapped (rmail-buffers-swapped-p))
-         (total rmail-total-messages))
+         (was-swapped (rmail-buffers-swapped-p)))
       (rmail-only-expunge t)
       (if dont-show
          ;; Do update the summary buffer, if any.
+         (let ((total rmail-total-messages))
          (when (rmail-summary-exists)
            (with-current-buffer rmail-summary-buffer
              (let ((rmail-total-messages total))
-               (rmail-update-summary))))
+                 (rmail-update-summary)))))
+       ;; Update the summary and show it.
        (if (rmail-summary-exists)
-           (rmail-select-summary (rmail-update-summary))
+           (rmail-select-summary (rmail-update-summary)))
          ;; If we expunged the current message, a new one is current now,
          ;; so show it.  If we weren't showing a message, show it. 
          (if (or was-deleted (not was-swapped))
@@ -3283,7 +3284,7 @@
            ;; Show the same message that was being shown before.
            (rmail-display-labels)
            (rmail-swap-buffers)
-           (setq rmail-buffer-swapped t)))))))
+         (setq rmail-buffer-swapped t))))))
 
 ;;;; *** Rmail Mailing Commands ***