# HG changeset patch
# User Karoly Lorentey <lorentey@elte.hu>
# Date 1145536661 0
# Node ID f714f11da40abee1eff8d5388b010b9ecb6957bd
# Parent  2d2f6f096f6ef88aa6ad751b24d3d3027295f320
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

diff -r 2d2f6f096f6e -r f714f11da40a README.multi-tty
--- a/README.multi-tty	Wed Apr 19 16:23:46 2006 +0000
+++ b/README.multi-tty	Thu Apr 20 12:37:41 2006 +0000
@@ -424,6 +424,9 @@
    exported to Lisp, this approach seems at least as ugly as the pty
    proxy idea.
 
+** lisp/vc.el depends on the terminal type during load time.
+   `vc-annotate-color-map' is one example that needs to be fixed.
+
 ** Understand how `quit_throw_to_read_char' works, and fix any bugs
    that come to light.
 
diff -r 2d2f6f096f6e -r f714f11da40a lisp/vc.el
--- a/lisp/vc.el	Wed Apr 19 16:23:46 2006 +0000
+++ b/lisp/vc.el	Thu Apr 20 12:37:41 2006 +0000
@@ -617,7 +617,9 @@
 
 ;; 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