diff options
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/fileio.c b/src/fileio.c index 7e75e6285f0..c0f6c1d2e8e 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -1553,7 +1553,7 @@ those `/' is discarded. */) | |||
| 1553 | if (p) | 1553 | if (p) |
| 1554 | /* Start over with the new string, so we check the file-name-handler | 1554 | /* Start over with the new string, so we check the file-name-handler |
| 1555 | again. Important with filenames like "/home/foo//:/hello///there" | 1555 | again. Important with filenames like "/home/foo//:/hello///there" |
| 1556 | which whould substitute to "/:/hello///there" rather than "/there". */ | 1556 | which would substitute to "/:/hello///there" rather than "/there". */ |
| 1557 | return Fsubstitute_in_file_name | 1557 | return Fsubstitute_in_file_name |
| 1558 | (make_specified_string (p, -1, endp - p, multibyte)); | 1558 | (make_specified_string (p, -1, endp - p, multibyte)); |
| 1559 | 1559 | ||
| @@ -4100,6 +4100,16 @@ variable `last-coding-system-used' to the coding system actually used. */) | |||
| 4100 | adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted, | 4100 | adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted, |
| 4101 | inserted); | 4101 | inserted); |
| 4102 | 4102 | ||
| 4103 | /* Call after-change hooks for the inserted text, aside from the case | ||
| 4104 | of normal visiting (not with REPLACE), which is done in a new buffer | ||
| 4105 | "before" the buffer is changed. */ | ||
| 4106 | if (inserted > 0 && total > 0 | ||
| 4107 | && (NILP (visit) || !NILP (replace))) | ||
| 4108 | { | ||
| 4109 | signal_after_change (PT, 0, inserted); | ||
| 4110 | update_compositions (PT, PT, CHECK_BORDER); | ||
| 4111 | } | ||
| 4112 | |||
| 4103 | /* Now INSERTED is measured in characters. */ | 4113 | /* Now INSERTED is measured in characters. */ |
| 4104 | 4114 | ||
| 4105 | handled: | 4115 | handled: |
| @@ -4270,16 +4280,6 @@ variable `last-coding-system-used' to the coding system actually used. */) | |||
| 4270 | unbind_to (count1, Qnil); | 4280 | unbind_to (count1, Qnil); |
| 4271 | } | 4281 | } |
| 4272 | 4282 | ||
| 4273 | /* Call after-change hooks for the inserted text, aside from the case | ||
| 4274 | of normal visiting (not with REPLACE), which is done in a new buffer | ||
| 4275 | "before" the buffer is changed. */ | ||
| 4276 | if (inserted > 0 && total > 0 | ||
| 4277 | && (NILP (visit) || !NILP (replace))) | ||
| 4278 | { | ||
| 4279 | signal_after_change (PT, 0, inserted); | ||
| 4280 | update_compositions (PT, PT, CHECK_BORDER); | ||
| 4281 | } | ||
| 4282 | |||
| 4283 | if (!NILP (visit) | 4283 | if (!NILP (visit) |
| 4284 | && current_buffer->modtime == -1) | 4284 | && current_buffer->modtime == -1) |
| 4285 | { | 4285 | { |