# HG changeset patch
# User Karoly Lorentey <lorentey@elte.hu>
# Date 1074972749 0
# Node ID 6ce586a7243e9ab4d163d3fa9baaddb38ed15eeb
# Parent  abaf78268f22335f06a62e9a6d0971178ebb9ff9
Set the keyboard of the initial frame correctly.

src/dispnew.c (init_display)[MULTI_KBOARD]: Change the kboard of the
initial frame to that of the tty.  (Fixes --eval bug reported by
Romain Francoise.)


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-63

diff -r abaf78268f22 -r 6ce586a7243e README.multi-tty
--- a/README.multi-tty	Fri Jan 23 21:51:08 2004 +0000
+++ b/README.multi-tty	Sat Jan 24 19:32:29 2004 +0000
@@ -173,8 +173,6 @@
    >
    >     This also happens when I start a new frame in an xterm.
 
-** emacs -nw --eval '(y-or-n-p "Foobar")' segfaults.
-
 ** Fix interactive use of temacs.  There are face-related SEGVs, most
    likely because of changes in realize_default_face, realize_face.
 
@@ -605,4 +603,9 @@
    initialize tty colors when the initial window system was
    graphical.)
 
+-- emacs -nw --eval '(y-or-n-p "Foobar")' segfaults.  (Reported by
+   Romain Francoise)
+
+   (Fixed, there was a keyboard initialization problem.)
+
 ;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d
diff -r abaf78268f22 -r 6ce586a7243e src/dispnew.c
--- a/src/dispnew.c	Fri Jan 23 21:51:08 2004 +0000
+++ b/src/dispnew.c	Sat Jan 24 19:32:29 2004 +0000
@@ -6697,6 +6697,9 @@
       abort ();
     f->output_method = d->type;
     f->display = d;
+#ifdef MULTI_KBOARD
+    f->kboard = d->display_info.tty->kboard;
+#endif
 
     d->reference_count++;
     d->display_info.tty->top_frame = selected_frame;