aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.multi-tty3
-rw-r--r--lisp/vc.el4
2 files changed, 6 insertions, 1 deletions
diff --git a/README.multi-tty b/README.multi-tty
index 801bc57753..ed9c4b561b 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 61b8aa05a4..348903fc03 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