Mercurial > emacs

diff lisp/vc.el @ 83512:5d328dadd0f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 20 Apr 2006 16:09:11 +0000
parents f714f11da40a
children 46b1096093f5
line wrap: on
line diff
--- a/lisp/vc.el	Thu Apr 20 12:37:41 2006 +0000
+++ b/lisp/vc.el	Thu Apr 20 16:09:11 2006 +0000
@@ -617,9 +617,7 @@
 
 ;; 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