Mercurial > vim

comparison src/option.h @ 8643:24b43dd167eb v7.4.1611

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 19 22:11:51 2016 +0100 patch 7.4.1611 Problem: The versplit feature makes the code uneccessary complicated. Solution: Remove FEAT_VERTSPLIT, always support vertical splits when FEAT_WINDOWS is defined.
author Christian Brabandt <cb@256bit.org>
date Sat, 19 Mar 2016 22:15:06 +0100
parents 54ac275e3fc4
children c83e2c1e7f2b
comparison
equal deleted inserted replaced
8642:c7727ca972e3 8643:24b43dd167eb
461 static char *(p_dy_values[]) = {"lastline", "uhex", NULL}; 461 static char *(p_dy_values[]) = {"lastline", "uhex", NULL};
462 #endif 462 #endif
463 #define DY_LASTLINE 0x001 463 #define DY_LASTLINE 0x001
464 #define DY_UHEX 0x002 464 #define DY_UHEX 0x002
465 EXTERN int p_ed; /* 'edcompatible' */ 465 EXTERN int p_ed; /* 'edcompatible' */
466 #ifdef FEAT_VERTSPLIT 466 #ifdef FEAT_WINDOWS
467 EXTERN char_u *p_ead; /* 'eadirection' */ 467 EXTERN char_u *p_ead; /* 'eadirection' */
468 #endif 468 #endif
469 EXTERN int p_ea; /* 'equalalways' */ 469 EXTERN int p_ea; /* 'equalalways' */
470 EXTERN char_u *p_ep; /* 'equalprg' */ 470 EXTERN char_u *p_ep; /* 'equalprg' */
471 EXTERN int p_eb; /* 'errorbells' */ 471 EXTERN int p_eb; /* 'errorbells' */
800 # endif 800 # endif
801 #endif 801 #endif
802 #ifdef FEAT_SPELL 802 #ifdef FEAT_SPELL
803 EXTERN char_u *p_sps; /* 'spellsuggest' */ 803 EXTERN char_u *p_sps; /* 'spellsuggest' */
804 #endif 804 #endif
805 #ifdef FEAT_VERTSPLIT 805 #ifdef FEAT_WINDOWS
806 EXTERN int p_spr; /* 'splitright' */ 806 EXTERN int p_spr; /* 'splitright' */
807 #endif 807 #endif
808 EXTERN int p_sol; /* 'startofline' */ 808 EXTERN int p_sol; /* 'startofline' */
809 EXTERN char_u *p_su; /* 'suffixes' */ 809 EXTERN char_u *p_su; /* 'suffixes' */
810 EXTERN char_u *p_sws; /* 'swapsync' */ 810 EXTERN char_u *p_sws; /* 'swapsync' */
955 EXTERN int p_wmnu; /* 'wildmenu' */ 955 EXTERN int p_wmnu; /* 'wildmenu' */
956 #endif 956 #endif
957 #ifdef FEAT_WINDOWS 957 #ifdef FEAT_WINDOWS
958 EXTERN long p_wh; /* 'winheight' */ 958 EXTERN long p_wh; /* 'winheight' */
959 EXTERN long p_wmh; /* 'winminheight' */ 959 EXTERN long p_wmh; /* 'winminheight' */
960 #endif
961 #ifdef FEAT_VERTSPLIT
962 EXTERN long p_wmw; /* 'winminwidth' */ 960 EXTERN long p_wmw; /* 'winminwidth' */
963 EXTERN long p_wiw; /* 'winwidth' */ 961 EXTERN long p_wiw; /* 'winwidth' */
964 #endif 962 #endif
965 EXTERN int p_ws; /* 'wrapscan' */ 963 EXTERN int p_ws; /* 'wrapscan' */
966 EXTERN int p_write; /* 'write' */ 964 EXTERN int p_write; /* 'write' */
1170 #ifdef FEAT_STL_OPT 1168 #ifdef FEAT_STL_OPT
1171 , WV_STL 1169 , WV_STL
1172 #endif 1170 #endif
1173 #ifdef FEAT_WINDOWS 1171 #ifdef FEAT_WINDOWS
1174 , WV_WFH 1172 , WV_WFH
1175 #endif
1176 #ifdef FEAT_VERTSPLIT
1177 , WV_WFW 1173 , WV_WFW
1178 #endif 1174 #endif
1179 , WV_WRAP 1175 , WV_WRAP
1180 , WV_COUNT /* must be the last one */ 1176 , WV_COUNT /* must be the last one */
1181 }; 1177 };