diff options
| author | Eli Zaretskii | 2024-12-21 07:56:28 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2024-12-21 07:56:28 -0500 |
| commit | a1d08d2c13497937475bf453c66a22a61f4e8631 (patch) | |
| tree | d683086baeea0e39ccc177009232a0354affc28e /src/coding.c | |
| parent | b6d9183e7dd160be902530044e6fe1ec7d467234 (diff) | |
| parent | 5e97079cc7587ce338679ed237efb911723e4367 (diff) | |
| download | emacs-a1d08d2c13497937475bf453c66a22a61f4e8631.tar.gz emacs-a1d08d2c13497937475bf453c66a22a61f4e8631.zip | |
Merge from origin/emacs-30
5e97079cc75 ; Fix call to 'decode_string_utf_8' in #ifdef'ed-away code
6902673b5b9 ; Improve commentary in calendar.el
08b62132dde Add 'lua-ts-mode' to 'interpreter-mode-alist'
d8ffcf2fbac Document representation of dates in calendar.el
faaa13ec762 Autoload 'shortdoc-help-fns-examples-function'
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index cd5a12972e6..dd8c20adc3e 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -10407,7 +10407,7 @@ DEFUN ("internal-decode-string-utf-8", Finternal_decode_string_utf_8, | |||
| 10407 | if (NILP (decode_method)) | 10407 | if (NILP (decode_method)) |
| 10408 | { | 10408 | { |
| 10409 | for (int i = 0; i < repeat_count; i++) | 10409 | for (int i = 0; i < repeat_count; i++) |
| 10410 | val = decode_string_utf_8 (string, buffer, ! NILP (nocopy), | 10410 | val = decode_string_utf_8 (string, NULL, -1, buffer, ! NILP (nocopy), |
| 10411 | handle_8_bit, handle_over_uni); | 10411 | handle_8_bit, handle_over_uni); |
| 10412 | } | 10412 | } |
| 10413 | else if (EQ (decode_method, Qt)) | 10413 | else if (EQ (decode_method, Qt)) |