Fix `vc-annotate' under X. (Reported by Dan Nicolaescu.)

* lisp/vc.el (vc-annotate-color-map): Call `tty-display-color-p' only on
  ttys.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-551

1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/vc.el b/lisp/vc.el
index 61b8aa05a4b..348903fc031 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -617,7 +617,9 @@ version control backend imposes itself."
 
 ;; Annotate customization
 (defcustom vc-annotate-color-map
-  (if (and (tty-display-color-p) (<= (display-color-cells) 8))
+  (if (and (not window-system)
+           (tty-display-color-p)
+           (<= (display-color-cells) 8))
       ;; A custom sorted TTY colormap
       (let* ((colors
               (sort