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 c2b76780e92ef7fa5a706f5f7633b5eec612b1c5..e0c3dbe7b5485d85ce91144441320b1d683807c6 100644 (file)
--- 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