X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnnkiboze.el;h=3211d69a7e73e1534f26bf88d5dcaa6f407671c1;hp=e887bc6fc2bf31e48dcc5bcdfe127a8c701a0845;hb=751b08bcb2f4bcbe7a0bb7a7fc6034fba8d49cb9;hpb=cdb7a52c3e96c14fa046d6733807c38194e2140b

diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el
index e887bc6fc..3211d69a7 100644
--- 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
@@ -136,7 +136,7 @@
   ;; Remove NOV lines of articles that are marked as read.
   (when (and (file-exists-p (nnkiboze-nov-file-name))
 	     nnkiboze-remove-read-articles)
-    (nnheader-temp-write (nnkiboze-nov-file-name)
+    (with-temp-file (nnkiboze-nov-file-name)
       (let ((cur (current-buffer)))
 	(nnheader-insert-file-contents (nnkiboze-nov-file-name))
 	(goto-char (point-min))
@@ -158,9 +158,7 @@
      (let ((files (nconc
 		   (nnkiboze-score-file group)
 		   (list (nnkiboze-nov-file-name)
-			 (concat nnkiboze-directory
-				 (nnheader-translate-file-chars
-				  (concat group ".newsrc")))))))
+			 (nnkiboze-nov-file-name ".newsrc")))))
        (while files
 	 (and (file-exists-p (car files))
 	      (file-writable-p (car files))
@@ -182,7 +180,7 @@
 
 ;;;###autoload
 (defun nnkiboze-generate-groups ()
-  "Usage: emacs -batch -l nnkiboze -f nnkiboze-generate-groups
+  "\"Usage: emacs -batch -l nnkiboze -f nnkiboze-generate-groups\".
 Finds out what articles are to be part of the nnkiboze groups."
   (interactive)
   (let ((nnmail-spool-file nil)
@@ -211,7 +209,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 +230,7 @@ Finds out what articles are to be part of the nnkiboze groups."
     ;; Load the kiboze newsrc file for this group.
     (when (file-exists-p newsrc-file)
       (load newsrc-file))
-    (nnheader-temp-write nov-file
+    (with-temp-file nov-file
       (when (file-exists-p nov-file)
 	(insert-file-contents nov-file))
       (setq nov-buffer (current-buffer))
@@ -289,7 +287,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.
@@ -320,7 +318,7 @@ Finds out what articles are to be part of the nnkiboze groups."
 	(gnus-message 3 "nnkiboze: Checking %s...done" (caar newsrc))
 	(setq newsrc (cdr newsrc))))
     ;; We save the kiboze newsrc for this group.
-    (nnheader-temp-write newsrc-file
+    (with-temp-file newsrc-file
       (insert "(setq nnkiboze-newsrc '")
       (gnus-prin1 nnkiboze-newsrc)
       (insert ")\n")))
@@ -333,10 +331,8 @@ Finds out what articles are to be part of the nnkiboze groups."
   (save-excursion
     (set-buffer buffer)
     (goto-char (point-max))
-    (let ((xref (mail-header-xref header))
-	  (prefix (gnus-group-real-prefix group))
+    (let ((prefix (gnus-group-real-prefix group))
 	  (oheader (copy-sequence header))
-	  (first t)
 	  article)
       (if (zerop (forward-line -1))
 	  (progn
@@ -358,10 +354,11 @@ Finds out what articles are to be part of the nnkiboze groups."
 	(goto-char (1+ (match-beginning 0)))
 	(insert prefix)))))
 
-(defun nnkiboze-nov-file-name ()
+(defun nnkiboze-nov-file-name (&optional suffix)
   (concat (file-name-as-directory nnkiboze-directory)
 	  (nnheader-translate-file-chars
-	   (concat (nnkiboze-prefixed-name nnkiboze-current-group) ".nov"))))
+	   (concat (nnkiboze-prefixed-name nnkiboze-current-group)
+		   (or suffix ".nov")))))
 
 (provide 'nnkiboze)