thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.1.1204: output of :command with address completion is not nice

Browse Source 
Problem:    Output of :command with address completion is not nice.
Solution:   Shorten the address completion names.
This commit is contained in:
Bram Moolenaar 2019-04-25 21:27:58 +02:00
parent 69ea587289
commit a561a41a70
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
runtime/doc/map.txt
View File

@ -1,4 +1,4 @@
*map.txt* For Vim version 8.1. Last change: 2018 Dec 18
*map.txt* For Vim version 8.1. Last change: 2019 Apr 25
VIM REFERENCE MANUAL by Bram Moolenaar
@ -1193,9 +1193,10 @@ scripts.
:com[mand] *:com* *:command*
List all user-defined commands. When listing commands,
the characters in the first two columns are
the characters in the first columns are:
! Command has the -bang attribute
" Command has the -register attribute
| Command has the -bar attribute
b Command is local to current buffer
(see below for details on attributes)
The list can be filtered on command name with
@ -1400,14 +1401,15 @@ It is possible that the special characters in the range like ., $ or % which
by default correspond to the current line, last line and the whole buffer,
relate to arguments, (loaded) buffers, windows or tab pages.
Possible values are:
-addr=lines Range of lines (this is the default)
-addr=arguments Range for arguments
-addr=buffers Range for buffers (also not loaded buffers)
-addr=loaded_buffers Range for loaded buffers
-addr=windows Range for windows
-addr=tabs Range for tab pages
-addr=other other kind of range
Possible values are (second column is the short name used in listing):
-addr=lines Range of lines (this is the default)
-addr=arguments arg Range for arguments
-addr=buffers buf Range for buffers (also not loaded buffers)
-addr=loaded_buffers load Range for loaded buffers
-addr=windows win Range for windows
-addr=tabs tab Range for tab pages
-addr=quickfix qf Range for quickfix entries
-addr=other ? other kind of range
Special cases ~

29
src/ex_docmd.c
View File

@ -5915,17 +5915,18 @@ static struct
{
int expand;
char *name;
char *shortname;
} addr_type_complete[] =
{
{ADDR_ARGUMENTS, "arguments"},
{ADDR_LINES, "lines"},
{ADDR_LOADED_BUFFERS, "loaded_buffers"},
{ADDR_TABS, "tabs"},
{ADDR_BUFFERS, "buffers"},
{ADDR_WINDOWS, "windows"},
{ADDR_QUICKFIX, "quickfix"},
{ADDR_OTHER, "other"},
{-1, NULL}
{ADDR_ARGUMENTS, "arguments", "arg"},
{ADDR_LINES, "lines", "line"},
{ADDR_LOADED_BUFFERS, "loaded_buffers", "load"},
{ADDR_TABS, "tabs", "tab"},
{ADDR_BUFFERS, "buffers", "buf"},
{ADDR_WINDOWS, "windows", "win"},
{ADDR_QUICKFIX, "quickfix", "qf"},
{ADDR_OTHER, "other", "?"},
{-1, NULL, NULL}
};
#endif
@ -6020,7 +6021,7 @@ uc_list(char_u *name, size_t name_len)
/* Put out the title first time */
if (!found)
msg_puts_title(_("\n Name Args Address Complete Definition"));
msg_puts_title(_("\n Name Args Address Complete Definition"));
found = TRUE;
msg_putchar('\n');
if (got_int)
@ -6101,14 +6102,14 @@ uc_list(char_u *name, size_t name_len)
do {
IObuff[len++] = ' ';
} while (len < 9 - over);
} while (len < 8 - over);
// Address Type
for (j = 0; addr_type_complete[j].expand != -1; ++j)
if (addr_type_complete[j].expand != ADDR_LINES
&& addr_type_complete[j].expand == cmd->uc_addr_type)
{
STRCPY(IObuff + len, addr_type_complete[j].name);
STRCPY(IObuff + len, addr_type_complete[j].shortname);
len += (int)STRLEN(IObuff + len);
break;
}
@ -6128,13 +6129,13 @@ uc_list(char_u *name, size_t name_len)
do {
IObuff[len++] = ' ';
} while (len < 24 - over);
} while (len < 25 - over);
IObuff[len] = '\0';
msg_outtrans(IObuff);
msg_outtrans_special(cmd->uc_rep, FALSE,
name_len == 0 ? Columns - 46 : 0);
name_len == 0 ? Columns - 47 : 0);
#ifdef FEAT_EVAL
if (p_verbose > 0)
last_set_msg(cmd->uc_script_ctx);

2
src/version.c
View File

@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1204,
/**/
1203,
/**/