(compilation-set-window-height): Select

old window only if it's still live.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 526faad294e17ee86b4060fa3e5124849efbc24d..1a51430415f88a4c39abb83c934097d8d2cb7a8a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-22  Gerd Moellmann  <gerd@gnu.org>
+
+       * progmodes/compile.el (compilation-set-window-height): Select
+       old window only if it's still live.
+
 2001-10-22  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * textmodes/sgml-mode.el (sgml-mode-map): Bind 8-bit codes above

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 769c356449f2280b3775d197807474577d8d6c25..37b834b510dbf90a52d5015f4089169fd4e7271a 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -877,7 +877,10 @@ exited abnormally with code %d\n"
                 (select-window window)
                 (enlarge-window (- compilation-window-height
                                    (window-height))))
-            (select-window w))))))
+            ;; The enlarge-window above may have deleted W, if
+            ;; compilation-window-height is large enough.
+            (when (window-live-p w)
+              (select-window w)))))))
 
 (defvar compilation-minor-mode-map
   (let ((map (make-sparse-keymap)))