Mercurial > emacs
changeset 110069:c837e7372468
* src/keyboard.c (command_loop_1): Don't call x-set-selection on tty.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 31 Aug 2010 11:39:31 -0400 |
| parents | 2af503eb57ef |
| children | ad86f610b2b3 |
| files | src/ChangeLog src/keyboard.c |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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));