diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-04-04 07:51:27 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-04-04 07:51:27 +0000 |
| commit | 2d84cc270a12a939502497ad4d56371e9562a98d (patch) | |
| tree | 2553dc74513fea235847a7b9cfed0ca90d30880b /lisp/ediff-merg.el | |
| parent | d80c2c18c1fe064185ffbab1d0fc3ad4fd7f89c5 (diff) | |
| download | emacs-2d84cc270a12a939502497ad4d56371e9562a98d.tar.gz | |
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
* 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.
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 17352b03d50..d441adcd6a1 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -35,12 +35,9 @@ (defvar ediff-window-config-saved) (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-util) - (load "ediff-util.el" nil t 'nosuffix)) - )) + (require 'ediff-init) + (require 'ediff-util) + ) ;; end pacifier (require 'ediff-init) |