Merge from origin/emacs-25

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

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 825c95c77c844d83de752d5ab997af076eaa37a4..a57797260ad753ac4931a9fd6d5df81ea2c931c7 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -888,9 +888,7 @@ If REGEXP is given, lines that match it will be deleted."
       (setq buffer-file-name dribble-file)
       ;; The buffer may be shrunk a lot when deleting old entries.
       ;; It caused the auto-saving to stop.
-      (if (featurep 'emacs)
-         (set (make-local-variable 'auto-save-include-big-deletions) t)
-       (set (make-local-variable 'disable-auto-save-when-buffer-shrinks) nil))
+      (set (make-local-variable 'auto-save-include-big-deletions) t)
       (auto-save-mode t)
       (buffer-disable-undo)
       (bury-buffer (current-buffer))
@@ -1992,7 +1990,7 @@ backend check whether the group actually exists."
     (while lists
       (setq killed (car lists))
       (while killed
-       (gnus-sethash (mm-string-as-unibyte (car killed)) nil hashtb)
+       (gnus-sethash (string-as-unibyte (car killed)) nil hashtb)
        (setq killed (cdr killed)))
       (setq lists (cdr lists)))))
 
@@ -2455,7 +2453,7 @@ If FORCE is non-nil, the .newsrc file is read."
     (dolist (elem gnus-newsrc-alist)
       ;; Protect against broken .newsrc.el files.
       (when (car elem)
-       (setcar elem (mm-string-as-unibyte (car elem)))))
+       (setcar elem (string-as-unibyte (car elem)))))
     (gnus-make-hashtable-from-newsrc-alist)
     (when (file-newer-than-file-p file ding-file)
       ;; Old format quick file
@@ -3027,7 +3025,7 @@ If FORCE is non-nil, the .newsrc file is read."
 (defun gnus-slave-save-newsrc ()
   (with-current-buffer gnus-dribble-buffer
     (let ((slave-name
-          (mm-make-temp-file (concat gnus-current-startup-file "-slave-")))
+          (make-temp-file (concat gnus-current-startup-file "-slave-")))
          (modes (ignore-errors
                   (file-modes (concat gnus-current-startup-file ".eld")))))
       (let ((coding-system-for-write gnus-ding-file-coding-system))
@@ -3159,8 +3157,8 @@ If FORCE is non-nil, the .newsrc file is read."
                          (gnus-parameter-charset name)
                          gnus-default-charset)))
                ;; Fixme: Don't decode in unibyte mode.
-               (when (and str charset (featurep 'mule))
-                 (setq str (mm-decode-coding-string str charset)))
+               (when (and str charset)
+                 (setq str (decode-coding-string str charset)))
                (set group str)))
            (forward-line 1))))
       (gnus-message 5 "Reading descriptions file...done")
@@ -3198,26 +3196,7 @@ If this variable is nil, don't do anything."
 
 (defun gnus-check-reasonable-setup ()
   ;; Check whether nnml and nnfolder share a directory.
-  (let ((display-warn
-        (if (fboundp 'display-warning)
-            'display-warning
-          (lambda (type message)
-            (if noninteractive
-                (message "Warning (%s): %s" type message)
-              (let (window)
-                (with-current-buffer (get-buffer-create "*Warnings*")
-                  (goto-char (point-max))
-                  (unless (bolp)
-                    (insert "\n"))
-                  (insert (format "Warning (%s): %s\n" type message))
-                  (setq window (display-buffer (current-buffer)))
-                  (set-window-start
-                   window
-                   (prog2
-                       (forward-line (- 1 (window-height window)))
-                       (point)
-                     (goto-char (point-max))))))))))
-       method active actives match)
+  (let (method active actives match)
     (dolist (server gnus-server-alist)
       (setq method (gnus-server-to-method server)
            active (intern (format "%s-active-file" (car method))))
@@ -3225,11 +3204,11 @@ If this variable is nil, don't do anything."
                 (gnus-server-opened method)
                 (boundp active))
        (when (setq match (assoc (symbol-value active) actives))
-         (funcall display-warn 'gnus-server
-                  (format "%s and %s share the same active file %s"
-                          (car method)
-                          (cadr match)
-                          (car match))))
+         (display-warning 'gnus-server
+                          (format "%s and %s share the same active file %s"
+                                  (car method)
+                                  (cadr match)
+                                  (car match))))
        (push (list (symbol-value active) method) actives)))))
 
 (provide 'gnus-start)