aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

updated for version 7.0074

Browse Source
This commit is contained in:
Bram Moolenaar
2005-05-20 21:25:31 +00:00
parent c1087e64bc
commit 35c54e5651
6 changed files with 124 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/screen.c
View File

@@ -4818,6 +4818,7 @@ draw_vsep_win(wp, row)
#ifdef FEAT_WILDMENU
static int status_match_len __ARGS((expand_T *xp, char_u *s));
static int skip_status_match_char __ARGS((expand_T *xp, char_u *s));
/*
* Get the lenght of an item as it will be shown in the status line.
@@ -4840,12 +4841,7 @@ status_match_len(xp, s)
while (*s != NUL)
{
/* Don't display backslashes used for escaping, they look ugly. */
if (rem_backslash(s)
#ifdef FEAT_MENU
|| (emenu && (s[0] == '\\' && s[1] != NUL))
#endif
)
if (skip_status_match_char(xp, s))
++s;
len += ptr2cells(s);
mb_ptr_adv(s);
@@ -4854,6 +4850,24 @@ status_match_len(xp, s)
return len;
}
/*
* Return TRUE for characters that are not displayed in a status match.
* These are backslashes used for escaping. Do show backslashes in help tags.
*/
static int
skip_status_match_char(xp, s)
expand_T *xp;
char_u *s;
{
return ((rem_backslash(s) && xp->xp_context != EXPAND_HELP)
#ifdef FEAT_MENU
|| ((xp->xp_context == EXPAND_MENUS
|| xp->xp_context == EXPAND_MENUNAMES)
&& (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL)))
#endif
);
}
/*
* Show wildchar matches in the status line.
* Show at least the "match" item.
@@ -4989,13 +5003,7 @@ win_redr_status_matches(xp, num_matches, matches, match, showtail)
#endif
for ( ; *s != NUL; ++s)
{
/* Don't display backslashes used for escaping, they look ugly. */
if (rem_backslash(s)
#ifdef FEAT_MENU
|| (emenu
&& (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL)))
#endif
)
if (skip_status_match_char(xp, s))
++s;
clen += ptr2cells(s);
#ifdef FEAT_MBYTE