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/emulation/viper-ex.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lisp/emulation/viper-ex.el') diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index af5780f0d72..49988e285f0 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -46,7 +46,8 @@ ;; in order to spare non-viperized emacs from being viperized (if noninteractive (eval-when-compile - (require 'viper-cmd) + (if (not (featurep 'viper-cmd)) + (require 'viper-cmd)) )) ;; end pacifier -- cgit v1.2.1