Make `tty-display-color-p' follow its doc string. (Reported by Dan Nicolaescu.)

* lisp/vc.el (vc-annotate-color-map): Undo previous change.

* src/dispnew.c (Fsend_string_to_terminal): Update call to `get_tty_terminal'.

* src/term.c (Fsuspend_tty, Fresume_tty): Update call to `get_tty_terminal'.
  (get_tty_terminal): Add throw parameter.
  (Ftty_display_color_p, Ftty_display_color_cells): Don't throw errors on
  X frames.

* src/dispextern.h (get_tty_terminal): Update prototype.

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

1 files changed, 1 insertions, 3 deletions

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