From 59f1b05814c0e8cad89a81747e6fa2085f434867 Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Tue, 29 Nov 2005 06:12:52 +0000 Subject: [PATCH] 2005-11-29 Michael Kifer * ediff-wind (ediff-setup-control-frame, ediff-make-wide-display): preserve user position. --- lisp/ChangeLog | 5 +++++ lisp/ediff-wind.el | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7f8197f69f7..a108e294634 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-11-29 Michael Kifer + + * ediff-wind (ediff-setup-control-frame, ediff-make-wide-display): + preserve user position. + 2005-11-28 Luc Teirlinck * font-lock.el: Throw error if facemenu is not loaded to prevent diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 1a360a28f6e..9fd9f45ff03 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -955,8 +955,9 @@ into icons, regardless of the window manager." (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 @@ It assumes that it is called from within the control buffer." (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 -- 2.39.5