Avoid infinite recursion in 'image-mode--display'

* lisp/image-mode.el (image-mode): Suspend major mode only if it
is not already 'image-mode'.  (Bug#69785)

(cherry picked from commit e52bc9ef6f7942b15d876566aca52340210ac27c)

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 355685e70fd3d1559550578268be6e99ce84386f..fa64f1ac03e13fb770bf2d30bcaa1083ba4003fc 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -654,8 +654,9 @@ Key bindings:
   (unless (display-images-p)
     (error "Display does not support images"))
 
-  (major-mode-suspend)
-  (setq major-mode 'image-mode)
+  (unless (eq major-mode 'image-mode)
+    (major-mode-suspend)
+    (setq major-mode 'image-mode))
   (setq image-transform-resize image-auto-resize)
 
   ;; Bail out early if we have no image data.