Commit ae0b9b46 authored by Ken Raeburn's avatar Ken Raeburn
Browse files

* 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.
parent caf9deee
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment