From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 26 Sep 2022 19:10:58 +0000 (+0200)
Subject: Don't auto-resize image if echo area is non-empty
X-Git-Tag: emacs-29.0.90~1856^2~208
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bb83fb5f62aa4b27a5598f4a0a9b22efdd94cf14;p=emacs.git

Don't auto-resize image if echo area is non-empty

* lisp/image-mode.el (image-fit-to-window): Don't auto-resize
image if there's a message in the echo area.
---

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index eee4be6a10e..bd208fbad46 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -1061,7 +1061,9 @@ Otherwise, display the image by calling `image-mode'."
              ;; Don't resize anything if we're in the minibuffer
              ;; (which may transitively change the window sizes if you
              ;; hit TAB, for instance).
-             (not (minibuffer-window-active-p (selected-window))))
+             (not (minibuffer-window-active-p (selected-window)))
+             ;; Don't resize if there's a message in the echo area.
+             (not (current-message)))
     (with-current-buffer (window-buffer window)
       (when (derived-mode-p 'image-mode)
         (let ((spec (image-get-display-property)))