diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-10-23 18:48:39 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-10-23 18:48:39 -0700 |
| commit | 46710489c856df3ec94c822d1d88be30d19159f9 (patch) | |
| tree | 1daaab6aa01507ef7c1e2380e513566085ebdab5 /src/xfaces.c | |
| parent | ea88388346b71bef26c5c8b405c2a936f918952e (diff) | |
| download | emacs-46710489c856df3ec94c822d1d88be30d19159f9.tar.gz | |
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 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 21adb948c91..8ef3c81f1a3 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -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 @@ See `set-face-stipple' for possible values for this variable. */); 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 @@ a font of 10 point, we actually use a font of 10 * RESCALE-RATIO point. */); #endif } -/* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749 - (do not change this comment) */ |