diff options
| author | Glenn Morris | 2010-10-23 18:48:39 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-23 18:48:39 -0700 |
| commit | 46710489c856df3ec94c822d1d88be30d19159f9 (patch) | |
| tree | 1daaab6aa01507ef7c1e2380e513566085ebdab5 /lisp/term | |
| parent | ea88388346b71bef26c5c8b405c2a936f918952e (diff) | |
| download | emacs-46710489c856df3ec94c822d1d88be30d19159f9.tar.gz emacs-46710489c856df3ec94c822d1d88be30d19159f9.zip | |
Remove duplicate definition of tty-defined-color-alist.
* src/xfaces.c (syms_of_xfaces) <tty-defined-color-alist>: Sync doc with
Lisp version.
* lisp/term/tty-colors.el (tty-defined-color-alist): Remove duplicate
definition of C variable.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/tty-colors.el | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el index cc462455517..df45dc192a7 100644 --- a/lisp/term/tty-colors.el +++ b/lisp/term/tty-colors.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; tty-colors.el --- color support for character terminals | 1 | ;;; tty-colors.el --- color support for character terminals |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, | 3 | ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Eli Zaretskii | 6 | ;; Author: Eli Zaretskii |
| 7 | ;; Maintainer: FSF | 7 | ;; Maintainer: FSF |
| @@ -768,11 +768,6 @@ | |||
| 768 | (yes . 8)) | 768 | (yes . 8)) |
| 769 | "An alist of supported standard tty color modes and their aliases.") | 769 | "An alist of supported standard tty color modes and their aliases.") |
| 770 | 770 | ||
| 771 | (defvar tty-defined-color-alist nil | ||
| 772 | "An alist of defined terminal colors and their RGB values. | ||
| 773 | |||
| 774 | See the docstring of `tty-color-alist' for the details.") | ||
| 775 | |||
| 776 | (defun tty-color-alist (&optional frame) | 771 | (defun tty-color-alist (&optional frame) |
| 777 | "Return an alist of colors supported by FRAME's terminal. | 772 | "Return an alist of colors supported by FRAME's terminal. |
| 778 | FRAME defaults to the selected frame. | 773 | FRAME defaults to the selected frame. |
| @@ -1039,5 +1034,4 @@ A color is considered gray if the 3 components of its RGB value are equal." | |||
| 1039 | (setq colors (cdr colors))) | 1034 | (setq colors (cdr colors))) |
| 1040 | count)) | 1035 | count)) |
| 1041 | 1036 | ||
| 1042 | ;; arch-tag: 84d5c3ef-ae22-4754-99ac-e6350c0967ae | ||
| 1043 | ;;; tty-colors.el ends here | 1037 | ;;; tty-colors.el ends here |