2 files changed, 18 insertions, 1 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 6fb95f5d815..a906146df4a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1112,6 +1112,22 @@ struct kboard_stack
 static struct kboard_stack *kboard_stack;
 
 void
+push_display_kboard (d)
+     struct display *d;
+{
+#ifdef MULTI_KBOARD
+  struct kboard_stack *p
+    = (struct kboard_stack *) xmalloc (sizeof (struct kboard_stack));
+
+  p->next = kboard_stack;
+  p->kboard = current_kboard;
+  kboard_stack = p;
+
+  current_kboard = d->kboard;
+#endif
+}
+
+void
 push_frame_kboard (f)
      FRAME_PTR f;
 {
@@ -10803,7 +10819,7 @@ delete_kboard (kb)
       && FRAMEP (selected_frame)
       && FRAME_LIVE_P (XFRAME (selected_frame)))
     {
-      current_kboard = XFRAME (selected_frame)->kboard;
+      current_kboard = XFRAME (selected_frame)->display->kboard;
       if (current_kboard == kb)
         abort ();
     }
diff --git a/src/keyboard.h b/src/keyboard.h
index de2254952b4..91226ce6e65 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -315,6 +315,7 @@ extern void init_kboard P_ ((KBOARD *));
 extern void delete_kboard P_ ((KBOARD *));
 extern void single_kboard_state P_ ((void));
 extern void not_single_kboard_state P_ ((KBOARD *));
+extern void push_display_kboard P_ ((struct display *));
 extern void push_frame_kboard P_ ((struct frame *));
 extern void pop_frame_kboard P_ ((void));
 extern void record_asynch_buffer_change P_ ((void));