aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2005-11-18 01:48:42 +0000
committerChong Yidong2005-11-18 01:48:42 +0000
commit2ff10663846ffc1b994504361767cf1435379026 (patch)
tree600fe4b143448cd63c0da54cbfd6bcb906ab758f /src/ChangeLog
parent39c7cde2a4db6801eb22d4e2e7d39b5ce1084649 (diff)
downloademacs-2ff10663846ffc1b994504361767cf1435379026.tar.gz
emacs-2ff10663846ffc1b994504361767cf1435379026.zip
* xfaces.c (Qignore_defface): New variable.
(syms_of_xfaces): Provide `:ignore-defface'. (IGNORE_DEFFACE_P): New macro. (check_lface_attrs): Qignore_defface is a possible value. (lface_fully_specified_p): Likewise. (Finternal_set_lisp_face_attribute): Likewise. (merge_face_vectors): The merged face is `unspecified' if the mergee specifies `:ignore-defface'.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 900db33db3d..dcdc481f37b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
12005-11-17 Chong Yidong <cyd@stupidchicken.com>
2
3 * xfaces.c (Qignore_defface): New variable.
4 (syms_of_xfaces): Provide `:ignore-defface'.
5 (IGNORE_DEFFACE_P): New macro.
6 (check_lface_attrs): Qignore_defface is a possible value.
7 (lface_fully_specified_p): Likewise.
8 (Finternal_set_lisp_face_attribute): Likewise.
9 (merge_face_vectors): The merged face is `unspecified' if the
10 mergee specifies `:ignore-defface'.
11
12005-11-16 Stefan Monnier <monnier@iro.umontreal.ca> 122005-11-16 Stefan Monnier <monnier@iro.umontreal.ca>
2 13
3 * lread.c (readevalloop): Add missing GCPROs. 14 * lread.c (readevalloop): Add missing GCPROs.