# HG changeset patch
# User Michael Kifer <kifer@cs.stonybrook.edu>
# Date 1133244772 0
# Node ID 3423d9dbb1b73be8337f5ba4f53efcf054638545
# Parent  ef8e06ff56b94bb303c0461acf901c820f80d860
2005-11-29  Michael Kifer  <kifer@cs.stonybrook.edu>

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

diff -r ef8e06ff56b9 -r 3423d9dbb1b7 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 29 05:03:21 2005 +0000
+++ b/lisp/ChangeLog	Tue Nov 29 06:12:52 2005 +0000
@@ -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 -r ef8e06ff56b9 -r 3423d9dbb1b7 lisp/ediff-wind.el
--- 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