Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-wind.el @ 14:9ee227acff29 r19-15b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents bcdc7deadc19
children 0293115a14e9
comparison
equal deleted inserted replaced
13:13c6d0aaafe5 14:9ee227acff29
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 ;; Boston, MA 02111-1307, USA. 22 ;; Boston, MA 02111-1307, USA.
23 23
24 ;;; Code: 24 ;;; Code:
25 25
26 (require 'ediff-init) 26 (provide 'ediff-wind)
27 ;;(if ediff-xemacs-p
28 ;; (nil) (require 'ediff-tbar)
29 (defun ediff-compute-toolbar-width () 0)
30 27
31 ;; Compiler pacifier 28 ;; Compiler pacifier
32 (defvar icon-title-format) 29 (defvar icon-title-format)
33 (defvar top-toolbar-height) 30 (defvar top-toolbar-height)
34 (defvar bottom-toolbar-height) 31 (defvar bottom-toolbar-height)
36 (defvar right-toolbar-height) 33 (defvar right-toolbar-height)
37 (defvar left-toolbar-width) 34 (defvar left-toolbar-width)
38 (defvar right-toolbar-width) 35 (defvar right-toolbar-width)
39 (defvar default-menubar) 36 (defvar default-menubar)
40 (defvar frame-icon-title-format) 37 (defvar frame-icon-title-format)
38 (defvar ediff-diff-status)
39
40 (eval-when-compile
41 (let ((load-path (cons "." load-path)))
42 (or (featurep 'ediff-init)
43 (load "ediff-init.el" nil nil 'nosuffix))
44 (or (featurep 'ediff-help)
45 (load "ediff-help.el" nil nil 'nosuffix))
46 (or (featurep 'ediff-util)
47 (load "ediff-util.el" nil nil 'nosuffix))
48 (or (featurep 'ediff-tbar)
49 (load "ediff-tbar.el" 'noerror nil 'nosuffix))
50 ))
41 ;; end pacifier 51 ;; end pacifier
52
53 (require 'ediff-init)
54
55 ;; be careful with ediff-tbar
56 (if ediff-xemacs-p
57 (condition-case nil
58 (require 'ediff-tbar)
59 (error
60 (defun ediff-compute-toolbar-width () 0)))
61 (defun ediff-compute-toolbar-width () 0))
42 62
43 63
44 (defvar ediff-window-setup-function (if (ediff-window-display-p) 64 (defvar ediff-window-setup-function (if (ediff-window-display-p)
45 'ediff-setup-windows-multiframe 65 'ediff-setup-windows-multiframe
46 'ediff-setup-windows-plain) 66 'ediff-setup-windows-plain)
893 (goto-char (point-min)) 913 (goto-char (point-min))
894 914
895 (modify-frame-parameters ctl-frame adjusted-parameters) 915 (modify-frame-parameters ctl-frame adjusted-parameters)
896 (make-frame-visible ctl-frame) 916 (make-frame-visible ctl-frame)
897 (ediff-make-bottom-toolbar) ; no effect if the toolbar is not requested 917 (ediff-make-bottom-toolbar) ; no effect if the toolbar is not requested
898 918
899 ;; This works around a bug in 19.25 and earlier. There, if frame gets 919 ;; This works around a bug in 19.25 and earlier. There, if frame gets
900 ;; iconified, the current buffer changes to that of the frame that 920 ;; iconified, the current buffer changes to that of the frame that
901 ;; becomes exposed as a result of this iconification. 921 ;; becomes exposed as a result of this iconification.
902 ;; So, we make sure the current buffer doesn't change. 922 ;; So, we make sure the current buffer doesn't change.
903 (select-frame ctl-frame) 923 (select-frame ctl-frame)
1202 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) 1222 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1203 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) 1223 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
1204 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body)) 1224 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
1205 ;;; End: 1225 ;;; End:
1206 1226
1207 (provide 'ediff-wind)
1208
1209
1210 ;;; ediff-wind.el ends here 1227 ;;; ediff-wind.el ends here