Mercurial > emacs
diff lisp/ediff-init.el @ 29412:ecd388a0937d
2000-06-05 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-init.el (ediff-has-face-support-p): make it paint faces on
tty's.
* ediff-diff.el (ediff-exec-process): use --binary for fine
differences whenever apropriate.
* viper-cmd.el (viper-smart-suffix-list): rearranged list members.
* viper.el (find-file,find-file-other-window): get viper to do
wildcards.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Mon, 05 Jun 2000 00:07:02 +0000 |
| parents | 641e43bad886 |
| children | f7f64f1ccc38 |
line wrap: on
line diff
--- a/lisp/ediff-init.el Sun Jun 04 23:40:58 2000 +0000 +++ b/lisp/ediff-init.el Mon Jun 05 00:07:02 2000 +0000 @@ -63,7 +63,8 @@ (defun ediff-has-face-support-p () (cond ((ediff-window-display-p)) (ediff-force-faces) - (ediff-emacs-p (memq (ediff-device-type) '(pc))) + (ediff-emacs-p (or (x-display-color-p) + (memq (ediff-device-type) '(pc)))) (ediff-xemacs-p (memq (ediff-device-type) '(tty pc))))) (defun ediff-has-toolbar-support-p ()