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.

2 files changed, 5 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc85e829dfe..24fe1463543 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-24  Glenn Morris  <rgm@gnu.org>
 
+        * term/tty-colors.el (tty-defined-color-alist): Remove duplicate
+        definition of C variable.
+
         * frame.el (show-trailing-whitespace, auto-hscroll-mode)
         (display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
         Don't redefine things that are defined in C.
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 @@
 ;;; tty-colors.el --- color support for character terminals
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Maintainer: FSF
@@ -768,11 +768,6 @@
     (yes . 8))
   "An alist of supported standard tty color modes and their aliases.")
 
-(defvar tty-defined-color-alist nil
-  "An alist of defined terminal colors and their RGB values.
-
-See the docstring of `tty-color-alist' for the details.")
-
 (defun tty-color-alist (&optional frame)
   "Return an alist of colors supported by FRAME's terminal.
 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."
       (setq colors (cdr colors)))
     count))
 
-;; arch-tag: 84d5c3ef-ae22-4754-99ac-e6350c0967ae
 ;;; tty-colors.el ends here