X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnnkiboze.el;h=2d2ccf37fd7cffc38cd420b1d42d905fe6d2398d;hb=4cacb5f23eb830e6950dba987063f413977708d7;hp=07aa5650f3e676e64166bdd9ed34e7eddae22f78;hpb=49d38b41c190eaab2cb34294fac7302a9c9ea353;p=elisp%2Fgnus.git-

diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el
index 07aa565..2d2ccf3 100644
--- a/lisp/nnkiboze.el
+++ b/lisp/nnkiboze.el
@@ -1,7 +1,7 @@
 ;;; nnkiboze.el --- select virtual news access for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003
-;;	Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -32,7 +32,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(eval-when-compile (require 'gnus-clfns))
 
 (require 'nntp)
 (require 'nnheader)
@@ -107,7 +106,7 @@
 	(error "nnkiboze: No xref"))
       (unless (string-match " \\([^ ]+\\):\\([0-9]+\\)" xref)
 	(error "nnkiboze: Malformed xref"))
-      (setq num (string-to-int (match-string 2 xref))
+      (setq num (string-to-number (match-string 2 xref))
 	    group (match-string 1 xref))
       (or (with-current-buffer buffer
 	    (or (and gnus-use-cache (gnus-cache-request-article num group))
@@ -150,8 +149,7 @@
   ;; Remove NOV lines of articles that are marked as read.
   (when (and (file-exists-p (nnkiboze-nov-file-name))
 	     nnkiboze-remove-read-articles)
-    (let ((coding-system-for-write nnkiboze-file-coding-system)
-	  (output-coding-system nnkiboze-file-coding-system))
+    (let ((coding-system-for-write nnkiboze-file-coding-system))
       (with-temp-file (nnkiboze-nov-file-name)
 	(let ((cur (current-buffer))
 	      (nnheader-file-coding-system nnkiboze-file-coding-system))
@@ -229,7 +227,7 @@ Finds out what articles are to be part of the nnkiboze groups."
 			  "." gnus-score-file-suffix))))))
 
 (defun nnkiboze-generate-group (group &optional inhibit-list-groups)
-  (let* ((info (nth 2 (gnus-gethash group gnus-newsrc-hashtb)))
+  (let* ((info (gnus-get-info group))
 	 (newsrc-file (concat nnkiboze-directory
 			      (nnheader-translate-file-chars
 			       (concat group ".newsrc"))))
@@ -255,8 +253,7 @@ Finds out what articles are to be part of the nnkiboze groups."
     (mm-with-unibyte
      (when (file-exists-p newsrc-file)
        (load newsrc-file))
-     (let ((coding-system-for-write nnkiboze-file-coding-system)
-	   (output-coding-system nnkiboze-file-coding-system))
+     (let ((coding-system-for-write nnkiboze-file-coding-system))
        (gnus-make-directory (file-name-directory nov-file))
        (with-temp-file nov-file
 	 (when (file-exists-p nov-file)
@@ -272,8 +269,7 @@ Finds out what articles are to be part of the nnkiboze groups."
 		 (numberp (car (symbol-value group))) ; It is active
 		 (or (> nnkiboze-level 7)
 		     (and (setq glevel
-				(nth 1 (nth 2 (gnus-gethash
-					       gname gnus-newsrc-hashtb))))
+				(gnus-info-level (gnus-get-info gname)))
 			  (>= nnkiboze-level glevel)))
 		 (not (string-match "^nnkiboze:" gname)) ; Exclude kibozes
 		 (push (cons gname (1- (car (symbol-value group))))
@@ -285,8 +281,7 @@ Finds out what articles are to be part of the nnkiboze groups."
 	 ;; number that has been kibozed in GROUP in this kiboze group.
 	 (setq newsrc nnkiboze-newsrc)
 	 (while newsrc
-	   (if (not (setq active (gnus-gethash
-				  (caar newsrc) gnus-active-hashtb)))
+	   (if (not (setq active (gnus-active (caar newsrc))))
 	       ;; This group isn't active after all, so we remove it from
 	       ;; the list of component groups.
 	       (setq nnkiboze-newsrc (delq (car newsrc) nnkiboze-newsrc))
@@ -297,8 +292,7 @@ Finds out what articles are to be part of the nnkiboze groups."
 	     (gnus-message 3 "nnkiboze: Checking %s..." (caar newsrc))
 	     (setq ginfo (gnus-get-info (gnus-group-group-name))
 		   orig-info (gnus-copy-sequence ginfo)
-		   num-unread (car (gnus-gethash (caar newsrc)
-						 gnus-newsrc-hashtb)))
+		   num-unread (gnus-group-unread (caar newsrc)))
 	     (unwind-protect
 		 (progn
 		   ;; We set all list of article marks to nil.  Since we operate
@@ -341,8 +335,7 @@ Finds out what articles are to be part of the nnkiboze groups."
 	       ;; Restore the proper info.
 	       (when ginfo
 		 (setcdr ginfo (cdr orig-info)))
-	       (setcar (gnus-gethash (caar newsrc) gnus-newsrc-hashtb)
-		       num-unread)))
+	       (setcar (gnus-group-entry (caar newsrc)) num-unread)))
 	   (setcdr (car newsrc) (cdr active))
 	   (gnus-message 3 "nnkiboze: Checking %s...done" (caar newsrc))
 	   (setq newsrc (cdr newsrc)))))