mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

move ins_char

Browse Source
This commit is contained in:
Daniel Hahler
2019-06-10 16:17:47 +02:00
parent dfe8cab0c1
commit aa6aa732e9
2 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/change.c
View File

@@ -502,16 +502,16 @@ void ins_bytes_len(char_u *p, size_t len)
/// convert bytes to a character. /// convert bytes to a character.
void ins_char(int c) void ins_char(int c)
{ {
char_u buf[MB_MAXBYTES + 1]; char_u buf[MB_MAXBYTES + 1];
int n = (*mb_char2bytes)(c, buf); size_t n = (size_t)utf_char2bytes(c, buf);
// When "c" is 0x100, 0x200, etc. we don't want to insert a NUL byte. // When "c" is 0x100, 0x200, etc. we don't want to insert a NUL byte.
// Happens for CTRL-Vu9900. // Happens for CTRL-Vu9900.
if (buf[0] == 0) { if (buf[0] == 0) {
buf[0] = '\n'; buf[0] = '\n';
} }
ins_char_bytes(buf, n); ins_char_bytes(buf, n);
} }
void ins_char_bytes(char_u *buf, size_t charlen) void ins_char_bytes(char_u *buf, size_t charlen)

18
src/nvim/misc1.c
View File

@@ -507,24 +507,6 @@ int plines_m_win(win_T *wp, linenr_T first, linenr_T last)
return count; return count;
} }
/// Insert or replace a single character at the cursor position.
/// When in REPLACE or VREPLACE mode, replace any existing character.
/// Caller must have prepared for undo.
/// For multi-byte characters we get the whole character, the caller must
/// convert bytes to a character.
void ins_char(int c)
{
char_u buf[MB_MAXBYTES + 1];
size_t n = (size_t)utf_char2bytes(c, buf);
// When "c" is 0x100, 0x200, etc. we don't want to insert a NUL byte.
// Happens for CTRL-Vu9900.
if (buf[0] == 0) {
buf[0] = '\n';
}
ins_char_bytes(buf, n);
}
int gchar_pos(pos_T *pos) int gchar_pos(pos_T *pos)
FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(1)
{ {