summaryrefslogtreecommitdiff
path: root/src/process.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1993-06-11 21:06:14 +0000
committerRichard M. Stallman <rms@gnu.org>1993-06-11 21:06:14 +0000
commit592ce97fa8f668e72b850350b27c1b1ea22e2bc7 (patch)
tree2212b8793ed0199bf0832a6b2ad934dec6e0bd24 /src/process.c
parent638e4fc3ad80bb2d0e9c1114905fff7a4710bbb0 (diff)
downloademacs-592ce97fa8f668e72b850350b27c1b1ea22e2bc7.tar.gz
(read_process_output): Don't deactivate the mark.
Do restore Vdeactivate_mark, so that no one else deactivates it.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/src/process.c b/src/process.c
index 0a1ff9a422c..af3c079f541 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2082,16 +2082,7 @@ read_process_output (proc, channel)
specbind (Qinhibit_quit, Qt);
call2 (outstream, proc, make_string (chars, nchars));
- /* Deactivate the mark now, so it doesn't happen
- *after* the following command. */
- if (!NILP (current_buffer->mark_active))
- {
- if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
- {
- current_buffer->mark_active = Qnil;
- call1 (Vrun_hooks, intern ("deactivate-mark-hook"));
- }
- }
+ /* Handling the process output should not deactivate the mark. */
Vdeactivate_mark = odeactivate;
#ifdef VMS
@@ -2153,17 +2144,7 @@ read_process_output (proc, channel)
if (XFASTINT (old_begv) != BEGV || XFASTINT (old_zv) != ZV)
Fnarrow_to_region (old_begv, old_zv);
- /* Deactivate the mark now, so it doesn't happen
- *after* the following command. */
- if (!NILP (current_buffer->mark_active))
- {
- if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
- {
- current_buffer->mark_active = Qnil;
- call1 (Vrun_hooks, intern ("deactivate-mark-hook"));
- }
- }
-
+ /* Handling the process output should not deactivate the mark. */
Vdeactivate_mark = odeactivate;
current_buffer->read_only = old_read_only;