aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2008-09-14 05:59:16 +0000
committerKenichi Handa2008-09-14 05:59:16 +0000
commitc3702194809d8772afa226d5107ec3abb05e8d35 (patch)
treeef6a0d33b9b75f273e2c0b355387c001355d8351
parent896c726619b7c6094406ab075451fb24cad46a0e (diff)
downloademacs-c3702194809d8772afa226d5107ec3abb05e8d35.tar.gz
emacs-c3702194809d8772afa226d5107ec3abb05e8d35.zip
(Finsert_file_contents): Delete incorrect decrement of specpdl_ptr.
-rw-r--r--src/ChangeLog10
-rw-r--r--src/fileio.c1
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 @@
12008-09-14 Kenichi Handa <handa@m17n.org>
2
3 * fileio.c (Finsert_file_contents): Delete incorrect decrement of
4 specpdl_ptr.
5
12008-09-12 Kenichi Handa <handa@m17n.org> 62008-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
982008-09-07 Kenichi Handa <handa@m17n.org>
99
100 * composite.c (FORWARD_CHAR): Check STOP after
101 incrementing (POSITION).pos.
102
932008-09-06 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> 1032008-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;