changeset 83631:7d63b897231b

(x_handle_selection_clear): Only access terminal->kboard when MULTI_KBOARD is defined.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 04 Jun 2007 05:58:18 +0000
parents 28201311b297
children cc587bfd19ca
files src/ChangeLog.multi-tty src/xselect.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog.multi-tty	Mon Jun 04 02:16:32 2007 +0000
+++ b/src/ChangeLog.multi-tty	Mon Jun 04 05:58:18 2007 +0000
@@ -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
--- a/src/xselect.c	Mon Jun 04 02:16:32 2007 +0000
+++ b/src/xselect.c	Mon Jun 04 05:58:18 2007 +0000
@@ -1022,6 +1022,7 @@
 
   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 @@
 	  }
       }
   UNBLOCK_INPUT;
-
+#endif
+  
   selection_symbol = x_atom_to_symbol (display, selection);
 
   local_selection_data = assq_no_quit (selection_symbol, Vselection_alist);