From: Dan Nicolaescu Date: Mon, 4 Jun 2007 05:58:18 +0000 (+0000) Subject: (x_handle_selection_clear): Only access X-Git-Tag: emacs-pretest-23.0.90~11236^2~78 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d17cf4eb2024cf54e4a216312184665094ee3df4;p=emacs.git (x_handle_selection_clear): Only access terminal->kboard when MULTI_KBOARD is defined. --- 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 + * 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);