diff lisp/ediff-wind.el @ 33842:f6a67d77484a

* 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.

--- a/lisp/ediff-wind.el	Fri Nov 24 06:32:05 2000 +0000
+++ b/lisp/ediff-wind.el	Fri Nov 24 08:15:11 2000 +0000
@@ -151,7 +151,7 @@
    '(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 @@
 		    (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))