Sync up with main trunc.

diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el
index e517e70..77fabca 100644 (file)
--- a/lisp/nnkiboze.el
+++ b/lisp/nnkiboze.el
@@ -153,17 +153,19 @@
 (deffoo nnkiboze-request-delete-group (group &optional force server)
   (nnkiboze-possibly-change-group group)
   (when force
-     (let ((files (list (nnkiboze-nov-file-name)
-                       (concat nnkiboze-directory
-                                (nnheader-translate-file-chars
-                                 (concat group ".newsrc")))
-                       (nnkiboze-score-file group))))
+     (let ((files (nconc
+                  (nnkiboze-score-file group)
+                  (list (nnkiboze-nov-file-name)
+                        (concat nnkiboze-directory
+                                (nnheader-translate-file-chars
+                                 (concat group ".newsrc")))))))
        (while files
         (and (file-exists-p (car files))
              (file-writable-p (car files))
              (delete-file (car files)))
         (setq files (cdr files)))))
-  (setq nnkiboze-current-group nil))
+  (setq nnkiboze-current-group nil)
+  t)
 
 (nnoo-define-skeleton nnkiboze)
 

diff --git a/texi/Makefile.in b/texi/Makefile.in
index b8eb937..be10a0d 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -109,7 +109,7 @@ veryclean:
 
 distclean:
        make clean
-       rm -f *.orig *.rej *.elc *~ gnus gnus-[0-9] gnus-[0-9][0-9]
+       rm -f *.orig *.rej *.elc *~ gnus gnus-[0-9] gnus-[0-9][0-9] Makefile
        rm -f message message-[0-9]
 
 install: