diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-03-16 21:41:35 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-03-16 21:41:35 +0000 |
commit | efd2bf158afeb2337dcb5a62c6198d6d2fb7cd5f (patch) | |
tree | b1eedda1b33b2b2d3901094c20f4b10362ec2b83 /src/misc2.c | |
parent | d3667a2e2971a879194084f4b61b8ff7ff9765a2 (diff) | |
download | vim-git-efd2bf158afeb2337dcb5a62c6198d6d2fb7cd5f.tar.gz |
updated for version 7.0226
Diffstat (limited to 'src/misc2.c')
-rw-r--r-- | src/misc2.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/misc2.c b/src/misc2.c index dece0d968..9c84786a3 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -151,11 +151,15 @@ coladvance2(pos, addspaces, finetune, wcol) int head = 0; #endif - one_more = (State & INSERT) || restart_edit != NUL + one_more = (State & INSERT) + || restart_edit != NUL #ifdef FEAT_VISUAL - || (VIsual_active && *p_sel != 'o') + || (VIsual_active && *p_sel != 'o') #endif - ; +#ifdef FEAT_VIRTUALEDIT + || (ve_flags & VE_ONEMORE) +#endif + ; line = ml_get_curline(); if (wcol >= MAXCOL) @@ -5486,8 +5490,6 @@ qsort(base, elm_count, elm_size, cmp) } #endif -#if defined(FEAT_EX_EXTRA) || defined(FEAT_CMDL_COMPL) \ - || (defined(FEAT_SYN_HL) && defined(FEAT_MBYTE)) || defined(PROTO) /* * Sort an array of strings. */ @@ -5515,7 +5517,6 @@ sort_strings(files, count) { qsort((void *)files, (size_t)count, sizeof(char_u *), sort_compare); } -#endif #if !defined(NO_EXPANDPATH) || defined(PROTO) /* |