(compilation-set-window-height): Use window-full-width-p instead of

comparing frame-width and window-width.
(compilation-find-buffer): Remove extra
argument in call to compilation-buffer-internal-p.

1 files changed, 5 insertions, 7 deletions

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 529194ffa7e..fcb20ede56d 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1153,7 +1153,7 @@ exited abnormally with code %d\n"
   "Set the height of WINDOW according to `compilation-window-height'."
   (let ((height (buffer-local-value 'compilation-window-height (window-buffer window))))
     (and height
-         (= (window-width window) (frame-width (window-frame window)))
+         (window-full-width-p window)
          ;; If window is alone in its frame, aside from a minibuffer,
          ;; don't change its height.
          (not (eq window (frame-root-window (window-frame window))))
@@ -1611,12 +1611,10 @@ Use this command in a compilation log buffer.  Sets the mark at point there."
 
 (defun compilation-find-buffer (&optional avoid-current)
   "Return a compilation buffer.
-If AVOID-CURRENT is nil, and
-the current buffer is a compilation buffer, return it.
-If AVOID-CURRENT is non-nil, return the current buffer
-only as a last resort."
-  (if (and (compilation-buffer-internal-p (current-buffer))
-           (not avoid-current))
+If AVOID-CURRENT is nil, and the current buffer is a compilation buffer,
+return it.  If AVOID-CURRENT is non-nil, return the current buffer only
+as a last resort."
+  (if (and (compilation-buffer-internal-p) (not avoid-current))
       (current-buffer)
     (next-error-find-buffer avoid-current 'compilation-buffer-internal-p)))