Mercurial > emacs
changeset 32992:8d46095169e8
* undo.c (record_delete): Check that last_undo_buffer is really a buffer before
applying XBUFFER to it.
* keymap.c (where_is_internal): Pass lisp object, not integer, to Faref.
| author | Ken Raeburn <raeburn@raeburn.org> |
|---|---|
| date | Fri, 27 Oct 2000 23:01:20 +0000 |
| parents | a3db89bef2e5 |
| children | ce95094f21e7 |
| files | src/ChangeLog src/keymap.c src/undo.c |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Oct 27 22:59:52 2000 +0000 +++ b/src/ChangeLog Fri Oct 27 23:01:20 2000 +0000 @@ -2,6 +2,12 @@ * window.h (Fwindow_live_p): Declare. + * undo.c (record_delete): Check that last_undo_buffer is really a + buffer before applying XBUFFER to it. + + * keymap.c (where_is_internal): Pass lisp object, not integer, to + Faref. + 2000-10-27 Stefan Monnier <monnier@cs.yale.edu> * lisp.h (KEYMAPP): New macro.
--- a/src/keymap.c Fri Oct 27 22:59:52 2000 +0000 +++ b/src/keymap.c Fri Oct 27 23:01:20 2000 +0000 @@ -2108,7 +2108,7 @@ if (nomenus && XINT (last) >= 0) { /* If no menu entries should be returned, skip over the keymaps bound to `menu-bar' and `tool-bar'. */ - Lisp_Object tem = Faref (this, 0); + Lisp_Object tem = Faref (this, make_number (0)); if (EQ (tem, Qmenu_bar) || EQ (tem, Qtool_bar)) continue; }
--- a/src/undo.c Fri Oct 27 22:59:52 2000 +0000 +++ b/src/undo.c Fri Oct 27 23:01:20 2000 +0000 @@ -102,7 +102,8 @@ if (NILP (pending_boundary)) pending_boundary = Fcons (Qnil, Qnil); - if (current_buffer != XBUFFER (last_undo_buffer)) + if (BUFFERP (last_undo_buffer) + && current_buffer != XBUFFER (last_undo_buffer)) Fundo_boundary (); XSETBUFFER (last_undo_buffer, current_buffer);