diff options
| author | Martin Rudalics | 2017-10-31 08:59:27 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2017-10-31 08:59:27 +0100 |
| commit | 9c8fe0248b95b1faa9f97d14fe16d3356130dee8 (patch) | |
| tree | 10eb4b95917f24d04ee49de55c662e3271ff78fb | |
| parent | 7d32176acc0a54de0b2158e8ff6f57652bb5a629 (diff) | |
| download | emacs-9c8fe0248b95b1faa9f97d14fe16d3356130dee8.tar.gz emacs-9c8fe0248b95b1faa9f97d14fe16d3356130dee8.zip | |
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).
| -rw-r--r-- | lisp/vc/ediff-wind.el | 2 |
1 files changed, 2 insertions, 0 deletions
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." | |||
| 181 | '(visibility . nil) | 181 | '(visibility . nil) |
| 182 | ;; make initial frame small to avoid distraction | 182 | ;; make initial frame small to avoid distraction |
| 183 | '(width . 1) '(height . 1) | 183 | '(width . 1) '(height . 1) |
| 184 | ;; Fullscreen control frames don't make sense (Bug#29026). | ||
| 185 | '(fullscreen . nil) | ||
| 184 | ;; this blocks queries from window manager as to where to put | 186 | ;; this blocks queries from window manager as to where to put |
| 185 | ;; ediff's control frame. we put the frame outside the display, | 187 | ;; ediff's control frame. we put the frame outside the display, |
| 186 | ;; so the initial frame won't jump all over the screen | 188 | ;; so the initial frame won't jump all over the screen |