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 --git a/README.multi-tty b/README.multi-tty
index 5b4a29e..ded9c89 100644 (file)
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -173,8 +173,6 @@ THINGS TO DO
    >
    >     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 @@ DIARY OF CHANGES
    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 --git a/src/dispnew.c b/src/dispnew.c
index b62fd8f..1bd54a5 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6697,6 +6697,9 @@ For types not defined in VMS, use  define emacs_term \"TYPE\".\n\
       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;