(compilation-goto-locus): Take into account

iconified frames when determining whether the buffer is already visible.
Don't reset window height if the window already existed.

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 6321216dcce6c9e8a20e8ed34be2e79a32e72531..f0836cbf2b03fd4164a2c2b053dc8fe7c32ee934 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1688,14 +1688,18 @@ and overlay is highlighted between MK and END-MK."
   ;; Show compilation buffer in other window, scrolled to this error.
   (let* ((pop-up-windows t)
         ;; Use an existing window if it is in a visible frame.
-        (w (or (get-buffer-window (marker-buffer msg) 'visible)
-               ;; Pop up a window.
-               (display-buffer (marker-buffer msg))))
+         (pre-existing (get-buffer-window (marker-buffer msg) 0))
+         (w (let ((display-buffer-reuse-frames t))
+              ;; Pop up a window.
+              (display-buffer (marker-buffer msg))))
         (highlight-regexp (with-current-buffer (marker-buffer msg)
                             ;; also do this while we change buffer
                             (compilation-set-window w msg)
                             compilation-highlight-regexp)))
-    (compilation-set-window-height w)
+    ;; Ideally, the window-size should be passed to `display-buffer' (via
+    ;; something like special-display-buffer) so it's only used when
+    ;; creating a new window.
+    (unless pre-existing (compilation-set-window-height w))
 
     (when highlight-regexp
       (if (timerp next-error-highlight-timer)