diff options
| author | Karoly Lorentey | 2005-06-27 00:56:21 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-06-27 00:56:21 +0000 |
| commit | bedb9c0eda660f7dc516543be25db37b5f95e03b (patch) | |
| tree | 7c47185d6b01dd86453399a966c29ea4dfe70f9b /src/termchar.h | |
| parent | d66d64bc20de2e172859b2c3f08d05bb2f813c00 (diff) | |
| download | emacs-bedb9c0eda660f7dc516543be25db37b5f95e03b.tar.gz emacs-bedb9c0eda660f7dc516543be25db37b5f95e03b.zip | |
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
* src/termhooks.h (display): New field: kboard.
* src/xterm.h (x_display_info): Remove kboard field.
* src/termchar.h (tty_display_info): Ditto.
* src/frame.h (frame): Ditto.
(FRAME_KBOARD): Update.
* src/dispnew.c (init_display): Don't initialize kboard.
* src/frame.c (make_frame, make_initial_frame, make_terminal_frame): Ditto.
* src/frame.c (make_frame_without_minibuffer, Fdelete_frame): Update kboard access.
* src/keyboard.c (delete_kboard): Ditto.
* src/term.c (term_init): Ditto.
* src/xfns.c (Fx_create_frame, x_create_tip_frame): Ditto.
* src/xselect.c (x_handle_selection_clear): Ditto.
* src/xterm.c (x_term_init): Ditto.
* src/term.c (init_initial_display): Initialize kboard.
* src/xterm.c (x_term_init): Ditto.
* src/term.c (delete_tty): Remove kboard deletion.
(delete_display): Delete kboard as well.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-363
Diffstat (limited to 'src/termchar.h')
| -rw-r--r-- | src/termchar.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/termchar.h b/src/termchar.h index 5502ca22949..58d0ba24232 100644 --- a/src/termchar.h +++ b/src/termchar.h | |||
| @@ -70,11 +70,6 @@ struct tty_display_info | |||
| 70 | /* The previous terminal frame we displayed on this tty. */ | 70 | /* The previous terminal frame we displayed on this tty. */ |
| 71 | struct frame *previous_terminal_frame; | 71 | struct frame *previous_terminal_frame; |
| 72 | 72 | ||
| 73 | #ifdef MULTI_KBOARD | ||
| 74 | /* The terminal's keyboard object. */ | ||
| 75 | struct kboard *kboard; | ||
| 76 | #endif | ||
| 77 | |||
| 78 | /* Strings, numbers and flags taken from the termcap entry. */ | 73 | /* Strings, numbers and flags taken from the termcap entry. */ |
| 79 | 74 | ||
| 80 | char *TS_ins_line; /* "al" */ | 75 | char *TS_ins_line; /* "al" */ |