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

[Stefan Kangas]

branch: master
commit bb83fb5f62aa4b27a5598f4a0a9b22efdd94cf14
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    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.
---
 lisp/image-mode.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index eee4be6a10..bd208fbad4 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)))