* nnfolder.el (nnfolder-request-delete-group): Figure out nov/mrk

filename before deleting the group itself, because the presence of
a group filename decides if long filenames are used or not.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f85c03..6316282 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2002-05-01  Simon Josefsson  <jas@extundo.com>
 
+       * nnfolder.el (nnfolder-request-delete-group): Figure out nov/mrk
+       filename before deleting the group itself, because the presence of
+       a group filename decides if long filenames are used or not.
+
        * gnus-art.el (gnus-button-alist): Don't inline
        gnus-button-url-regexp.  This makes it possible to change g-b-u-r
        without also modifying g-button-alist.

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 6375279..36826ac 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -547,12 +547,12 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
   (if (not force)
       ()                               ; Don't delete the articles.
     ;; Delete the file that holds the group.
-    (ignore-errors
-      (delete-file (nnfolder-group-pathname group))
-      (when (file-exists-p (nnfolder-group-nov-pathname group))
-       (delete-file (nnfolder-group-nov-pathname group)))
-      (when (file-exists-p (nnfolder-group-marks-pathname group))
-       (delete-file (nnfolder-group-marks-pathname group)))))
+    (let ((data (nnfolder-group-pathname group))
+         (nov (nnfolder-group-nov-pathname group))
+         (mrk (nnfolder-group-marks-pathname group)))
+      (ignore-errors (delete-file data))
+      (ignore-errors (delete-file nov))
+      (ignore-errors (delete-file mrk))))
   ;; Remove the group from all structures.
   (setq nnfolder-group-alist
        (delq (assoc group nnfolder-group-alist) nnfolder-group-alist)