diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-06-04 05:58:18 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-06-04 05:58:18 +0000 |
| commit | d17cf4eb2024cf54e4a216312184665094ee3df4 (patch) | |
| tree | 75b3c1dda3a2f53d49c30de5ce11299f40f163c8 | |
| parent | 88acaaf20b2fd0af64eea1b5d4f8fa8227c32e86 (diff) | |
| download | emacs-d17cf4eb2024cf54e4a216312184665094ee3df4.tar.gz emacs-d17cf4eb2024cf54e4a216312184665094ee3df4.tar.bz2 emacs-d17cf4eb2024cf54e4a216312184665094ee3df4.zip | |
(x_handle_selection_clear): Only access
terminal->kboard when MULTI_KBOARD is defined.
| -rw-r--r-- | src/ChangeLog.multi-tty | 3 | ||||
| -rw-r--r-- | src/xselect.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog.multi-tty b/src/ChangeLog.multi-tty index fc23d818ba5..eb455157034 100644 --- a/src/ChangeLog.multi-tty +++ b/src/ChangeLog.multi-tty @@ -1,5 +1,8 @@ 2007-06-03 Dan Nicolaescu <dann@ics.uci.edu> + * xselect.c (x_handle_selection_clear): Only access + terminal->kboard when MULTI_KBOARD is defined. + * term.c (init_tty): Use terminal specific mouse_position_hook. * macterm.c (mac_create_terminal): Indent and rearrange to be more diff --git a/src/xselect.c b/src/xselect.c index cb00903c41e..5ce6763cd30 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1022,6 +1022,7 @@ x_handle_selection_clear (event) TRACE0 ("x_handle_selection_clear"); +#ifdef MULTI_KBOARD /* If the new selection owner is also Emacs, don't clear the new selection. */ BLOCK_INPUT; @@ -1040,7 +1041,8 @@ x_handle_selection_clear (event) } } UNBLOCK_INPUT; - +#endif + selection_symbol = x_atom_to_symbol (display, selection); local_selection_data = assq_no_quit (selection_symbol, Vselection_alist); |