Mercurial > vim
diff src/mark.c @ 15636:6f1c7e9a6393 v8.1.0826
patch 8.1.0826: too many #ifdefs
commit https://github.com/vim/vim/commit/29ddebef4038d2d2b3bc9d8d3b0109f4046d6fbf
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 26 17:28:26 2019 +0100
patch 8.1.0826: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_VIRTUALEDIT. Adds about 10Kbyte to the code.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 26 Jan 2019 17:30:15 +0100 |
| parents | dd725a8ab112 |
| children | dd4e6f077874 |
line wrap: on
line diff
--- a/src/mark.c +++ b/src/mark.c @@ -414,9 +414,7 @@ getmark_buf_fnum( pos_copy.col = 0; else pos_copy.col = MAXCOL; -#ifdef FEAT_VIRTUALEDIT pos_copy.coladd = 0; -#endif } } else if (ASCII_ISLOWER(c)) /* normal named mark */ @@ -651,9 +649,7 @@ clrallmarks(buf_T *buf) buf->b_op_end.lnum = 0; buf->b_last_cursor.lnum = 1; /* '" mark cleared */ buf->b_last_cursor.col = 0; -#ifdef FEAT_VIRTUALEDIT buf->b_last_cursor.coladd = 0; -#endif buf->b_last_insert.lnum = 0; /* '^ mark cleared */ buf->b_last_change.lnum = 0; /* '. mark cleared */ #ifdef FEAT_JUMPLIST @@ -1052,7 +1048,7 @@ mark_adjust_internal( linenr_T *lp; win_T *win; tabpage_T *tab; - static pos_T initpos = INIT_POS_T(1, 0, 0); + static pos_T initpos = {1, 0, 0}; if (line2 < line1 && amount_after == 0L) /* nothing to do */ return; @@ -1451,9 +1447,7 @@ read_viminfo_filemark(vir_T *virp, int f fm->fmark.mark.lnum = getdigits(&str); str = skipwhite(str); fm->fmark.mark.col = getdigits(&str); -#ifdef FEAT_VIRTUALEDIT fm->fmark.mark.coladd = 0; -#endif fm->fmark.fnum = 0; str = skipwhite(str); vim_free(fm->fname); @@ -1641,9 +1635,7 @@ handle_viminfo_mark(garray_T *values, in { fm->fmark.mark.lnum = lnum; fm->fmark.mark.col = col; -#ifdef FEAT_VIRTUALEDIT fm->fmark.mark.coladd = 0; -#endif fm->fmark.fnum = 0; vim_free(fm->fname); if (vp[4].bv_allocated) @@ -2146,9 +2138,7 @@ copy_viminfo_marks( } vim_free(str); -#ifdef FEAT_VIRTUALEDIT pos.coladd = 0; -#endif while (!(eof = viminfo_readline(virp)) && line[0] == TAB) { if (load_marks)