X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnspool.el;h=a3e0c3b8cc55513c0119d96778b64b2301dd6449;hb=aef74cc46d606bb69682a499643bc158186eef00;hp=dd0b28ad96cac4099182c5cbbd5b2e504238573d;hpb=11ed94d52c91697e1aae609f438d81962bcd4122;p=gnus

diff --git a/lisp/nnspool.el b/lisp/nnspool.el
index dd0b28ad9..a3e0c3b8c 100644
--- a/lisp/nnspool.el
+++ b/lisp/nnspool.el
@@ -1,5 +1,7 @@
 ;;; nnspool.el --- spool access for GNU Emacs
-;; Copyright (C) 1988,89,90,93,94,95,96,97,98 Free Software Foundation, Inc.
+
+;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998,
+;;	2000 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; 	Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -47,7 +49,10 @@ If you are using Cnews, you probably should set this variable to nil.")
 (defvoo nnspool-nov-directory (concat nnspool-spool-directory "over.view/")
   "Local news nov directory.")
 
-(defvoo nnspool-lib-dir "/usr/lib/news/"
+(defvoo nnspool-lib-dir
+    (if (file-exists-p "/usr/lib/news/active")
+	"/usr/lib/news/"
+      "/var/lib/news/")
   "Where the local news library files are stored.")
 
 (defvoo nnspool-active-file (concat nnspool-lib-dir "active")
@@ -136,15 +141,20 @@ there.")
 	      (setq beg (point))
 	      (inline (nnheader-insert-head file))
 	      (goto-char beg)
-	      (search-forward "\n\n" nil t)
-	      (forward-char -1)
-	      (insert ".\n")
+	      (if (search-forward "\n\n" nil t)
+		  (progn
+		    (forward-char -1)
+		    (insert ".\n"))
+		(goto-char (point-max))
+		(if (bolp)
+		    (insert ".\n")
+		  (insert "\n.\n")))
 	      (delete-region (point) (point-max)))
 
 	    (and do-message
 		 (zerop (% (incf count) 20))
 		 (nnheader-message 5 "nnspool: Receiving headers... %d%%"
-			  (/ (* count 100) number))))
+				   (/ (* count 100) number))))
 
 	  (when do-message
 	    (nnheader-message 5 "nnspool: Receiving headers...done"))
@@ -279,7 +289,7 @@ there.")
 	(while (and (not (looking-at
 			  "\\([^ ]+\\) +\\([0-9]+\\)[0-9][0-9][0-9] "))
 		    (zerop (forward-line -1))))
-	(let ((seconds (time-to-float (date-to-time date)))
+	(let ((seconds (time-to-seconds (date-to-time date)))
 	      groups)
 	  ;; Go through lines and add the latest groups to a list.
 	  (while (and (looking-at "\\([^ ]+\\) +[0-9]+ ")
@@ -294,8 +304,8 @@ there.")
 			     (read (current-buffer)))
 			   seconds))
 		      (push (buffer-substring
-					  (match-beginning 1) (match-end 1))
-					 groups)
+			     (match-beginning 1) (match-end 1))
+			    groups)
 		      (zerop (forward-line -1))))
 	  (erase-buffer)
 	  (while groups
@@ -419,7 +429,6 @@ there.")
 (defun nnspool-find-id (id)
   (save-excursion
     (set-buffer (get-buffer-create " *nnspool work*"))
-    (buffer-disable-undo (current-buffer))
     (erase-buffer)
     (ignore-errors
       (call-process "grep" nil t nil (regexp-quote id) nnspool-history-file))
@@ -434,8 +443,8 @@ there.")
   (set-buffer nntp-server-buffer)
   (erase-buffer)
   (condition-case ()
-      (let ((nnheader-file-coding-system nnspool-file-coding-system))
-	(nnheader-insert-file-contents file)
+      (let ((coding-system-for-read nnspool-file-coding-system))
+	(mm-insert-file-contents file)
 	t)
     (file-error nil)))