X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ee2f89a66507839a1234a1ff5b96b20776fcd5ef..f95bbe5a67e03fe6d05cbfb4d0c9151a754d6ccd:/lisp/gnus/nnspool.el

diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el
index fd079d909e..9db68b15df 100644
--- a/lisp/gnus/nnspool.el
+++ b/lisp/gnus/nnspool.el
@@ -1,7 +1,7 @@
 ;;; nnspool.el --- spool access for GNU Emacs
 
-;; Copyright (C) 1988-1990, 1993-1998, 2000-2012
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1988-1990, 1993-1998, 2000-2016 Free Software
+;; Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -34,11 +34,12 @@
 ;; Probably this entire thing should be obsolete.
 ;; It's only used to init nnspool-spool-directory, so why not just
 ;; set that variable's default directly?
-(defvar news-directory (if (file-exists-p "/usr/spool/news/")
-			   "/usr/spool/news/"
-			 "/var/spool/news/")
-  "The root directory below which all news files are stored.")
-(defvaralias 'news-path 'news-directory)
+(eval-and-compile
+  (defvar news-directory (if (file-exists-p "/usr/spool/news/")
+			     "/usr/spool/news/"
+			   "/var/spool/news/")
+    "The root directory below which all news files are stored.")
+  (defvaralias 'news-path 'news-directory))
 
 ;; Ditto re obsolescence.
 (defvar news-inews-program
@@ -173,7 +174,7 @@ there.")
 	    (and do-message
 		 (zerop (% (incf count) 20))
 		 (nnheader-message 5 "nnspool: Receiving headers... %d%%"
-				   (/ (* count 100) number))))
+				   (floor (* count 100.0) number))))
 
 	  (when do-message
 	    (nnheader-message 5 "nnspool: Receiving headers...done"))
@@ -305,7 +306,7 @@ there.")
 			  "\\([^ ]+\\) +\\([0-9]+\\)[0-9][0-9][0-9] "))
 		    (zerop (forward-line -1))))
 	;; We require nnheader which requires gnus-util.
-	(let ((seconds (gnus-float-time (date-to-time date)))
+	(let ((seconds (float-time (date-to-time date)))
 	      groups)
 	  ;; Go through lines and add the latest groups to a list.
 	  (while (and (looking-at "\\([^ ]+\\) +[0-9]+ ")
@@ -334,6 +335,7 @@ there.")
   (save-excursion
     (let* ((process-connection-type nil) ; t bugs out on Solaris
 	   (inews-buffer (generate-new-buffer " *nnspool post*"))
+	   (buf (current-buffer))
 	   (proc
 	    (condition-case err
 		(apply 'start-process "*nnspool inews*" inews-buffer
@@ -345,7 +347,11 @@ there.")
 	  ()
 	(nnheader-report 'nnspool "")
 	(set-process-sentinel proc 'nnspool-inews-sentinel)
-	(mm-with-unibyte-current-buffer
+	(with-temp-buffer
+	  (set-buffer-multibyte nil)
+	  (insert-buffer-substring buf)
+	  (encode-coding-region (point-min) (point-max)
+				nnspool-file-coding-system)
 	  (process-send-region proc (point-min) (point-max)))
 	;; We slap a condition-case around this, because the process may
 	;; have exited already...