[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master e52bc9ef6f7: Avoid infinite recursion in 'image-mode--display'
From: |
Eli Zaretskii |
Subject: |
master e52bc9ef6f7: Avoid infinite recursion in 'image-mode--display' |
Date: |
Sat, 23 Mar 2024 03:52:54 -0400 (EDT) |
branch: master
commit e52bc9ef6f7942b15d876566aca52340210ac27c
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
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)
---
lisp/image-mode.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 355685e70fd..fa64f1ac03e 100644
--- 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master e52bc9ef6f7: Avoid infinite recursion in 'image-mode--display',
Eli Zaretskii <=