Mercurial > emacs
diff lisp/ediff-wind.el @ 67202:3423d9dbb1b7
2005-11-29 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-wind (ediff-setup-control-frame, ediff-make-wide-display):
preserve user position.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Tue, 29 Nov 2005 06:12:52 +0000 |
parents | 231622e4e399 |
children | 3bd95f4f2941 7beb78bc1f8e |
line wrap: on
line diff
--- a/lisp/ediff-wind.el Tue Nov 29 05:03:21 2005 +0000 +++ b/lisp/ediff-wind.el Tue Nov 29 06:12:52 2005 +0000 @@ -955,8 +955,9 @@ (minibuffer-window designated-minibuffer-frame)) (cons 'width fwidth) - (cons 'height fheight)) - ) + (cons 'height fheight) + (cons 'user-position t) + )) ;; adjust autoraise (setq adjusted-parameters @@ -1135,7 +1136,8 @@ (list (cons 'left (max 0 (eval (cdr (assoc 'left frame-A-params))))) (cons 'width (cdr (assoc 'width frame-A-params)))) ediff-wide-display-frame frame-A) - (modify-frame-parameters frame-A `((left . ,cw) (width . ,wd))))) + (modify-frame-parameters + frame-A `((left . ,cw) (width . ,wd) (user-position t))))) ;; Revise the mode line to display which difference we have selected