diff options
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 438492032ba..7cd3d3da229 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -63,7 +63,8 @@ that Ediff doesn't know about.") (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 () |