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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/12/09 23:23:05

Modified files:
        lisp/mail      : pmail.el 

Log message:
        (pmail-expunge): Pass new optional arg to pmail-only-expunge.
        (pmail-expunge-and-save): Don't reset view buffer.

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

Patches:
Index: pmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/pmail.el,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- pmail.el    9 Dec 2008 19:35:06 -0000       1.24
+++ pmail.el    9 Dec 2008 23:23:05 -0000       1.25
@@ -1495,7 +1495,7 @@
 (defun pmail-expunge-and-save ()
   "Expunge and save PMAIL file."
   (interactive)
-  (pmail-expunge)
+  (pmail-expunge t)
   (set-buffer pmail-buffer)
   (save-buffer)
   (if (pmail-summary-exists)
@@ -2889,7 +2889,7 @@
 (defun pmail-swap-buffers-maybe ()
   "Determine if the Pmail buffer is showing a message.
 If so restore the actual mbox message collection."
-  (unless (not pmail-buffers-swapped-p)
+  (when pmail-buffers-swapped-p
     (with-current-buffer pmail-buffer
       (buffer-swap-text pmail-view-buffer)
       (setq pmail-buffers-swapped-p nil))))
@@ -3572,11 +3572,11 @@
          (goto-char (+ (point-min) opoint))
        (goto-char (+ (point) opoint))))))
 
-(defun pmail-expunge ()
+(defun pmail-expunge (&optional dont-show)
   "Erase deleted messages from Pmail file and summary buffer."
   (interactive)
   (when (pmail-expunge-confirmed)
-    (pmail-only-expunge)
+    (pmail-only-expunge dont-show)
     (if (pmail-summary-exists)
        (pmail-select-summary (pmail-update-summary)))))