(rmail-expunge): When there's no deleted messages,

do nothing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 676dc6e21c33782bcfbb731e167e705c7c36d803..b4041dde8f630ecf2408dc98b0f9fe38f90faa4b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
 2000-04-26  Kenichi Handa  <handa@etl.go.jp>
 
-       * mail/rmail.el (rmail-expunge): When there's no deleted messages,
-       do nothing.
+       * mail/rmail.el (rmail-expunge): When there are no deleted
+       messages, do nothing.
 
 2000-04-26  Dave Love  <fx@gnu.org>
 

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 1aab4a4b4b21212c020374614aa2b81fbf460a0e..cb18a9053c4f5b5081884c644b6dd70ff6803a5d 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2683,9 +2683,11 @@ Deleted messages stay in the file until the \\[rmail-expunge] command is given."
 (defun rmail-expunge ()
   "Erase deleted messages from Rmail file and summary buffer."
   (interactive)
-  (when (or (null rmail-confirm-expunge)
-           (funcall rmail-confirm-expunge
-                    "Erase deleted messages from Rmail file? "))
+  (when (and (stringp rmail-deleted-vector)
+            (string-match "D" rmail-deleted-vector)
+            (or (null rmail-confirm-expunge)
+                (funcall rmail-confirm-expunge
+                         "Erase deleted messages from Rmail file? ")))
     (rmail-only-expunge)
     (if (rmail-summary-exists)
        (rmail-select-summary