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

do nothing.

2 files changed, 7 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 676dc6e21c3..b4041dde8f6 100644
--- 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 1aab4a4b4b2..cb18a9053c4 100644
--- 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