# HG changeset patch
# User Ken Raeburn <raeburn@raeburn.org>
# Date 972687680 0
# Node ID 8d46095169e82d1819190d0d70d118e03d4c771b
# Parent  a3db89bef2e51dbae413267d2ec2a2857861a1af
* 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.

diff -r a3db89bef2e5 -r 8d46095169e8 src/ChangeLog
--- 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.
diff -r a3db89bef2e5 -r 8d46095169e8 src/keymap.c
--- 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;
 	}
diff -r a3db89bef2e5 -r 8d46095169e8 src/undo.c
--- 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);