* 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.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/keymap.c b/src/keymap.c
index ccb39da186f..c24bb66b625 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -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;
         }