Remove some Gnus compat code

* lisp/gnus/gnus-art.el (gnus-mime-inline-part): Remove compat code.
(gnus-mm-display-part): Ditto.

* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Remove
compat code.

2 files changed, 7 insertions, 27 deletions

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5925f013848..317d2c83f0f 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5346,18 +5346,9 @@ Compressed files like .gz and .bz2 are decompressed."
       (let ((displayed-p (mm-handle-displayed-p handle)))
         (gnus-insert-mime-button handle (get-text-property btn 'gnus-part)
                                  (list displayed-p))
-        (if (featurep 'emacs)
-            (delete-region
-             (point)
-             (next-single-property-change (point) 'gnus-data nil (point-max)))
-          (let* ((end (next-single-property-change (point) 'gnus-data))
-                 (annots (annotations-at (or end (point-max)))))
-            (delete-region (point)
-                           (if end
-                               (if annots (1+ end) end)
-                             (point-max)))
-            (dolist (annot annots)
-              (set-extent-endpoints annot (point) (point)))))
+        (delete-region
+         (point)
+         (next-single-property-change (point) 'gnus-data nil (point-max)))
         (setq start (point))
         (if (search-backward "\n\n" nil t)
             (progn
@@ -5740,18 +5731,9 @@ all parts."
       ;; Toggle the button appearance between `[button]...' and `[button]'.
       (let ((displayed-p (mm-handle-displayed-p handle)))
         (gnus-insert-mime-button handle id (list displayed-p))
-        (if (featurep 'emacs)
-            (delete-region
-             (point)
-             (next-single-property-change (point) 'gnus-data nil (point-max)))
-          (let* ((end (next-single-property-change (point) 'gnus-data))
-                 (annots (annotations-at (or end (point-max)))))
-            (delete-region (point)
-                           (if end
-                               (if annots (1+ end) end)
-                             (point-max)))
-            (dolist (annot annots)
-              (set-extent-endpoints annot (point) (point)))))
+        (delete-region
+         (point)
+         (next-single-property-change (point) 'gnus-data nil (point-max)))
         (setq start (point))
         (if (search-backward "\n\n" nil t)
             (progn
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index f2965bad6d5..61e5409964f 100644
--- 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))