Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / nnmh.el

diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index ec270eba2ce70a99c97633e70e407073123c42d6..51048bb29982cf4577187e2fb0bbed782d469b25 100644 (file)
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -1,6 +1,6 @@
 ;;; nnmh.el --- mhspool access for Gnus
 
-;; Copyright (C) 1995-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -109,7 +109,7 @@ as unread by Gnus.")
          (and large
               (zerop (% count 20))
               (nnheader-message 5 "nnmh: Receiving headers... %d%%"
-                                (/ (* count 100) number))))
+                                (floor (* count 100.0) number))))
 
        (when large
          (nnheader-message 5 "nnmh: Receiving headers...done"))
@@ -242,8 +242,8 @@ as unread by Gnus.")
              (file-truename (file-name-as-directory
                              (expand-file-name nnmh-toplev))))
             dir)
-           (mm-string-to-multibyte ;Why?  Isn't it multibyte already?
-            (mm-encode-coding-string
+           (string-to-multibyte ;Why?  Isn't it multibyte already?
+            (encode-coding-string
              (nnheader-replace-chars-in-string
               (substring dir (match-end 0))
               ?/ ?.)
@@ -259,12 +259,12 @@ as unread by Gnus.")
                                               &optional server force)
   (nnmh-possibly-change-directory newsgroup server)
   (let ((is-old t)
+       (dir nnmh-current-directory)
        article rest mod-time)
     (nnheader-init-server-buffer)
 
     (while (and articles is-old)
-      (setq article (concat nnmh-current-directory
-                           (int-to-string (car articles))))
+      (setq article (concat dir (int-to-string (car articles))))
       (when (setq mod-time (nth 5 (file-attributes article)))
        (if (and (nnmh-deletable-article-p newsgroup (car articles))
                 (setq is-old