Sync up with Gnus 5.6.4.

diff --git a/lisp/message.el b/lisp/message.el
index 3b2921c..63cdc3e 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1270,6 +1270,7 @@ C-c C-w  message-insert-signature (insert `message-signature-file' file).
 C-c C-y  message-yank-original (insert current message, if any).
 C-c C-q  message-fill-yanked-message (fill what was yanked).
 C-c C-e  message-elide-region (elide the text between point and mark).
+C-c C-z  message-kill-to-signature (kill the text up to the signature).
 C-c C-r  message-caesar-buffer-body (rot13 the message body)."
   (interactive)
   (kill-all-local-variables)

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)