diff options
| author | Paul Eggert | 2013-07-25 09:07:47 +0100 |
|---|---|---|
| committer | Paul Eggert | 2013-07-25 09:07:47 +0100 |
| commit | b68060293249e7a86c23dfb7a831a11dbb5bd694 (patch) | |
| tree | 2445ba0d98c51317583a671cd353d6cfc3193362 | |
| parent | 9d611ffe280d0af4aa43406e5e102636606d3204 (diff) | |
| download | emacs-b68060293249e7a86c23dfb7a831a11dbb5bd694.tar.gz emacs-b68060293249e7a86c23dfb7a831a11dbb5bd694.zip | |
* fileio.c (Finsert_file_contents): Use a more-conservative fix.
Fixes: debbugs:14936
| -rw-r--r-- | src/fileio.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index 1350e19ef27..c47b3533145 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3860,10 +3860,7 @@ by calling `format-decode', which see. */) | |||
| 3860 | if (same_at_start - BEGV_BYTE == end_offset - beg_offset) | 3860 | if (same_at_start - BEGV_BYTE == end_offset - beg_offset) |
| 3861 | { | 3861 | { |
| 3862 | emacs_close (fd); | 3862 | emacs_close (fd); |
| 3863 | 3863 | clear_unwind_protect (fd_index); | |
| 3864 | /* Discard the unwind protect for closing the file, and any | ||
| 3865 | unwind protect for restoring point. */ | ||
| 3866 | specpdl_ptr = specpdl + fd_index; | ||
| 3867 | 3864 | ||
| 3868 | /* Truncate the buffer to the size of the file. */ | 3865 | /* Truncate the buffer to the size of the file. */ |
| 3869 | del_range_1 (same_at_start, same_at_end, 0, 0); | 3866 | del_range_1 (same_at_start, same_at_end, 0, 0); |