comparison lisp/ediff-init.el @ 43220:69c91aaa067a

2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu> * viper-util.el (viper-read-key-sequence): fixed so it'll read fast key sequences in emacs native mode (viper-events-to-keys): deleted * viper.el (describe-key, describe-key-briefly): get rid of viper-events-to-keys. * ediff-init.el (ediff-has-gutter-support): Steven Turnbull's patch. * ediff-wind.el (ediff-setup-control-frame): Use ediff-has-gutter-support. * ediff-util.el (ediff-dispose-of-variant-according-to-user): check if buff is alive. * ediff.el: typo in comment.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Sun, 10 Feb 2002 06:46:12 +0000
parents 633233bf2bbf
children 1c34b0b56515
comparison
equal deleted inserted replaced
43219:1e589b2b35e9 43220:69c91aaa067a
84 (defun ediff-has-toolbar-support-p () 84 (defun ediff-has-toolbar-support-p ()
85 (ediff-cond-compile-for-xemacs-or-emacs 85 (ediff-cond-compile-for-xemacs-or-emacs
86 (and (featurep 'toolbar) (console-on-window-system-p)) ; xemacs form 86 (and (featurep 'toolbar) (console-on-window-system-p)) ; xemacs form
87 nil ; emacs form 87 nil ; emacs form
88 )) 88 ))
89
90
91 (defun ediff-has-gutter-support-p ()
92 (ediff-cond-compile-for-xemacs-or-emacs
93 (and (featurep 'gutter) (console-on-window-system-p)) ; xemacs form
94 nil ; emacs form
95 ))
96
89 97
90 (defun ediff-use-toolbar-p () 98 (defun ediff-use-toolbar-p ()
91 (and (ediff-has-toolbar-support-p) ;Can it do it ? 99 (and (ediff-has-toolbar-support-p) ;Can it do it ?
92 (boundp 'ediff-use-toolbar-p) 100 (boundp 'ediff-use-toolbar-p)
93 ediff-use-toolbar-p)) ;Does the user want it ? 101 ediff-use-toolbar-p)) ;Does the user want it ?