diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-02-10 06:46:12 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-02-10 06:46:12 +0000 |
| commit | db52ec2a354443e3ba56f32e1e052832519f799e (patch) | |
| tree | ed86ae03977f76db973ad5e5be78267d046997aa /lisp/ediff-init.el | |
| parent | b44d93f71e206f942c6d4577eb747501926f947d (diff) | |
| download | emacs-db52ec2a354443e3ba56f32e1e052832519f799e.tar.gz | |
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.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 729d6f76e19..ae6d05ab40a 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -87,6 +87,14 @@ that Ediff doesn't know about.") nil ; emacs form )) + +(defun ediff-has-gutter-support-p () + (ediff-cond-compile-for-xemacs-or-emacs + (and (featurep 'gutter) (console-on-window-system-p)) ; xemacs form + nil ; emacs form + )) + + (defun ediff-use-toolbar-p () (and (ediff-has-toolbar-support-p) ;Can it do it ? (boundp 'ediff-use-toolbar-p) |