From 3fde2acf6a4b228b3493666ab17f43eeac5a738f Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Thu, 20 Apr 2006 12:37:41 +0000 Subject: [PATCH] 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 --- README.multi-tty | 3 +++ lisp/vc.el | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.multi-tty b/README.multi-tty index 801bc577533..ed9c4b561bb 100644 --- a/README.multi-tty +++ b/README.multi-tty @@ -424,6 +424,9 @@ THINGS TO DO 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 --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 -- 2.39.5