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/xselect.c | |
| 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/xselect.c')
| -rw-r--r-- | src/xselect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xselect.c b/src/xselect.c index b0bd0bc97c9..c60c12c3b67 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -1010,7 +1010,7 @@ x_handle_selection_clear (event) | |||
| 1010 | to see if this Emacs job now owns the selection | 1010 | to see if this Emacs job now owns the selection |
| 1011 | through that display. */ | 1011 | through that display. */ |
| 1012 | for (t_dpyinfo = x_display_list; t_dpyinfo; t_dpyinfo = t_dpyinfo->next) | 1012 | for (t_dpyinfo = x_display_list; t_dpyinfo; t_dpyinfo = t_dpyinfo->next) |
| 1013 | if (t_dpyinfo->kboard == dpyinfo->kboard) | 1013 | if (t_dpyinfo->frame_display->kboard == dpyinfo->frame_display->kboard) |
| 1014 | { | 1014 | { |
| 1015 | Window owner_window | 1015 | Window owner_window |
| 1016 | = XGetSelectionOwner (t_dpyinfo->display, selection); | 1016 | = XGetSelectionOwner (t_dpyinfo->display, selection); |