aboutsummaryrefslogtreecommitdiffstats
path: root/src/keyboard.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 35bfd1402c9..b520d655fb9 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1827,6 +1827,14 @@ command_loop_1 ()
1827 1827
1828 if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks)) 1828 if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks))
1829 { 1829 {
1830 /* Setting transient-mark-mode to `only' is a way of
1831 turning it on for just one command. */
1832
1833 if (EQ (Vtransient_mark_mode, Qidentity))
1834 Vtransient_mark_mode = Qnil;
1835 if (EQ (Vtransient_mark_mode, Qonly))
1836 Vtransient_mark_mode = Qidentity;
1837
1830 if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode)) 1838 if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
1831 { 1839 {
1832 /* We could also call `deactivate'mark'. */ 1840 /* We could also call `deactivate'mark'. */
@@ -1842,16 +1850,6 @@ command_loop_1 ()
1842 call1 (Vrun_hooks, intern ("activate-mark-hook")); 1850 call1 (Vrun_hooks, intern ("activate-mark-hook"));
1843 } 1851 }
1844 1852
1845 /* Setting transient-mark-mode to `only' is a way of
1846 turning it on for just one command. */
1847 if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks))
1848 {
1849 if (EQ (Vtransient_mark_mode, Qidentity))
1850 Vtransient_mark_mode = Qnil;
1851 if (EQ (Vtransient_mark_mode, Qonly))
1852 Vtransient_mark_mode = Qidentity;
1853 }
1854
1855 finalize: 1853 finalize:
1856 1854
1857 if (current_buffer == prev_buffer 1855 if (current_buffer == prev_buffer
@@ -6640,7 +6638,6 @@ read_avail_input (expected)
6640 if (d->read_socket_hook) 6638 if (d->read_socket_hook)
6641 { 6639 {
6642 int nr; 6640 int nr;
6643
6644 struct input_event hold_quit; 6641 struct input_event hold_quit;
6645 6642
6646 EVENT_INIT (hold_quit); 6643 EVENT_INIT (hold_quit);