Mercurial > emacs
changeset 31508:5416fcb729d7
*** empty log message ***
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 08 Sep 2000 14:20:44 +0000 |
| parents | ac6d049932e9 |
| children | 6bc82db7d305 |
| files | lisp/ChangeLog src/ChangeLog |
| diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Sep 08 14:19:31 2000 +0000 +++ b/lisp/ChangeLog Fri Sep 08 14:20:44 2000 +0000 @@ -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.
--- a/src/ChangeLog Fri Sep 08 14:19:31 2000 +0000 +++ b/src/ChangeLog Fri Sep 08 14:20:44 2000 +0000 @@ -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