[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101248: * src/keyboard.c (command_lo
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101248: * src/keyboard.c (command_loop_1): Don't call x-set-selection on tty. |
Date: |
Tue, 31 Aug 2010 11:39:31 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101248
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2010-08-31 11:39:31 -0400
message:
* src/keyboard.c (command_loop_1): Don't call x-set-selection on tty.
modified:
src/ChangeLog
src/keyboard.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-08-30 12:47:49 +0000
+++ b/src/ChangeLog 2010-08-31 15:39:31 +0000
@@ -1,3 +1,7 @@
+2010-08-31 Chong Yidong <address@hidden>
+
+ * keyboard.c (command_loop_1): Don't call x-set-selection on tty.
+
2010-08-30 Stefan Monnier <address@hidden>
* marker.c (Fcopy_marker): Make the first arg optional.
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2010-08-24 15:48:14 +0000
+++ b/src/keyboard.c 2010-08-31 15:39:31 +0000
@@ -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));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101248: * src/keyboard.c (command_loop_1): Don't call x-set-selection on tty.,
Chong Yidong <=