patch 9.0.1314: :messages behavior depends on 'fileformat' of current buffer
Problem: :messages behavior depends on 'fileformat' of current buffer.
Solution: Pass the buffer pointer to where it is used. (Mirko Ceroni,
closes #11995)
diff --git a/src/charset.c b/src/charset.c
index 3ce95c7..a8c20f9 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -523,20 +523,29 @@
/*
* Like transchar(), but called with a byte instead of a character. Checks
- * for an illegal UTF-8 byte.
+ * for an illegal UTF-8 byte. Uses 'fileformat' of the current buffer.
*/
char_u *
transchar_byte(int c)
{
- if (enc_utf8 && c >= 0x80)
- {
- transchar_nonprint(curbuf, transchar_charbuf, c);
- return transchar_charbuf;
- }
- return transchar(c);
+ return transchar_byte_buf(curbuf, c);
}
/*
+ * Like transchar_buf(), but called with a byte instead of a character. Checks
+ * for an illegal UTF-8 byte. Uses 'fileformat' of "buf", unless it is NULL.
+ */
+ char_u *
+transchar_byte_buf(buf_T *buf, int c)
+{
+ if (enc_utf8 && c >= 0x80)
+ {
+ transchar_nonprint(buf, transchar_charbuf, c);
+ return transchar_charbuf;
+ }
+ return transchar_buf(buf, c);
+}
+/*
* Convert non-printable character to two or more printable characters in
* "charbuf[]". "charbuf" needs to be able to hold five bytes.
* Does NOT work for multi-byte characters, c must be <= 255.
@@ -546,7 +555,7 @@
{
if (c == NL)
c = NUL; // we use newline in place of a NUL
- else if (c == CAR && get_fileformat(buf) == EOL_MAC)
+ else if (buf != NULL && c == CAR && get_fileformat(buf) == EOL_MAC)
c = NL; // we use CR in place of NL in this case
if (dy_flags & DY_UHEX) // 'display' has "uhex"