aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-11-09 18:40:43 +0200
committerEli Zaretskii2014-11-09 18:40:43 +0200
commitea75a0e069998158b47b774aae263529568f8b1c (patch)
tree79278e45c2d8ec2ab439bb7c5c92d2fe9afc1fdb /src
parent2ae1e0d427eaf8583875a31525eca42c0a9ebb99 (diff)
downloademacs-ea75a0e069998158b47b774aae263529568f8b1c.tar.gz
emacs-ea75a0e069998158b47b774aae263529568f8b1c.zip
Fix bug #18982 with assertion violations when reverting buffers.
src/fileio.c (Finsert_file_contents): Invalidate buffer caches also when the inserted text does not need decoding.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/fileio.c7
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c03218c21f9..719ccec467d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12014-11-09 Eli Zaretskii <eliz@gnu.org> 12014-11-09 Eli Zaretskii <eliz@gnu.org>
2 2
3 * fileio.c (Finsert_file_contents): Invalidate buffer caches also
4 when the inserted text does not need decoding. (Bug#18982)
5
3 * w32heap.c (allocate_heap): Set the lower limit of heap at 8MB. 6 * w32heap.c (allocate_heap): Set the lower limit of heap at 8MB.
4 (Bug#18995) 7 (Bug#18995)
5 8
diff --git a/src/fileio.c b/src/fileio.c
index fba64010b54..8570a1604a3 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4308,8 +4308,11 @@ by calling `format-decode', which see. */)
4308 coding_system = CODING_ID_NAME (coding.id); 4308 coding_system = CODING_ID_NAME (coding.id);
4309 } 4309 }
4310 else if (inserted > 0) 4310 else if (inserted > 0)
4311 adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted, 4311 {
4312 inserted); 4312 invalidate_buffer_caches (current_buffer, PT, PT + inserted);
4313 adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
4314 inserted);
4315 }
4313 4316
4314 /* Call after-change hooks for the inserted text, aside from the case 4317 /* Call after-change hooks for the inserted text, aside from the case
4315 of normal visiting (not with REPLACE), which is done in a new buffer 4318 of normal visiting (not with REPLACE), which is done in a new buffer