diff options
| author | Eli Zaretskii | 2013-11-05 18:26:11 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-11-05 18:26:11 +0200 |
| commit | d57f4dde80447f0fcdb1c31df7f0657fd2eea369 (patch) | |
| tree | 6d5d803883e24304298d8b02bb5a52754284583a /src | |
| parent | 375761b2435915b7b1d3bf10dbbe39b47d370177 (diff) | |
| download | emacs-d57f4dde80447f0fcdb1c31df7f0657fd2eea369.tar.gz emacs-d57f4dde80447f0fcdb1c31df7f0657fd2eea369.zip | |
Fix bug #15148 with garbled display in Dired when cache-long-scans is ON.
src/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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/callproc.c | 1 |
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 @@ | |||
| 1 | 2013-11-05 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * callproc.c (call_process): Call prepare_to_modify_buffer before | ||
| 4 | decoding text read from the sub-process, as the decoded stuff will | ||
| 5 | be inserted into the buffer. This will invalidate the various | ||
| 6 | caches maintained for the buffer. (Bug#15148) | ||
| 7 | |||
| 1 | 2013-11-05 Xue Fuqiao <xfq.free@gmail.com> | 8 | 2013-11-05 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 9 | ||
| 3 | * xdisp.c (syms_of_xdisp): Mention the active display table in doc | 10 | * 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, | |||
| 822 | ptrdiff_t count1 = SPECPDL_INDEX (); | 822 | ptrdiff_t count1 = SPECPDL_INDEX (); |
| 823 | 823 | ||
| 824 | XSETBUFFER (curbuf, current_buffer); | 824 | XSETBUFFER (curbuf, current_buffer); |
| 825 | prepare_to_modify_buffer (PT, PT, NULL); | ||
| 825 | /* We cannot allow after-change-functions be run | 826 | /* We cannot allow after-change-functions be run |
| 826 | during decoding, because that might modify the | 827 | during decoding, because that might modify the |
| 827 | buffer, while we rely on process_coding.produced to | 828 | buffer, while we rely on process_coding.produced to |