# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1283269171 14400
# Node ID c837e7372468034d22ad3fd10fdd955bcf7c651a
# Parent  2af503eb57ef427b24ae1ffcb6fa33871b3349f0
* src/keyboard.c (command_loop_1): Don't call x-set-selection on tty.

diff -r 2af503eb57ef -r c837e7372468 src/ChangeLog
--- a/src/ChangeLog	Tue Aug 31 13:28:02 2010 +0000
+++ b/src/ChangeLog	Tue Aug 31 11:39:31 2010 -0400
@@ -1,3 +1,7 @@
+2010-08-31  Chong Yidong  <cyd@stupidchicken.com>
+
+	* keyboard.c (command_loop_1): Don't call x-set-selection on tty.
+
 2010-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* marker.c (Fcopy_marker): Make the first arg optional.
diff -r 2af503eb57ef -r c837e7372468 src/keyboard.c
--- a/src/keyboard.c	Tue Aug 31 13:28:02 2010 +0000
+++ b/src/keyboard.c	Tue Aug 31 11:39:31 2010 -0400
@@ -1799,10 +1799,11 @@
 	    {
 	      /* Even if not deactivating the mark, set PRIMARY if
 		 `select-active-regions' is non-nil.  */
-	      if ((EQ (Vselect_active_regions, Qonly)
-		   ? EQ (CAR_SAFE (Vtransient_mark_mode), Qonly)
-		   : (!NILP (Vselect_active_regions)
-		      && !NILP (Vtransient_mark_mode)))
+	      if (!NILP (Fwindow_system (Qnil))
+		  && (EQ (Vselect_active_regions, Qonly)
+		      ? EQ (CAR_SAFE (Vtransient_mark_mode), Qonly)
+		      : (!NILP (Vselect_active_regions)
+			 && !NILP (Vtransient_mark_mode)))
 		  && !EQ (Vthis_command, Qhandle_switch_frame))
 		{
 		  int beg = XINT (Fmarker_position (current_buffer->mark));