(gnus-group-icon-create-glyph): Don't use `gnus-group-running-xemacs'.

[elisp/gnus.git-] / lisp / nnkiboze.el

diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el
index b3e8f7d..4648292 100644 (file)
--- a/lisp/nnkiboze.el
+++ b/lisp/nnkiboze.el
@@ -1,5 +1,5 @@
 ;;; nnkiboze.el --- select virtual news access for Gnus
-;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -29,12 +29,14 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'gnus-clfns))
+
 (require 'nntp)
 (require 'nnheader)
 (require 'gnus)
 (require 'gnus-score)
 (require 'nnoo)
-(eval-when-compile (require 'cl))
 
 (nnoo-declare nnkiboze)
 (defvoo nnkiboze-directory (nnheader-concat gnus-directory "kiboze/")
@@ -155,15 +157,15 @@
 (deffoo nnkiboze-request-delete-group (group &optional force server)
   (nnkiboze-possibly-change-group group)
   (when force
-     (let ((files (nconc
-                  (nnkiboze-score-file group)
-                  (list (nnkiboze-nov-file-name)
-                        (nnkiboze-nov-file-name ".newsrc")))))
-       (while files
-        (and (file-exists-p (car files))
-             (file-writable-p (car files))
-             (delete-file (car files)))
-        (setq files (cdr files)))))
+    (let ((files (nconc
+                 (nnkiboze-score-file group)
+                 (list (nnkiboze-nov-file-name)
+                       (nnkiboze-nov-file-name ".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)
   t)
 
@@ -209,7 +211,7 @@ Finds out what articles are to be part of the nnkiboze groups."
 
 (defun nnkiboze-generate-group (group)
   (let* ((info (nth 2 (gnus-gethash group gnus-newsrc-hashtb)))
-        (newsrc-file (concat nnkiboze-directory 
+        (newsrc-file (concat nnkiboze-directory
                               (nnheader-translate-file-chars
                                (concat group ".newsrc"))))
         (nov-file (concat nnkiboze-directory
@@ -232,7 +234,7 @@ Finds out what articles are to be part of the nnkiboze groups."
       (load newsrc-file))
     (with-temp-file nov-file
       (when (file-exists-p nov-file)
-       (insert-file-contents nov-file))
+       (nnheader-insert-file-contents nov-file))
       (setq nov-buffer (current-buffer))
       ;; Go through the active hashtb and add new all groups that match the
       ;; kiboze regexp.
@@ -287,7 +289,7 @@ Finds out what articles are to be part of the nnkiboze groups."
                                           (car ginfo)))
                                  0))
                           (progn
-                            (ignore-errors 
+                            (ignore-errors
                               (gnus-group-select-group nil))
                             (eq major-mode 'gnus-summary-mode)))
                  ;; We are now in the group where we want to be.