diff options
| author | Eli Zaretskii | 2024-10-12 05:53:27 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2024-10-12 05:53:27 -0400 |
| commit | bb5b25181ea7a4393f019dc641a981bdb6687c62 (patch) | |
| tree | 678a5f622075e4cb031764d67af0ec620276fd5d /src/coding.c | |
| parent | 16e835171a8ce388e581174925e47263e864727d (diff) | |
| parent | 0f8f0773183a07a229b23d3f970723ceb9585aef (diff) | |
| download | emacs-bb5b25181ea7a4393f019dc641a981bdb6687c62.tar.gz emacs-bb5b25181ea7a4393f019dc641a981bdb6687c62.zip | |
Merge from origin/emacs-30
0f8f0773183 ; * doc/emacs/search.texi (Word Search): Document 'dictio...
fb155bcfb6f ; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Doc fix.
6dbe4e99ac4 ; * lisp/emacs-lisp/chart.el (chart-bar-quickie): Improve...
d664227f81a ; More accurate documentation of 'file-newer-than-file-p'
e49b479f869 Fix c-ts-mode indentation for initializer lists (bug#73661)
f520008744b Avoid segfaults in Rmail-MIME
6a5c2edd84f Eglot: use :immediate t when resolving completions (bug#7...
cd36e070c24 Eglot: minor changes to doc and docstrings
1ea0d9b891b Revert "Set treesit-primary-parser for tree-sitter modes"
52746ceb625 Remove duplicate indent rules in elixir-ts-mode
ed57faafc74 Set treesit-primary-parser for tree-sitter modes
37a6c859b04 ; * lisp/emacs-lisp/cl-macs.el (cl-once-only): Fix capita...
2d4d6dc43a4 Delete XIE X extension from TODO
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index 547fcbb8120..cd5a12972e6 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -5270,7 +5270,9 @@ decode_coding_raw_text (struct coding_system *coding) | |||
| 5270 | coding->chars_at_source = 1; | 5270 | coding->chars_at_source = 1; |
| 5271 | coding->consumed_char = coding->src_chars; | 5271 | coding->consumed_char = coding->src_chars; |
| 5272 | coding->consumed = coding->src_bytes; | 5272 | coding->consumed = coding->src_bytes; |
| 5273 | if (eol_dos && coding->source[coding->src_bytes - 1] == '\r') | 5273 | if (eol_dos |
| 5274 | && coding->src_bytes > 0 /* empty source text? */ | ||
| 5275 | && coding->source[coding->src_bytes - 1] == '\r') | ||
| 5274 | { | 5276 | { |
| 5275 | coding->consumed_char--; | 5277 | coding->consumed_char--; |
| 5276 | coding->consumed--; | 5278 | coding->consumed--; |