2005-11-29 Michael Kifer <kifer@cs.stonybrook.edu>

	* ediff-wind (ediff-setup-control-frame, ediff-make-wide-display):
	preserve user position.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f8197f69f7af22462b120f86880aaf9e6eca492..a108e294634883096d51032ba65021b219a2a435 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29  Michael Kifer  <kifer@cs.stonybrook.edu>
+       
+       * ediff-wind (ediff-setup-control-frame, ediff-make-wide-display):
+       preserve user position.
+       
 2005-11-28  Luc Teirlinck  <teirllm@auburn.edu>
 
        * 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 1a360a28f6eba7de6ef1d1d15ba2892bbbc14d15..9fd9f45ff03862ceb38683ebdb896cf30f553328 100644 (file)
--- 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