aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2009-03-02 21:04:42 +0000
committerEli Zaretskii2009-03-02 21:04:42 +0000
commit71a0c011da89f12b6d921cf8c28eae80ee9f26b7 (patch)
treecc40f612a2362bae2e8b3de8287d06f1c9af788c /src
parent5d4cf42aa8518598e5b48ec84f18d02369652e9e (diff)
downloademacs-71a0c011da89f12b6d921cf8c28eae80ee9f26b7.tar.gz
emacs-71a0c011da89f12b6d921cf8c28eae80ee9f26b7.zip
(Fcall_process): Bind inhibit-modification-hooks to t when decoding
process output.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/callproc.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ba9168911a6..3af2b81e191 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12009-03-02 Eli Zaretskii <eliz@gnu.org>
2
3 * callproc.c (Fcall_process): Bind inhibit-modification-hooks to t
4 when decoding process output.
5
12009-03-01 Richard M Stallman <rms@gnu.org> 62009-03-01 Richard M Stallman <rms@gnu.org>
2 7
3 * m/mips.h (DATA_SEG_BITS, XUINT, XSET): Definitions disabled. 8 * m/mips.h (DATA_SEG_BITS, XUINT, XSET): Definitions disabled.
diff --git a/src/callproc.c b/src/callproc.c
index 316740391ed..d55fe695e76 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -732,10 +732,18 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
732 else 732 else
733 { /* We have to decode the input. */ 733 { /* We have to decode the input. */
734 Lisp_Object curbuf; 734 Lisp_Object curbuf;
735 int count1 = SPECPDL_INDEX ();
735 736
736 XSETBUFFER (curbuf, current_buffer); 737 XSETBUFFER (curbuf, current_buffer);
738 /* We cannot allow after-change-functions be run
739 during decoding, because that might modify the
740 buffer, while we rely on process_coding.produced to
741 faithfully reflect inserted text until we
742 TEMP_SET_PT_BOTH below. */
743 specbind (Qinhibit_modification_hooks, Qt);
737 decode_coding_c_string (&process_coding, buf, nread, 744 decode_coding_c_string (&process_coding, buf, nread,
738 curbuf); 745 curbuf);
746 unbind_to (count1, Qnil);
739 if (display_on_the_fly 747 if (display_on_the_fly
740 && CODING_REQUIRE_DETECTION (&saved_coding) 748 && CODING_REQUIRE_DETECTION (&saved_coding)
741 && ! CODING_REQUIRE_DETECTION (&process_coding)) 749 && ! CODING_REQUIRE_DETECTION (&process_coding))