diff options
| author | Chong Yidong | 2005-11-20 15:22:31 +0000 |
|---|---|---|
| committer | Chong Yidong | 2005-11-20 15:22:31 +0000 |
| commit | 0268cef3fa68ba58822c2d3bed6f1e20e5e313ea (patch) | |
| tree | 2ccf6b33446033059b79ecddaf97394ece5ba823 | |
| parent | cbce075240ac1d71063846e5bd5a43a796a2f39d (diff) | |
| download | emacs-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.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/xfaces.c | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 548b9b1b959..e70e00e2f57 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2005-11-20 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * xfaces.c (Finternal_set_lisp_face_attribute): Use | ||
| 4 | :ignore-defface for new frame defaults when `unspecified' is | ||
| 5 | supplied. | ||
| 6 | (Finternal_get_lisp_face_attribute): Hide :ignore-defface. | ||
| 7 | |||
| 1 | 2005-11-20 Juri Linkov <juri@jurta.org> | 8 | 2005-11-20 Juri Linkov <juri@jurta.org> |
| 2 | 9 | ||
| 3 | * charset.c (invalid_character): Use Lisp-readable syntax | 10 | * charset.c (invalid_character): Use Lisp-readable syntax |
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 | ||