Merge remote-tracking branch 'origin/no-gnus'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5422660..3f17771 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-12  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * nnml.el (nnml-request-compact-group): Delete the marks file after
+       compaction (bug#10800).
+
        * gnus-art.el (gnus-stop-downloads): Stop `url-queue' downloads on
        group exit.
 

diff --git a/lisp/nnml.el b/lisp/nnml.el
index acb23ed..b865260 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -1298,6 +1298,9 @@ Use the nov database for the current group if available."
          (nnml-save-nov)
          ;; b/ Save the active file:
          (nnmail-save-active nnml-group-alist nnml-active-file)
+         (let ((marks (nnml-group-pathname group nnml-marks-file-name server)))
+           (when (file-exists-p marks)
+             (delete-file marks)))
          t)))))
 
 (defun nnml-request-compact (&optional server)