aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xfaces.c11
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dc2c8be43e2..b981fb29482 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12010-10-24 Glenn Morris <rgm@gnu.org> 12010-10-24 Glenn Morris <rgm@gnu.org>
2 2
3 * xfaces.c (syms_of_xfaces) <tty-defined-color-alist>: Sync doc with
4 Lisp version.
5
3 * w32term.c (syms_of_w32term) <x-use-underline-position-properties>: 6 * w32term.c (syms_of_w32term) <x-use-underline-position-properties>:
4 Sync doc with the xterm.c version. 7 Sync doc with the xterm.c version.
5 8
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 @@
1/* xfaces.c -- "Face" primitives. 1/* xfaces.c -- "Face" primitives.
2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2
3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4 2005, 2006, 2007, 2008, 2009, 2010
5 Free Software Foundation, Inc.
4 6
5This file is part of GNU Emacs. 7This file is part of GNU Emacs.
6 8
@@ -6731,7 +6733,8 @@ See `set-face-stipple' for possible values for this variable. */);
6731 Vface_default_stipple = make_pure_c_string ("gray3"); 6733 Vface_default_stipple = make_pure_c_string ("gray3");
6732 6734
6733 DEFVAR_LISP ("tty-defined-color-alist", &Vtty_defined_color_alist, 6735 DEFVAR_LISP ("tty-defined-color-alist", &Vtty_defined_color_alist,
6734 doc: /* An alist of defined terminal colors and their RGB values. */); 6736 doc: /* An alist of defined terminal colors and their RGB values.
6737See the docstring of `tty-color-alist' for the details. */);
6735 Vtty_defined_color_alist = Qnil; 6738 Vtty_defined_color_alist = Qnil;
6736 6739
6737 DEFVAR_LISP ("scalable-fonts-allowed", &Vscalable_fonts_allowed, 6740 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. */);
6808#endif 6811#endif
6809} 6812}
6810 6813
6811/* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749
6812 (do not change this comment) */