2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 556025fa5bd..e47f6a63740 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * callproc.c (call_process): Call prepare_to_modify_buffer before
+        decoding text read from the sub-process, as the decoded stuff will
+        be inserted into the buffer.  This will invalidate the various
+        caches maintained for the buffer.  (Bug#15148)
+
 2013-11-05  Xue Fuqiao  <xfq.free@gmail.com>
 
         * xdisp.c (syms_of_xdisp): Mention the active display table in doc
diff --git a/src/callproc.c b/src/callproc.c
index 2740779f513..72b9c1dc370 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -822,6 +822,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
               ptrdiff_t count1 = SPECPDL_INDEX ();
 
               XSETBUFFER (curbuf, current_buffer);
+              prepare_to_modify_buffer (PT, PT, NULL);
               /* We cannot allow after-change-functions be run
                  during decoding, because that might modify the
                  buffer, while we rely on process_coding.produced to