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

updated for version 7.0186

Browse Source
This commit is contained in:
Bram Moolenaar
2006-01-23 22:30:28 +00:00
parent 09df3127f4
commit 7df351eb8a
10 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ex_cmds2.c
View File

@@ -1608,8 +1608,7 @@ get_arglist(gap, str)
return OK;
}
#if defined(FEAT_QUICKFIX) || (defined(FEAT_SYN_HL) && defined(FEAT_MBYTE)) \
|| defined(PROTO)
#if defined(FEAT_QUICKFIX) || defined(FEAT_SYN_HL) || defined(PROTO)
/*
* Parse a list of arguments (file names), expand them and return in
* "fnames[fcountp]".

2
src/option.c
View File

@@ -6743,7 +6743,7 @@ set_bool_option(opt_idx, varp, value, opt_flags)
{
need_start_insertmode = FALSE;
stop_insert_mode = TRUE;
if (p_smd && restart_edit != 0)
if (p_smd && msg_silent == 0 && restart_edit != 0)
clear_cmdline = TRUE; /* remove "(insert)" */
restart_edit = 0;
}

14
src/popupmenu.c
View File

@@ -240,12 +240,14 @@ pum_set_selected(n)
if (pum_first > pum_selected - 4)
{
/* scroll down; when we did a jump it's probably a PageUp then
* scroll to put the selected entry at the bottom */
* scroll a whole page */
if (pum_first > pum_selected - 2)
{
pum_first = pum_selected - pum_height + 1;
pum_first -= pum_height - 2;
if (pum_first < 0)
pum_first = 0;
else if (pum_first > pum_selected)
pum_first = pum_selected;
}
else
pum_first = pum_selected;
@@ -253,9 +255,13 @@ pum_set_selected(n)
else if (pum_first < pum_selected - pum_height + 5)
{
/* scroll up; when we did a jump it's probably a PageDown then
* scroll to put the selected entry at the top */
* scroll a whole page */
if (pum_first < pum_selected - pum_height + 1 + 2)
pum_first = pum_selected;
{
pum_first += pum_height - 2;
if (pum_first < pum_selected - pum_height + 1)
pum_first = pum_selected - pum_height + 1;
}
else
pum_first = pum_selected - pum_height + 1;
}

4
src/screen.c
View File

@@ -8174,7 +8174,9 @@ showmode()
int sub_attr;
#endif
do_mode = (p_smd && ((State & INSERT) || restart_edit
do_mode = ((p_smd && msg_silent == 0)
&& ((State & INSERT)
|| restart_edit
#ifdef FEAT_VISUAL
|| VIsual_active
#endif

2
src/ui.c
View File

@@ -2757,7 +2757,7 @@ retnomove:
/* if 'selectmode' contains "mouse", start Select mode */
may_start_select('o');
setmouse();
if (p_smd)
if (p_smd && msg_silent == 0)
redraw_cmdline = TRUE; /* show visual mode later */
}
#endif

4
src/version.h
View File

@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Jan 22)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Jan 22, compiled "
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Jan 23)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Jan 23, compiled "