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

vim-patch:8.1.2212: cannot see the selection type in :reg output

Browse Source 
Problem:    Cannot see the selection type in :reg output. (Ayberk Aydın)
Solution:   Add c/l/b. (Christian Brabandt, closes vim/vim#5110, closes vim/vim#4546)
3691f1ee72

Patch v8.1.0999 is not ported so ":registers" does not omit register 1.
This commit is contained in:
Jan Edmund Lazo
2020-12-24 23:00:58 -05:00
parent 0813bb021a
commit 8cf4a02bf2
4 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/nvim/ops.c
View File

@@ -3554,15 +3554,21 @@ void ex_display(exarg_T *eap)
int name;
char_u *arg = eap->arg;
int clen;
char_u type[2];
if (arg != NULL && *arg == NUL)
arg = NULL;
int attr = HL_ATTR(HLF_8);
/* Highlight title */
MSG_PUTS_TITLE(_("\n--- Registers ---"));
// Highlight title
msg_puts_title(_("\nType Name Content"));
for (int i = -1; i < NUM_REGISTERS && !got_int; i++) {
name = get_register_name(i);
switch (get_reg_type(name, NULL)) {
case kMTLineWise: type[0] = 'l'; break;
case kMTCharWise: type[0] = 'c'; break;
default: type[0] = 'b'; break;
}
if (arg != NULL && vim_strchr(arg, name) == NULL) {
continue; /* did not ask for this register */
@@ -3587,11 +3593,14 @@ void ex_display(exarg_T *eap)
if (yb->y_array != NULL) {
msg_putchar('\n');
msg_puts(" ");
msg_putchar(type[0]);
msg_puts(" ");
msg_putchar('"');
msg_putchar(name);
MSG_PUTS(" ");
int n = Columns - 6;
int n = Columns - 11;
for (size_t j = 0; j < yb->y_size && n > 1; j++) {
if (j) {
MSG_PUTS_ATTR("^J", attr);
@@ -3616,8 +3625,8 @@ void ex_display(exarg_T *eap)
*/
if ((p = get_last_insert()) != NULL
&& (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) {
MSG_PUTS("\n\". ");
dis_msg(p, TRUE);
msg_puts("\n c \". ");
dis_msg(p, true);
}
/*
@@ -3625,8 +3634,8 @@ void ex_display(exarg_T *eap)
*/
if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL)
&& !got_int) {
MSG_PUTS("\n\": ");
dis_msg(last_cmdline, FALSE);
msg_puts("\n c \": ");
dis_msg(last_cmdline, false);
}
/*
@@ -3634,8 +3643,8 @@ void ex_display(exarg_T *eap)
*/
if (curbuf->b_fname != NULL
&& (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) {
MSG_PUTS("\n\"% ");
dis_msg(curbuf->b_fname, FALSE);
msg_puts("\n c \"% ");
dis_msg(curbuf->b_fname, false);
}
/*
@@ -3646,8 +3655,8 @@ void ex_display(exarg_T *eap)
linenr_T dummy;
if (buflist_name_nr(0, &fname, &dummy) != FAIL) {
MSG_PUTS("\n\"# ");
dis_msg(fname, FALSE);
msg_puts("\n c \"# ");
dis_msg(fname, false);
}
}
@@ -3656,8 +3665,8 @@ void ex_display(exarg_T *eap)
*/
if (last_search_pat() != NULL
&& (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) {
MSG_PUTS("\n\"/ ");
dis_msg(last_search_pat(), FALSE);
msg_puts("\n c \"/ ");
dis_msg(last_search_pat(), false);
}
/*
@@ -3665,8 +3674,8 @@ void ex_display(exarg_T *eap)
*/
if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL)
&& !got_int) {
MSG_PUTS("\n\"= ");
dis_msg(expr_line, FALSE);
msg_puts("\n c \"= ");
dis_msg(expr_line, false);
}
}
@@ -3676,9 +3685,10 @@ void ex_display(exarg_T *eap)
*/
static void
dis_msg(
char_u *p,
int skip_esc /* if TRUE, ignore trailing ESC */
const char_u *p,
bool skip_esc // if true, ignore trailing ESC
)
FUNC_ATTR_NONNULL_ALL
{
int n;
int l;