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 f2965bad6d5e7dfeeb3bfda8c45a59387f8a3b16..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))
@@ -3159,7 +3157,7 @@ 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))
+               (when (and str charset)
                  (setq str (decode-coding-string str charset)))
                (set group str)))
            (forward-line 1))))