diff options
| author | Gerd Möllmann | 2025-01-19 15:52:10 +0100 |
|---|---|---|
| committer | Gerd Möllmann | 2025-01-19 15:52:10 +0100 |
| commit | c19d702b3b90fb54fc0dffa0a47f0ee4b0dd5fab (patch) | |
| tree | 58b583bd6be4b3aec8fcf17d5667deece8cc9c91 /src/coding.c | |
| parent | ef194a1e0e96f91dc7a57efcdf8a81ed716d18e0 (diff) | |
| parent | 6a0db0d80d538978f4e681b5947d60b7fb93cf9e (diff) | |
| download | emacs-c19d702b3b90fb54fc0dffa0a47f0ee4b0dd5fab.tar.gz emacs-c19d702b3b90fb54fc0dffa0a47f0ee4b0dd5fab.zip | |
Merge branch 'master' into feature/igc
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/coding.c b/src/coding.c index 804da31655d..5b858c8b581 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -8034,7 +8034,7 @@ decode_coding_gap (struct coding_system *coding, ptrdiff_t bytes) | |||
| 8034 | Fcons (undo_list, Fcurrent_buffer ())); | 8034 | Fcons (undo_list, Fcurrent_buffer ())); |
| 8035 | bset_undo_list (current_buffer, Qt); | 8035 | bset_undo_list (current_buffer, Qt); |
| 8036 | TEMP_SET_PT_BOTH (coding->dst_pos, coding->dst_pos_byte); | 8036 | TEMP_SET_PT_BOTH (coding->dst_pos, coding->dst_pos_byte); |
| 8037 | val = call1 (CODING_ATTR_POST_READ (attrs), | 8037 | val = calln (CODING_ATTR_POST_READ (attrs), |
| 8038 | make_fixnum (coding->produced_char)); | 8038 | make_fixnum (coding->produced_char)); |
| 8039 | CHECK_FIXNAT (val); | 8039 | CHECK_FIXNAT (val); |
| 8040 | coding->produced_char += Z - prev_Z; | 8040 | coding->produced_char += Z - prev_Z; |
| @@ -10870,10 +10870,10 @@ usage: (find-operation-coding-system OPERATION ARGUMENTS...) */) | |||
| 10870 | return Fcons (val, val); | 10870 | return Fcons (val, val); |
| 10871 | if (! NILP (Ffboundp (val))) | 10871 | if (! NILP (Ffboundp (val))) |
| 10872 | { | 10872 | { |
| 10873 | /* We use call1 rather than safe_call1 | 10873 | /* We use calln rather than safe_calln |
| 10874 | so as to get bug reports about functions called here | 10874 | so as to get bug reports about functions called here |
| 10875 | which don't handle the current interface. */ | 10875 | which don't handle the current interface. */ |
| 10876 | val = call1 (val, Flist (nargs, args)); | 10876 | val = calln (val, Flist (nargs, args)); |
| 10877 | if (CONSP (val)) | 10877 | if (CONSP (val)) |
| 10878 | return val; | 10878 | return val; |
| 10879 | if (SYMBOLP (val) && ! NILP (Fcoding_system_p (val))) | 10879 | if (SYMBOLP (val) && ! NILP (Fcoding_system_p (val))) |