From 07fa68a7e88e7e87beb570c0566b38086b8581d0 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 31 Aug 2010 11:39:31 -0400 Subject: [PATCH] * src/keyboard.c (command_loop_1): Don't call x-set-selection on tty. --- src/ChangeLog | 4 ++++ src/keyboard.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index fe97d576b9c..27cda2b66e9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-08-31 Chong Yidong + + * keyboard.c (command_loop_1): Don't call x-set-selection on tty. + 2010-08-30 Stefan Monnier * marker.c (Fcopy_marker): Make the first arg optional. diff --git a/src/keyboard.c b/src/keyboard.c index cac051f7882..46e0afc15a4 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1799,10 +1799,11 @@ command_loop_1 (void) { /* 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)); -- 2.39.2