mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-19 18:13:55 +00:00
* 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.
This commit is contained in:
parent
caf9deeeed
commit
ae0b9b4690
@ -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.
|
||||
|
@ -2108,7 +2108,7 @@ where_is_internal (definition, keymaps, firstonly, noindirect)
|
||||
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;
|
||||
}
|
||||
|
@ -102,7 +102,8 @@ record_delete (beg, string)
|
||||
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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user