X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnml.el;h=c825e0974814d668e0056bb0b109a993d72291b8;hb=851278bf56a0156a4dd5896e9959f63e33d07ee2;hp=600a0d21e3c5ea020993ce205daa8040119ffdf2;hpb=bde91281671310cfab90dfea4efa1202cbf7f25b;p=gnus

diff --git a/lisp/nnml.el b/lisp/nnml.el
index 600a0d21e..c825e0974 100644
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -1,7 +1,6 @@
 ;;; nnml.el --- mail spool access for Gnus
 
-;; Copyright (C) 1995-2012 Free Software
-;;   Foundation, Inc.
+;; Copyright (C) 1995-2015 Free Software Foundation, Inc.
 
 ;; Authors: Didier Verna <didier@xemacs.org> (adding compaction)
 ;;	Simon Josefsson <simon@josefsson.org>
@@ -179,7 +178,7 @@ non-nil.")
 		   (> number nnmail-large-newsgroup)
 		   (zerop (% count 20))
 		   (nnheader-message 6 "nnml: Receiving headers... %d%%"
-				     (/ (* count 100) number))))
+				     (floor (* count 100.0) number))))
 
 	    (and (numberp nnmail-large-newsgroup)
 		 (> number nnmail-large-newsgroup)
@@ -1095,7 +1094,10 @@ Use the nov database for the current group if available."
 		       (concat group ":" new-number-string)))
 		    ;; Save to the new file:
 		    (nnmail-write-region (point-min) (point-max) newfile))
-		  (funcall nnmail-delete-file-function oldfile))
+		  (condition-case ()
+		      (funcall nnmail-delete-file-function oldfile)
+		    (file-error
+		     (message "Couldn't delete %s" oldfile))))
 		;; 2/ Update all marks for this article:
 		;; #### NOTE: it is possible that the new article number
 		;; #### already belongs to a range, whereas the corresponding