Merge from origin/emacs-25

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

diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 2901d29424247c3a2b39a17694379e56c4b841c7..402ffba8c6e29310525aff9c657cc4e8c680f25d 100644 (file)
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -1,6 +1,6 @@
 ;;; nnfolder.el --- mail folder access for Gnus
 
-;; Copyright (C) 1995-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;;      ShengHuo Zhu <zsh@cs.rochester.edu> (adding NOV)
@@ -884,9 +884,7 @@ deleted.  Point is left where the deleted region was."
              (active (or (cadr (assoc group nnfolder-group-alist))
                          (cons 1 0)))
              (scantime (assoc group nnfolder-scantime-alist))
-             (minid (or (and (boundp 'most-positive-fixnum)
-                             most-positive-fixnum)
-                        (lsh -1 -1)))
+             (minid most-positive-fixnum)
              maxid start end newscantime
              novbuf articles newnum
              buffer-read-only)
@@ -1061,7 +1059,7 @@ This command does not work if you use short group names."
 (defun nnfolder-group-pathname (group)
   "Make file name for GROUP."
   (setq group
-       (mm-encode-coding-string group nnmail-pathname-coding-system))
+       (encode-coding-string group nnmail-pathname-coding-system))
   (let ((dir (file-name-as-directory (expand-file-name nnfolder-directory))))
     ;; If this file exists, we use it directly.
     (if (or nnmail-use-long-file-names