From 2d84cc270a12a939502497ad4d56371e9562a98d Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Fri, 4 Apr 2008 07:51:27 +0000 Subject: 2008-04-04 Michael Kifer * ediff*el: replaced load with require in eval-when-compile. * ediff-hook: deleted all invocations of (autoload ...). * ediff-util.el (ediff-setup): make window-min-height a local variable in ediff control window, and set its min height to 2. (ediff-setup-control-buffer): dedicate the control window. (ediff-toggle-multiframe): undedicate control window. Work directly with ediff-setup-windows-multiframe and ediff-setup-windows-plain. * ediff-wind (ediff-choose-window-setup-function-automatically): new function. (ediff-window-setup-function): change initialization. (ediff-setup-windows-automatic): deleted. (ediff-setup-windows-plain-merge): make control window dedicated. (ediff-destroy-control-frame): do not skip frames if working in a single frame. * emulation/viper-ex.el: move provide's forward, prevent ecursion in eval-when-compile. * emulation/viper-util.el: move provide's forward, prevent ecursion in eval-when-compile. --- lisp/ediff-ptch.el | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'lisp/ediff-ptch.el') diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index 7d013cc7693..06fd8d20b64 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -27,6 +27,8 @@ ;;; Code: +(provide 'ediff-ptch) + (defgroup ediff-ptch nil "Ediff patch support." :tag "Patch" @@ -41,14 +43,11 @@ (defvar ediff-shell) (eval-when-compile - (let ((load-path (cons (expand-file-name ".") load-path))) - (or (featurep 'ediff-init) - (load "ediff-init.el" nil t 'nosuffix)) - (or (featurep 'ediff-mult) - (load "ediff-mult.el" nil t 'nosuffix)) - (or (featurep 'ediff) - (load "ediff.el" nil t 'nosuffix)) - )) + (require 'ediff-init) + (if (not (featurep 'ediff-mult)) + (require 'ediff-mult)) + (require 'ediff) + ) ;; end pacifier (require 'ediff-init) @@ -846,8 +845,6 @@ you can still examine the changes via M-x ediff-files" -(provide 'ediff-ptch) - ;;; Local Variables: ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) -- cgit v1.2.1