diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/fileio.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2daee8c2d97..bde0ec68c53 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2014-05-31 Eli Zaretskii <eliz@gnu.org> | 1 | 2014-05-31 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * fileio.c (Finsert_file_contents): Call prepare_to_modify_buffer | ||
| 4 | with PT, not GPT. (Bug#16433) | ||
| 5 | |||
| 3 | Revert last changes to GDB-visible symbols. | 6 | Revert last changes to GDB-visible symbols. |
| 4 | * lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): Delete macros. | 7 | * lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): Delete macros. |
| 5 | (ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Don't use them. | 8 | (ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Don't use them. |
diff --git a/src/fileio.c b/src/fileio.c index 03519eda68d..3b7961b930a 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -4087,7 +4087,7 @@ by calling `format-decode', which see. */) | |||
| 4087 | && SAVE_MODIFF >= MODIFF) | 4087 | && SAVE_MODIFF >= MODIFF) |
| 4088 | we_locked_file = 1; | 4088 | we_locked_file = 1; |
| 4089 | #endif /* CLASH_DETECTION */ | 4089 | #endif /* CLASH_DETECTION */ |
| 4090 | prepare_to_modify_buffer (GPT, GPT, NULL); | 4090 | prepare_to_modify_buffer (PT, PT, NULL); |
| 4091 | } | 4091 | } |
| 4092 | 4092 | ||
| 4093 | move_gap_both (PT, PT_BYTE); | 4093 | move_gap_both (PT, PT_BYTE); |