1 files changed, 5 insertions, 4 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 00eefb375ef..c43d528b25b 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -611,7 +611,8 @@ map_keymap_internal (Lisp_Object map,
         }
       else if (CHAR_TABLE_P (binding))
         map_char_table (map_keymap_char_table_item, Qnil, binding,
-                        make_save_value ("ppo", fun, data, args));
+                        make_save_value (SAVE_TYPE_PTR_PTR_OBJ,
+                                         fun, data, args));
     }
   UNGCPRO;
   return tail;
@@ -1555,8 +1556,8 @@ like in the respective argument of `key-binding'.  */)
       window = POSN_WINDOW (position);
 
       if (WINDOWP (window)
-          && BUFFERP (XWINDOW (window)->buffer)
-          && XBUFFER (XWINDOW (window)->buffer) != current_buffer)
+          && BUFFERP (XWINDOW (window)->contents)
+          && XBUFFER (XWINDOW (window)->contents) != current_buffer)
         {
           /* Arrange to go back to the original buffer once we're done
              processing the key sequence.  We don't use
@@ -1566,7 +1567,7 @@ like in the respective argument of `key-binding'.  */)
              things the same.
           */
           record_unwind_current_buffer ();
-          set_buffer_internal (XBUFFER (XWINDOW (window)->buffer));
+          set_buffer_internal (XBUFFER (XWINDOW (window)->contents));
         }
     }