diff options
| author | Chong Yidong | 2005-11-20 22:35:48 +0000 |
|---|---|---|
| committer | Chong Yidong | 2005-11-20 22:35:48 +0000 |
| commit | 67d23e016655c1e79e1f9ba43c22d4fb67a8057e (patch) | |
| tree | 8ae7d9ee14934310e8d842ac36320027aecbd002 /src/ChangeLog | |
| parent | 8c2fb42f85ae6992dc046c4772b0e3f6bd9321ea (diff) | |
| download | emacs-67d23e016655c1e79e1f9ba43c22d4fb67a8057e.tar.gz emacs-67d23e016655c1e79e1f9ba43c22d4fb67a8057e.zip | |
(merge_face_vectors): Don't do :ignore-defface overwriting here.
(Finternal_merge_in_global_face): Do it here.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e70e00e2f57..addb672d10d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -4,6 +4,8 @@ | |||
| 4 | :ignore-defface for new frame defaults when `unspecified' is | 4 | :ignore-defface for new frame defaults when `unspecified' is |
| 5 | supplied. | 5 | supplied. |
| 6 | (Finternal_get_lisp_face_attribute): Hide :ignore-defface. | 6 | (Finternal_get_lisp_face_attribute): Hide :ignore-defface. |
| 7 | (merge_face_vectors): Don't do :ignore-defface overwriting here. | ||
| 8 | (Finternal_merge_in_global_face): Do it here. | ||
| 7 | 9 | ||
| 8 | 2005-11-20 Juri Linkov <juri@jurta.org> | 10 | 2005-11-20 Juri Linkov <juri@jurta.org> |
| 9 | 11 | ||