Mercurial > vim
diff src/structs.h @ 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 | 2dcaa860e3fc |
| children | 287104a1d51e |
line wrap: on
line diff
--- a/src/structs.h +++ b/src/structs.h @@ -21,30 +21,23 @@ typedef unsigned short short_u; #endif /* - * position in file or buffer + * Position in file or buffer. */ typedef struct { - linenr_T lnum; /* line number */ - colnr_T col; /* column number */ -#ifdef FEAT_VIRTUALEDIT - colnr_T coladd; -#endif + linenr_T lnum; // line number + colnr_T col; // column number + colnr_T coladd; // extra virtual column } pos_T; -#ifdef FEAT_VIRTUALEDIT -# define INIT_POS_T(l, c, ca) {l, c, ca} -#else -# define INIT_POS_T(l, c, ca) {l, c} -#endif /* * Same, but without coladd. */ typedef struct { - linenr_T lnum; /* line number */ - colnr_T col; /* column number */ + linenr_T lnum; // line number + colnr_T col; // column number } lpos_T; /* @@ -395,9 +388,7 @@ struct u_header u_entry_T *uh_entry; /* pointer to first entry */ u_entry_T *uh_getbot_entry; /* pointer to where ue_bot must be set */ pos_T uh_cursor; /* cursor position before saving */ -#ifdef FEAT_VIRTUALEDIT long uh_cursor_vcol; -#endif int uh_flags; /* see below */ pos_T uh_namedm[NMARKS]; /* marks before undo/after redo */ visualinfo_T uh_visual; /* Visual areas before undo/after redo */