(enum event_kind) [MAC_OS]: Update comment for MAC_APPLE_EVENT.

[gnu-emacs] / lisp / ediff-wind.el

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 1a360a28f6eba7de6ef1d1d15ba2892bbbc14d15..28369f9f6bde36710f3dc2459ff59bd19151767c 100644 (file)
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -1,7 +1,7 @@
 ;;; ediff-wind.el --- window manipulation utilities
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-wind)
 
 ;; Compiler pacifier
 (defvar icon-title-format)
@@ -955,8 +954,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 +1135,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
@@ -1312,6 +1313,9 @@ It assumes that it is called from within the control buffer."
                             ediff-wide-display-p)))))))
 
 
+(provide 'ediff-wind)
+
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)