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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/12/20 04:29:26

Modified files:
        lisp/mail      : pmail.el 

Log message:
        (pmail-expunge-and-save): Call pmail-swap-buffers-maybe before
        saving.
        (pmail-quit): Handling expunging manually, instead of calling
        pmail-expunge-and-save.
        (pmail-next-undeleted-message): If no other message can be shown,
        show the current one.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/pmail.el?cvsroot=emacs&r1=1.33&r2=1.34

Patches:
Index: pmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/pmail.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- pmail.el    20 Dec 2008 04:07:07 -0000      1.33
+++ pmail.el    20 Dec 2008 04:29:26 -0000      1.34
@@ -1409,19 +1409,22 @@
 (defun pmail-expunge-and-save ()
   "Expunge and save PMAIL file."
   (interactive)
-  (pmail-expunge t)
   (set-buffer pmail-buffer)
+  (pmail-expunge t)
+  (pmail-swap-buffers-maybe)
   (save-buffer)
   (if (pmail-summary-exists)
-      (pmail-select-summary (set-buffer-modified-p nil))))
+      (pmail-select-summary (set-buffer-modified-p nil))
+    (pmail-show-message)))
 
 (defun pmail-quit ()
   "Quit out of PMAIL.
 Hook `pmail-quit-hook' is run after expunging."
   (interactive)
-  ;; Determine if the buffers need to be swapped.
+  (set-buffer pmail-buffer)
+  (pmail-expunge t)
   (pmail-swap-buffers-maybe)
-  (pmail-expunge-and-save)
+  (save-buffer)
   (when (boundp 'pmail-quit-hook)
     (run-hooks 'pmail-quit-hook))
   ;; Don't switch to the summary buffer even if it was recently visible.
@@ -2696,6 +2699,7 @@
          (message "No previous nondeleted message"))
       (if (> n 0)
          (message "No following nondeleted message"))
+      (pmail-show-message-maybe pmail-current-message)
       nil)))
 
 (defun pmail-previous-undeleted-message (n)