From f28c1bd9cd71668830a1db49d8e15be8a817c84f Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Nov 2004 03:50:11 +0000 Subject: (command_loop_1): Change Vtransient_mark_mode before deciding whether to inctivate mark. --- src/keyboard.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/keyboard.c') diff --git a/src/keyboard.c b/src/keyboard.c index d145ec50d2c..e2c21793c6c 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1840,6 +1840,14 @@ command_loop_1 () if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks)) { + /* Setting transient-mark-mode to `only' is a way of + turning it on for just one command. */ + + if (EQ (Vtransient_mark_mode, Qidentity)) + Vtransient_mark_mode = Qnil; + if (EQ (Vtransient_mark_mode, Qonly)) + Vtransient_mark_mode = Qidentity; + if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode)) { /* We could also call `deactivate'mark'. */ @@ -1855,16 +1863,6 @@ command_loop_1 () call1 (Vrun_hooks, intern ("activate-mark-hook")); } - /* Setting transient-mark-mode to `only' is a way of - turning it on for just one command. */ - if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks)) - { - if (EQ (Vtransient_mark_mode, Qidentity)) - Vtransient_mark_mode = Qnil; - if (EQ (Vtransient_mark_mode, Qonly)) - Vtransient_mark_mode = Qidentity; - } - finalize: if (current_buffer == prev_buffer -- cgit v1.2.1 From caa5a925ae893570c394170871c50a8475aa616d Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Tue, 9 Nov 2004 13:23:55 +0000 Subject: (read_avail_input): Remove unused variable 'discard'. --- src/keyboard.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/keyboard.c') diff --git a/src/keyboard.c b/src/keyboard.c index e2c21793c6c..90da03256c9 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -6627,7 +6627,6 @@ read_avail_input (expected) if (read_socket_hook) { - int discard = 0; int nr; struct input_event hold_quit; -- cgit v1.2.1