aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2011-09-11 22:22:22 -0400
committerStefan Monnier2011-09-11 22:22:22 -0400
commit2ba8e0088836fa1bfec2bdd6c92159b7805c399d (patch)
treee9db3c787ebfef0bfada3c11b8fd6577b54c0e83
parent393a301e80860e90ba0ba718d29a2d72bc00eff7 (diff)
downloademacs-2ba8e0088836fa1bfec2bdd6c92159b7805c399d.tar.gz
emacs-2ba8e0088836fa1bfec2bdd6c92159b7805c399d.zip
* src/fileio.c (Finsert_file_contents): Don't assume beg_offset is 0.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fileio.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 456c6aa0c3b..191462cb101 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-09-12 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * fileio.c (Finsert_file_contents): Don't assume beg_offset is 0.
4
12011-09-11 Chong Yidong <cyd@stupidchicken.com> 52011-09-11 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * minibuf.c (Fread_from_minibuffer): Doc fix. 7 * minibuf.c (Fread_from_minibuffer): Doc fix.
diff --git a/src/fileio.c b/src/fileio.c
index e48fd89d7cb..08be41f9fe4 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3546,7 +3546,7 @@ variable `last-coding-system-used' to the coding system actually used. */)
3546 immediate_quit = 0; 3546 immediate_quit = 0;
3547 /* If the file matches the buffer completely, 3547 /* If the file matches the buffer completely,
3548 there's no need to replace anything. */ 3548 there's no need to replace anything. */
3549 if (same_at_start - BEGV_BYTE == end_offset) 3549 if (same_at_start - BEGV_BYTE == end_offset - beg_offset)
3550 { 3550 {
3551 emacs_close (fd); 3551 emacs_close (fd);
3552 specpdl_ptr--; 3552 specpdl_ptr--;