aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaroly Lorentey2004-01-24 19:32:29 +0000
committerKaroly Lorentey2004-01-24 19:32:29 +0000
commit2441679b4ca544b055fe90273d1dbc22744761de (patch)
treee83e89d52c1640f78027d7e4aef99809bc6d83e2
parent9ae44db9cce6aefe5012afbfa8bbbb1757ee1b92 (diff)
downloademacs-2441679b4ca544b055fe90273d1dbc22744761de.tar.gz
emacs-2441679b4ca544b055fe90273d1dbc22744761de.zip
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
-rw-r--r--README.multi-tty7
-rw-r--r--src/dispnew.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/README.multi-tty b/README.multi-tty
index 5b4a29ecda8..ded9c898eda 100644
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -173,8 +173,6 @@ THINGS TO DO
173 > 173 >
174 > This also happens when I start a new frame in an xterm. 174 > This also happens when I start a new frame in an xterm.
175 175
176** emacs -nw --eval '(y-or-n-p "Foobar")' segfaults.
177
178** Fix interactive use of temacs. There are face-related SEGVs, most 176** Fix interactive use of temacs. There are face-related SEGVs, most
179 likely because of changes in realize_default_face, realize_face. 177 likely because of changes in realize_default_face, realize_face.
180 178
@@ -605,4 +603,9 @@ DIARY OF CHANGES
605 initialize tty colors when the initial window system was 603 initialize tty colors when the initial window system was
606 graphical.) 604 graphical.)
607 605
606-- emacs -nw --eval '(y-or-n-p "Foobar")' segfaults. (Reported by
607 Romain Francoise)
608
609 (Fixed, there was a keyboard initialization problem.)
610
608;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d 611;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d
diff --git a/src/dispnew.c b/src/dispnew.c
index b62fd8f8b8f..1bd54a589c4 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6697,6 +6697,9 @@ For types not defined in VMS, use define emacs_term \"TYPE\".\n\
6697 abort (); 6697 abort ();
6698 f->output_method = d->type; 6698 f->output_method = d->type;
6699 f->display = d; 6699 f->display = d;
6700#ifdef MULTI_KBOARD
6701 f->kboard = d->display_info.tty->kboard;
6702#endif
6700 6703
6701 d->reference_count++; 6704 d->reference_count++;
6702 d->display_info.tty->top_frame = selected_frame; 6705 d->display_info.tty->top_frame = selected_frame;