;;; ediff-wind.el --- window manipulation utilities
-;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;; Code:
-(provide 'ediff-wind)
;; Compiler pacifier
(defvar icon-title-format)
(defun ediff-compute-toolbar-width () 0))
(defgroup ediff-window nil
- "Ediff window manipulation"
+ "Ediff window manipulation."
:prefix "ediff-"
:group 'ediff
:group 'frames)
(ediff-with-current-buffer ctl-buffer
(ediff-cond-compile-for-xemacs-or-emacs
- (set-buffer-menubar nil) ; xemacs
+ (when (featurep 'menubar) (set-buffer-menubar nil)) ; xemacs
nil ; emacs
)
;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))
(minibuffer-window
designated-minibuffer-frame))
(cons 'width fwidth)
- (cons 'height fheight))
- )
+ (cons 'height fheight)
+ (cons 'user-position t)
+ ))
;; adjust autoraise
(setq adjusted-parameters
(if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
(let ((ctl-frame ediff-control-frame))
(ediff-cond-compile-for-xemacs-or-emacs
- (set-buffer-menubar default-menubar) ; xemacs
+ (when (featurep 'menubar)
+ (set-buffer-menubar default-menubar)) ; xemacs
nil ; emacs
)
(setq ediff-control-frame nil)
(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 (list (cons 'left cw)
- (cons '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
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)
;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;;; End:
+;;; arch-tag: 73d9a5d7-eed7-4d9c-8b4b-21d5d78eb597
;;; ediff-wind.el ends here