Mercurial > emacs
comparison lisp/vc.el @ 83512:5d328dadd0f4
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 |
comparison
equal
deleted
inserted
replaced
| 83511:f714f11da40a | 83512:5d328dadd0f4 |
|---|---|
| 615 :type 'hook | 615 :type 'hook |
| 616 :group 'vc) | 616 :group 'vc) |
| 617 | 617 |
| 618 ;; Annotate customization | 618 ;; Annotate customization |
| 619 (defcustom vc-annotate-color-map | 619 (defcustom vc-annotate-color-map |
| 620 (if (and (not window-system) | 620 (if (and (tty-display-color-p) (<= (display-color-cells) 8)) |
| 621 (tty-display-color-p) | |
| 622 (<= (display-color-cells) 8)) | |
| 623 ;; A custom sorted TTY colormap | 621 ;; A custom sorted TTY colormap |
| 624 (let* ((colors | 622 (let* ((colors |
| 625 (sort | 623 (sort |
| 626 (delq nil | 624 (delq nil |
| 627 (mapcar (lambda (x) | 625 (mapcar (lambda (x) |