diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2000-09-08 14:20:44 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2000-09-08 14:20:44 +0000 |
| commit | c454aac1921dfc9e7afa4e139ac7ed95dd27faa1 (patch) | |
| tree | 4e3b44be07d5000b1b0ad0957255abf8ee76e31e | |
| parent | 334a2e2a82cb041ec1d0c744e408573aa37d8915 (diff) | |
| download | emacs-c454aac1921dfc9e7afa4e139ac7ed95dd27faa1.tar.gz | |
*** empty log message ***
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | src/ChangeLog | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 170fff01134..2fbd738ae20 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2000-09-08 Gerd Moellmann <gerd@gnu.org> + + * faces.el (face-spec-set): Only face-spec-reset-face when + ATTRS is non-nil. + 2000-09-08 Eli Zaretskii <eliz@is.elta.co.il> * help.el (help-insert-xref-button): Fix a typo in doc string. @@ -74,7 +79,7 @@ * international/quail.el: Don't require face. (quail): New group. - (quail-other-command): Dummy command to make quail-help works + (quail-other-command): Dummy command to make quail-help work better. (quail-keyboard-layout-alist): Add Keyboard type "jp106". (quail-keyboard-layout-substitution): New variable. diff --git a/src/ChangeLog b/src/ChangeLog index 88902089325..03589ba0c81 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2000-09-08 Gerd Moellmann <gerd@gnu.org> + * xfaces.c (Finternal_merge_in_global_face): Return a Lisp object. + + * xdisp.c (dump_glyph_row): Fix printf format string. + (display_line, move_it_in_display_line_to): Avoid compiler + warnings. + * s/freebsd.h (GC_MARK_STACK, REL_ALLOC_MMAP): Define. * keymap.c (Fset_keymap_parent): Check for cycles in keymap |