aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfaces.c
diff options
context:
space:
mode:
authorChong Yidong2005-11-20 15:22:31 +0000
committerChong Yidong2005-11-20 15:22:31 +0000
commit0268cef3fa68ba58822c2d3bed6f1e20e5e313ea (patch)
tree2ccf6b33446033059b79ecddaf97394ece5ba823 /src/xfaces.c
parentcbce075240ac1d71063846e5bd5a43a796a2f39d (diff)
downloademacs-0268cef3fa68ba58822c2d3bed6f1e20e5e313ea.tar.gz
emacs-0268cef3fa68ba58822c2d3bed6f1e20e5e313ea.zip
* xfaces.c (Finternal_set_lisp_face_attribute): Use
:ignore-defface for new frame defaults when `unspecified' is supplied. (Finternal_get_lisp_face_attribute): Hide :ignore-defface.
Diffstat (limited to 'src/xfaces.c')
-rw-r--r--src/xfaces.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 89fad414153..8729441925a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4054,7 +4054,11 @@ FRAME 0 means change the face on all frames, and change the default
4054 4054
4055 /* Set lface to the Lisp attribute vector of FACE. */ 4055 /* Set lface to the Lisp attribute vector of FACE. */
4056 if (EQ (frame, Qt)) 4056 if (EQ (frame, Qt))
4057 lface = lface_from_face_name (NULL, face, 1); 4057 {
4058 lface = lface_from_face_name (NULL, face, 1);
4059 if (UNSPECIFIEDP (value))
4060 value = Qignore_defface;
4061 }
4058 else 4062 else
4059 { 4063 {
4060 if (NILP (frame)) 4064 if (NILP (frame))
@@ -4880,6 +4884,9 @@ frames). If FRAME is omitted or nil, use the selected frame. */)
4880 else 4884 else
4881 signal_error ("Invalid face attribute name", keyword); 4885 signal_error ("Invalid face attribute name", keyword);
4882 4886
4887 if (IGNORE_DEFFACE_P (value))
4888 return Qunspecified;
4889
4883 return value; 4890 return value;
4884} 4891}
4885 4892