From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 31 Oct 2017 07:59:27 +0000 (+0100)
Subject: Avoid fullscreen ediff control frames by default (Bug#29026)
X-Git-Tag: emacs-26.0.91~425
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c8fe0248b95b1faa9f97d14fe16d3356130dee8;p=emacs.git

Avoid fullscreen ediff control frames by default (Bug#29026)

* lisp/vc/ediff-wind.el (ediff-control-frame-parameters):
Add parameter to avoid fullscreen control frames (Bug#29026).
---

diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index c2b76780e92..e0c3dbe7b54 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -181,6 +181,8 @@ In this case, Ediff will use those frames to display these buffers."
    '(visibility . nil)
    ;; make initial frame small to avoid distraction
    '(width . 1) '(height . 1)
+   ;; Fullscreen control frames don't make sense (Bug#29026).
+   '(fullscreen . nil)
    ;; this blocks queries from  window manager as to where to put
    ;; ediff's control frame. we put the frame outside the display,
    ;; so the initial frame won't jump all over the screen