mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-13 23:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

api: make nvim_put support "\022{NUM}" regtype as returned by getregtype()

Browse Source
This commit is contained in:
Björn Linse
2019-08-30 20:19:56 +02:00
parent f8b5d6e124
commit dff06a90e4
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/ops.c
View File

@@ -5685,9 +5685,6 @@ end:
/// @param[out] reg Expected to be empty
bool prepare_yankreg_from_object(yankreg_T *reg, String regtype, size_t lines)
{
if (regtype.size > 1) {
return false;
}
char type = regtype.data ? regtype.data[0] : NUL;
switch (type) {
@@ -5707,6 +5704,23 @@ bool prepare_yankreg_from_object(yankreg_T *reg, String regtype, size_t lines)
return false;
}
reg->y_width = 0;
if (regtype.size > 1) {
if (reg->y_type != kMTBlockWise) {
return false;
}
// allow "b7" for a block at least 7 spaces wide
if (!ascii_isdigit(regtype.data[1])) {
return false;
}
const char *p = regtype.data+1;
reg->y_width = getdigits_int((char_u **)&p)-1;
if (regtype.size > (size_t)(p-regtype.data)) {
return false;
}
}
reg->y_array = xcalloc(lines, sizeof(uint8_t *));
reg->y_size = lines;
reg->additional_data = NULL;
@@ -5743,7 +5757,7 @@ void finish_yankreg_from_object(yankreg_T *reg, bool clipboard_adjust)
}
}
assert(maxlen <= INT_MAX);
reg->y_width = (int)maxlen - 1;
reg->y_width = MAX(reg->y_width, (int)maxlen - 1);
}
}