mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 23:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1314: :messages behavior depends on 'fileformat' of current buffer (#22286)

Browse Source 
Problem:    :messages behavior depends on 'fileformat' of current buffer.
Solution:   Pass the buffer pointer to where it is used. (Mirko Ceroni,
            closes vim/vim#11995)

1d87e11a1e

Co-authored-by: cero1988 <mirkoceroni@mirkoceroni.it>
This commit is contained in:
zeertzjq
2023-02-17 07:15:24 +08:00
committed by GitHub
parent 6dfabd0145
commit 0326ef2f41
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvim/charset.c
View File

@@ -547,7 +547,6 @@ char *transchar(int c)
}
char_u *transchar_buf(const buf_T *buf, int c)
FUNC_ATTR_NONNULL_ALL
{
int i = 0;
if (IS_SPECIAL(c)) {
@@ -571,21 +570,34 @@ char_u *transchar_buf(const buf_T *buf, int c)
return transchar_charbuf;
}
/// Like transchar(), but called with a byte instead of a character
/// Like transchar(), but called with a byte instead of a character.
///
/// Checks for an illegal UTF-8 byte.
/// Checks for an illegal UTF-8 byte. Uses 'fileformat' of the current buffer.
///
/// @param[in] c Byte to translate.
///
/// @return pointer to translated character in transchar_charbuf.
char_u *transchar_byte(const int c)
FUNC_ATTR_WARN_UNUSED_RESULT
{
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.
///
/// @param[in] c Byte to translate.
///
/// @return pointer to translated character in transchar_charbuf.
char_u *transchar_byte_buf(const buf_T *buf, const int c)
FUNC_ATTR_WARN_UNUSED_RESULT
{
if (c >= 0x80) {
transchar_nonprint(curbuf, transchar_charbuf, c);
transchar_nonprint(buf, transchar_charbuf, c);
return transchar_charbuf;
}
return (char_u *)transchar(c);
return transchar_buf(buf, c);
}
/// Convert non-printable characters to 2..4 printable ones
@@ -598,12 +610,11 @@ char_u *transchar_byte(const int c)
/// @param[in] c Character to convert. NUL is assumed to be NL according to
/// `:h NL-used-for-NUL`.
void transchar_nonprint(const buf_T *buf, char_u *charbuf, int c)
FUNC_ATTR_NONNULL_ALL
{
if (c == NL) {
// we use newline in place of a NUL
c = NUL;
} else if ((c == CAR) && (get_fileformat(buf) == EOL_MAC)) {
} else if (buf != NULL && c == CAR && get_fileformat(buf) == EOL_MAC) {
// we use CR in place of NL in this case
c = NL;
}