[Emacs-diffs] /srv/bzr/emacs/trunk r102070: Remove duplicate definition of tty-defined-color-alist.

[Glenn Morris]

------------------------------------------------------------
revno: 102070
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-23 18:48:39 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/term/tty-colors.el
  src/ChangeLog
  src/xfaces.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-24 00:58:22 +0000
+++ b/lisp/ChangeLog    2010-10-24 01:48:39 +0000
@@ -1,5 +1,8 @@
 2010-10-24  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/term/tty-colors.el'
--- a/lisp/term/tty-colors.el   2010-01-13 08:35:10 +0000
+++ b/lisp/term/tty-colors.el   2010-10-24 01:48:39 +0000
@@ -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 @@
       (setq colors (cdr colors)))
     count))
 
-;; arch-tag: 84d5c3ef-ae22-4754-99ac-e6350c0967ae
 ;;; tty-colors.el ends here

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-24 01:22:37 +0000
+++ b/src/ChangeLog     2010-10-24 01:48:39 +0000
@@ -1,5 +1,8 @@
 2010-10-24  Glenn Morris  <address@hidden>
 
+       * xfaces.c (syms_of_xfaces) <tty-defined-color-alist>: Sync doc with
+       Lisp version.
+
        * w32term.c (syms_of_w32term) <x-use-underline-position-properties>:
        Sync doc with the xterm.c version.
 

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2010-08-06 10:12:41 +0000
+++ b/src/xfaces.c      2010-10-24 01:48:39 +0000
@@ -1,6 +1,8 @@
 /* xfaces.c -- "Face" primitives.
-   Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 
Inc.
+
+Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -6731,7 +6733,8 @@
   Vface_default_stipple = make_pure_c_string ("gray3");
 
   DEFVAR_LISP ("tty-defined-color-alist", &Vtty_defined_color_alist,
-   doc: /* An alist of defined terminal colors and their RGB values.  */);
+   doc: /* An alist of defined terminal colors and their RGB values.
+See the docstring of `tty-color-alist' for the details.  */);
   Vtty_defined_color_alist = Qnil;
 
   DEFVAR_LISP ("scalable-fonts-allowed", &Vscalable_fonts_allowed,
@@ -6808,5 +6811,3 @@
 #endif
 }
 
-/* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749
-   (do not change this comment) */