diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ediff-wind.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 56a497285ac..b39c759c807 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el | |||
| @@ -96,6 +96,7 @@ In this case, Ediff will use those frames to display these buffers.") | |||
| 96 | ;; this blocks queries from window manager as to where to put | 96 | ;; this blocks queries from window manager as to where to put |
| 97 | ;; ediff's control frame. we put the frame outside the display, | 97 | ;; ediff's control frame. we put the frame outside the display, |
| 98 | ;; so the initial frame won't jump all over the screen | 98 | ;; so the initial frame won't jump all over the screen |
| 99 | '(user-position . t) | ||
| 99 | (cons 'top (if (fboundp 'ediff-display-pixel-height) | 100 | (cons 'top (if (fboundp 'ediff-display-pixel-height) |
| 100 | (1+ (ediff-display-pixel-height)) | 101 | (1+ (ediff-display-pixel-height)) |
| 101 | 3000)) | 102 | 3000)) |