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/emulation/viper-util.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/emulation/viper-util.el')
| -rw-r--r-- | lisp/emulation/viper-util.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 7410e05f7b4..8ea4805c90b 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -26,6 +26,9 @@ ;;; Code: +(provide 'viper-util) + + ;; Compiler pacifier (defvar viper-overriding-map) (defvar pm-color-alist) @@ -1557,9 +1560,6 @@ This option is appropriate if you like Emacs-style words." -(provide 'viper-util) - - ;;; Local Variables: ;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun) ;;; End: |