aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorRichard M. Stallman1993-06-11 21:06:14 +0000
committerRichard M. Stallman1993-06-11 21:06:14 +0000
commit592ce97fa8f668e72b850350b27c1b1ea22e2bc7 (patch)
tree2212b8793ed0199bf0832a6b2ad934dec6e0bd24 /src/process.c
parent638e4fc3ad80bb2d0e9c1114905fff7a4710bbb0 (diff)
downloademacs-592ce97fa8f668e72b850350b27c1b1ea22e2bc7.tar.gz
emacs-592ce97fa8f668e72b850350b27c1b1ea22e2bc7.zip
(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)
2082 specbind (Qinhibit_quit, Qt); 2082 specbind (Qinhibit_quit, Qt);
2083 call2 (outstream, proc, make_string (chars, nchars)); 2083 call2 (outstream, proc, make_string (chars, nchars));
2084 2084
2085 /* Deactivate the mark now, so it doesn't happen 2085 /* Handling the process output should not deactivate the mark. */
2086 *after* the following command. */
2087 if (!NILP (current_buffer->mark_active))
2088 {
2089 if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
2090 {
2091 current_buffer->mark_active = Qnil;
2092 call1 (Vrun_hooks, intern ("deactivate-mark-hook"));
2093 }
2094 }
2095 Vdeactivate_mark = odeactivate; 2086 Vdeactivate_mark = odeactivate;
2096 2087
2097#ifdef VMS 2088#ifdef VMS
@@ -2153,17 +2144,7 @@ read_process_output (proc, channel)
2153 if (XFASTINT (old_begv) != BEGV || XFASTINT (old_zv) != ZV) 2144 if (XFASTINT (old_begv) != BEGV || XFASTINT (old_zv) != ZV)
2154 Fnarrow_to_region (old_begv, old_zv); 2145 Fnarrow_to_region (old_begv, old_zv);
2155 2146
2156 /* Deactivate the mark now, so it doesn't happen 2147 /* Handling the process output should not deactivate the mark. */
2157 *after* the following command. */
2158 if (!NILP (current_buffer->mark_active))
2159 {
2160 if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
2161 {
2162 current_buffer->mark_active = Qnil;
2163 call1 (Vrun_hooks, intern ("deactivate-mark-hook"));
2164 }
2165 }
2166
2167 Vdeactivate_mark = odeactivate; 2148 Vdeactivate_mark = odeactivate;
2168 2149
2169 current_buffer->read_only = old_read_only; 2150 current_buffer->read_only = old_read_only;