IMAP command logging improvement

[gnus] / lisp / nnml.el

diff --git a/lisp/nnml.el b/lisp/nnml.el
index 46a6d90..b865260 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -1,7 +1,7 @@
 ;;; nnml.el --- mail spool access for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2012 Free Software
+;;   Foundation, Inc.
 
 ;; Authors: Didier Verna <didier@xemacs.org> (adding compaction)
 ;;     Simon Josefsson <simon@josefsson.org> (adding MARKS)
@@ -235,7 +235,11 @@ non-nil.")
                          (nnheader-article-to-file-alist
                           (setq gpath (nnml-group-pathname (car group-num)
                                                            nil server))))))
-         (setq path (concat gpath (int-to-string (cdr group-num)))))
+         (nnml-update-file-alist)
+         (setq path (concat gpath (if nnml-use-compressed-files
+                                      (cdr (assq (cdr group-num)
+                                                 nnml-article-file-alist))
+                                    (number-to-string (cdr group-num))))))
       (setq path (nnml-article-to-file id)))
     (cond
      ((not path)
@@ -1209,7 +1213,7 @@ Use the nov database for the current group if available."
                ;; #### already belongs to a range, whereas the corresponding
                ;; #### article doesn't exist (for example, if you delete an
                ;; #### article). For that reason, it is important to update
-               ;; #### the ranges (meaning remove inexistent articles) before
+               ;; #### the ranges (meaning remove nonexistent articles) before
                ;; #### doing anything on them.
                ;; 2 a/ read articles:
                (let ((read (gnus-info-read info)))
@@ -1294,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)