diff options
| author | Paul Eggert | 2013-05-30 18:31:10 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-05-30 18:31:10 -0700 |
| commit | 0e64479a3aa321a1a44e2057eebbf5c378b7ad5c (patch) | |
| tree | dbb89943f78ed89b1c856faa125b7238cec87f5a | |
| parent | 01dea85f7b9a064ceafefd6e2940566da0530fb4 (diff) | |
| download | emacs-0e64479a3aa321a1a44e2057eebbf5c378b7ad5c.tar.gz emacs-0e64479a3aa321a1a44e2057eebbf5c378b7ad5c.zip | |
* fileio.c (Finsert_file_contents): Remove unused local.
Fixes: debbugs:8447
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fileio.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 56e13da832a..bfc51b8c5ff 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-05-31 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * fileio.c (Finsert_file_contents): Remove unused local (Bug#8447). | ||
| 4 | |||
| 1 | 2013-05-29 Eli Zaretskii <eliz@gnu.org> | 5 | 2013-05-29 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * Makefile.in (mostlyclean): Remove *.res files. | 7 | * Makefile.in (mostlyclean): Remove *.res files. |
diff --git a/src/fileio.c b/src/fileio.c index e2b1007fb0b..75e1f13a09b 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3489,7 +3489,6 @@ by calling `format-decode', which see. */) | |||
| 3489 | EMACS_TIME mtime; | 3489 | EMACS_TIME mtime; |
| 3490 | int fd; | 3490 | int fd; |
| 3491 | ptrdiff_t inserted = 0; | 3491 | ptrdiff_t inserted = 0; |
| 3492 | bool nochange = 0; | ||
| 3493 | ptrdiff_t how_much; | 3492 | ptrdiff_t how_much; |
| 3494 | off_t beg_offset, end_offset; | 3493 | off_t beg_offset, end_offset; |
| 3495 | int unprocessed; | 3494 | int unprocessed; |
| @@ -4060,9 +4059,7 @@ by calling `format-decode', which see. */) | |||
| 4060 | if (bufpos == inserted) | 4059 | if (bufpos == inserted) |
| 4061 | { | 4060 | { |
| 4062 | /* Truncate the buffer to the size of the file. */ | 4061 | /* Truncate the buffer to the size of the file. */ |
| 4063 | if (same_at_start == same_at_end) | 4062 | if (same_at_start != same_at_end) |
| 4064 | nochange = 1; | ||
| 4065 | else | ||
| 4066 | del_range_byte (same_at_start, same_at_end, 0); | 4063 | del_range_byte (same_at_start, same_at_end, 0); |
| 4067 | inserted = 0; | 4064 | inserted = 0; |
| 4068 | 4065 | ||