*** lisp/vc/ediff-wind.el	2012-04-26 03:04:36 +0000
--- lisp/vc/ediff-wind.el	2012-05-24 08:41:17 +0000
***************
*** 1004,1010 ****
  
      (goto-char (point-min))
  
!     (modify-frame-parameters ctl-frame adjusted-parameters)
      (make-frame-visible ctl-frame)
  
      ;; This works around a bug in 19.25 and earlier.  There, if frame gets
--- 1004,1013 ----
  
      (goto-char (point-min))
  
!     (modify-frame-parameters
!      ctl-frame
!      (append adjusted-parameters
! 	     (funcall ediff-control-frame-position-function ctl-buffer fwidth fheight)))
      (make-frame-visible ctl-frame)
  
      ;; This works around a bug in 19.25 and earlier.  There, if frame gets
***************
*** 1024,1032 ****
  
      ;; Now move the frame.  We must do it separately due to an obscure bug in
      ;; XEmacs
!     (modify-frame-parameters
!      ctl-frame
!      (funcall ediff-control-frame-position-function ctl-buffer fwidth fheight))
  
      ;; synchronize so the cursor will move to control frame
      ;; per RMS suggestion
--- 1027,1035 ----
  
      ;; Now move the frame.  We must do it separately due to an obscure bug in
      ;; XEmacs
!     ;; (modify-frame-parameters
!      ;; ctl-frame
!      ;; (funcall ediff-control-frame-position-function ctl-buffer fwidth fheight))
  
      ;; synchronize so the cursor will move to control frame
      ;; per RMS suggestion