diff options
| author | Kenichi Handa | 2008-09-14 05:59:16 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2008-09-14 05:59:16 +0000 |
| commit | c3702194809d8772afa226d5107ec3abb05e8d35 (patch) | |
| tree | ef6a0d33b9b75f273e2c0b355387c001355d8351 | |
| parent | 896c726619b7c6094406ab075451fb24cad46a0e (diff) | |
| download | emacs-c3702194809d8772afa226d5107ec3abb05e8d35.tar.gz emacs-c3702194809d8772afa226d5107ec3abb05e8d35.zip | |
(Finsert_file_contents): Delete incorrect decrement of specpdl_ptr.
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/fileio.c | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 45a5bd149a3..1f0ae13a37d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-09-14 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * fileio.c (Finsert_file_contents): Delete incorrect decrement of | ||
| 4 | specpdl_ptr. | ||
| 5 | |||
| 1 | 2008-09-12 Kenichi Handa <handa@m17n.org> | 6 | 2008-09-12 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * indent.c (scan_for_column): Don't handle automatic composition | 8 | * indent.c (scan_for_column): Don't handle automatic composition |
| @@ -90,6 +95,11 @@ | |||
| 90 | 95 | ||
| 91 | * buffer.c (Fbuffer_swap_text): Reset window->point markers. | 96 | * buffer.c (Fbuffer_swap_text): Reset window->point markers. |
| 92 | 97 | ||
| 98 | 2008-09-07 Kenichi Handa <handa@m17n.org> | ||
| 99 | |||
| 100 | * composite.c (FORWARD_CHAR): Check STOP after | ||
| 101 | incrementing (POSITION).pos. | ||
| 102 | |||
| 93 | 2008-09-06 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> | 103 | 2008-09-06 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> |
| 94 | 104 | ||
| 95 | * process.c (Fsystem_process_attributes): Doc fix. | 105 | * process.c (Fsystem_process_attributes): Doc fix. |
diff --git a/src/fileio.c b/src/fileio.c index 9c6b98d83f5..a5541d544f2 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3673,7 +3673,6 @@ variable `last-coding-system-used' to the coding system actually used. */) | |||
| 3673 | 3673 | ||
| 3674 | if (bufpos == inserted) | 3674 | if (bufpos == inserted) |
| 3675 | { | 3675 | { |
| 3676 | specpdl_ptr--; | ||
| 3677 | /* Truncate the buffer to the size of the file. */ | 3676 | /* Truncate the buffer to the size of the file. */ |
| 3678 | if (same_at_start == same_at_end) | 3677 | if (same_at_start == same_at_end) |
| 3679 | nochange = 1; | 3678 | nochange = 1; |