aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorStefan Monnier2023-01-14 09:10:45 -0500
committerStefan Monnier2023-01-14 09:10:45 -0500
commit4f0459aaf756e56db5fb943177eec6eb5bd5fc4a (patch)
treed4f404727a4a55e2efc1dd4979851bcb67ccd852 /src/coding.c
parent99120491730c5839a5ba15ded187d481af1e71a7 (diff)
parent861556c1339cd65842ec3e24ba48590e6b72bd48 (diff)
downloademacs-4f0459aaf756e56db5fb943177eec6eb5bd5fc4a.tar.gz
emacs-4f0459aaf756e56db5fb943177eec6eb5bd5fc4a.zip
Merge from origin/emacs-29
861556c1339 Fix minibuffer-completion tests c0578edc8fc ; * doc/misc/eglot.texi (Troubleshooting Eglot): Fix typo... c6bbf9cc270 Add c-ts-mode tests a760364f5f3 Fix c-ts-mode--fill-paragraph 2a2b1d09ac7 Fix minor issues with 'pp' and related commands dfb38fb2ee6 ; Improve documentation of tree-sitter node comparison e8a89a18b69 ; Fix non-tree-sitter builds f27a330b99e ; Fix typo in ert-with-temp-file 956889d8ff1 Equal now recognizes tree-sitter nodes (bug#60659) 8f446c2d397 Fix c-ts-mode comment indentation (bug#60270) 083badc9c12 * lisp/subr.el (while-let): Use if-let, not if-let* (bug#... 9ecebcdded1 * lisp/simple.el (next-completion): Handle first completi... cfd2b3504ab Fix encoding with 'utf-8-auto' 53b47df8229 Report cursor correctly on PGTK when there is a margin # Conflicts: # etc/NEWS
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c
index 4e59f2b6a1b..49dcd8634f3 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1431,7 +1431,7 @@ encode_coding_utf_8 (struct coding_system *coding)
1431 ptrdiff_t produced_chars = 0; 1431 ptrdiff_t produced_chars = 0;
1432 int c; 1432 int c;
1433 1433
1434 if (CODING_UTF_8_BOM (coding) == utf_with_bom) 1434 if (CODING_UTF_8_BOM (coding) != utf_without_bom)
1435 { 1435 {
1436 ASSURE_DESTINATION (3); 1436 ASSURE_DESTINATION (3);
1437 EMIT_THREE_BYTES (UTF_8_BOM_1, UTF_8_BOM_2, UTF_8_BOM_3); 1437 EMIT_THREE_BYTES (UTF_8_BOM_1, UTF_8_BOM_2, UTF_8_BOM_3);