(compilation-set-window-height): Select

old window only if it's still live.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbc9f9d4e1a8f4f0593668d46d705ed3b1d2131f..7fc67f360494dfb35b5b58af5c8e55fb5f751307 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  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * help-mode.el (help-buffer): Remove debugging code.

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index da4d398ec227aac4771361d3f12ee2dbbe67e4dc..9faba001c35ae685ab102f088c7e41ce30b5cf18 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -937,7 +937,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)))