diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-11-24 08:15:11 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-11-24 08:15:11 +0000 |
| commit | 7d0278167b563513731e93c71d65463eadb6b89a (patch) | |
| tree | 2d16b74f5e7cc6768ffb80872d0f5d5443163eda /lisp/ediff-wind.el | |
| parent | 1862a24e48a6c85a9821c3a82441a5f5e3b94c69 (diff) | |
| download | emacs-7d0278167b563513731e93c71d65463eadb6b89a.tar.gz | |
* ediff-diff.el: Moved variables around to have it compile under NT.
* ediff-help.el (ediff-use-long-help-message): made it customizable.
* ediff-init.el (ediff-abbrev-jobname): use capitalize.
* ediff-wind.el (ediff-skip-unsuitable-frames): deleted the
redundant skip-small-frames test.
* viper-cmd.el (viper-change-state-to-vi): disable overwrite mode.
(viper-downgrade-to-insert): protect against errors in hooks.
* viper-init.el (viper-vi-state-hook,viper-insert-state-hook,
viper-replace-state-hook,viper-emacs-state-hook): do cursor handling.
(viper-restore-cursor-type,viper-set-insert-cursor-type): new
functions.
* viper-util.el (viper-memq-char): bug fixes
* viper.el (viper-mode): fix cursor handling.
Diffstat (limited to 'lisp/ediff-wind.el')
| -rw-r--r-- | lisp/ediff-wind.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 82415d94eba..46d56595511 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -151,7 +151,7 @@ In this case, Ediff will use those frames to display these buffers." '(vertical-scroll-bars . nil) ; Emacs only '(scrollbar-width . 0) ; XEmacs only '(menu-bar-lines . 0) ; Emacs only - '(tool-bar-lines . 0) ; Emacs 21+ only + '(tool-bar-lines . 0) ; Emacs 21+ only ;; don't lower and auto-raise '(auto-lower . nil) '(auto-raise . t) @@ -842,9 +842,6 @@ into icons, regardless of the window manager." (or (ediff-frame-has-dedicated-windows (selected-frame)) (ediff-frame-iconified-p (selected-frame)) - ;; skip small frames - (< (frame-height (selected-frame)) - (* 3 window-min-height)) ;; skip small windows (< (window-height (selected-window)) (* 3 window-min-height)) |