comparison src/option.h @ 12477:68d7bc045dbe v8.0.1118

patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs commit https://github.com/vim/vim/commit/4033c55eca575777718c0701e26635a0cc47d907 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 16 20:54:51 2017 +0200 patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs Problem: FEAT_WINDOWS adds a lot of #ifdefs while it is nearly always enabled and only adds 7% to the binary size of the tiny build. Solution: Graduate FEAT_WINDOWS.
author Christian Brabandt <cb@256bit.org>
date Sat, 16 Sep 2017 21:00:06 +0200
parents 1ff5e5dfa9b0
children b390f5003e2f
comparison
equal deleted inserted replaced
12476:2516383741e6 12477:68d7bc045dbe
458 #endif 458 #endif
459 #define DY_LASTLINE 0x001 459 #define DY_LASTLINE 0x001
460 #define DY_TRUNCATE 0x002 460 #define DY_TRUNCATE 0x002
461 #define DY_UHEX 0x004 461 #define DY_UHEX 0x004
462 EXTERN int p_ed; /* 'edcompatible' */ 462 EXTERN int p_ed; /* 'edcompatible' */
463 #ifdef FEAT_WINDOWS
464 EXTERN char_u *p_ead; /* 'eadirection' */ 463 EXTERN char_u *p_ead; /* 'eadirection' */
465 #endif
466 EXTERN int p_ea; /* 'equalalways' */ 464 EXTERN int p_ea; /* 'equalalways' */
467 EXTERN char_u *p_ep; /* 'equalprg' */ 465 EXTERN char_u *p_ep; /* 'equalprg' */
468 EXTERN int p_eb; /* 'errorbells' */ 466 EXTERN int p_eb; /* 'errorbells' */
469 #ifdef FEAT_QUICKFIX 467 #ifdef FEAT_QUICKFIX
470 EXTERN char_u *p_ef; /* 'errorfile' */ 468 EXTERN char_u *p_ef; /* 'errorfile' */
549 #if defined(FEAT_GUI_TABLINE) 547 #if defined(FEAT_GUI_TABLINE)
550 EXTERN char_u *p_gtl; /* 'guitablabel' */ 548 EXTERN char_u *p_gtl; /* 'guitablabel' */
551 EXTERN char_u *p_gtt; /* 'guitabtooltip' */ 549 EXTERN char_u *p_gtt; /* 'guitabtooltip' */
552 #endif 550 #endif
553 EXTERN char_u *p_hf; /* 'helpfile' */ 551 EXTERN char_u *p_hf; /* 'helpfile' */
554 #ifdef FEAT_WINDOWS
555 EXTERN long p_hh; /* 'helpheight' */ 552 EXTERN long p_hh; /* 'helpheight' */
556 #endif
557 #ifdef FEAT_MULTI_LANG 553 #ifdef FEAT_MULTI_LANG
558 EXTERN char_u *p_hlg; /* 'helplang' */ 554 EXTERN char_u *p_hlg; /* 'helplang' */
559 #endif 555 #endif
560 EXTERN int p_hid; /* 'hidden' */ 556 EXTERN int p_hid; /* 'hidden' */
561 EXTERN char_u *p_hl; /* 'highlight' */ 557 EXTERN char_u *p_hl; /* 'highlight' */
609 EXTERN long p_linespace; /* 'linespace' */ 605 EXTERN long p_linespace; /* 'linespace' */
610 #endif 606 #endif
611 #ifdef FEAT_LISP 607 #ifdef FEAT_LISP
612 EXTERN char_u *p_lispwords; /* 'lispwords' */ 608 EXTERN char_u *p_lispwords; /* 'lispwords' */
613 #endif 609 #endif
614 #ifdef FEAT_WINDOWS
615 EXTERN long p_ls; /* 'laststatus' */ 610 EXTERN long p_ls; /* 'laststatus' */
616 EXTERN long p_stal; /* 'showtabline' */ 611 EXTERN long p_stal; /* 'showtabline' */
617 #endif
618 EXTERN char_u *p_lcs; /* 'listchars' */ 612 EXTERN char_u *p_lcs; /* 'listchars' */
619 613
620 EXTERN int p_lz; /* 'lazyredraw' */ 614 EXTERN int p_lz; /* 'lazyredraw' */
621 EXTERN int p_lpl; /* 'loadplugins' */ 615 EXTERN int p_lpl; /* 'loadplugins' */
622 #if defined(DYNAMIC_LUA) 616 #if defined(DYNAMIC_LUA)
703 EXTERN long p_re; /* 'regexpengine' */ 697 EXTERN long p_re; /* 'regexpengine' */
704 #ifdef FEAT_RENDER_OPTIONS 698 #ifdef FEAT_RENDER_OPTIONS
705 EXTERN char_u *p_rop; /* 'renderoptions' */ 699 EXTERN char_u *p_rop; /* 'renderoptions' */
706 #endif 700 #endif
707 EXTERN long p_report; /* 'report' */ 701 EXTERN long p_report; /* 'report' */
708 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) 702 #if defined(FEAT_QUICKFIX)
709 EXTERN long p_pvh; /* 'previewheight' */ 703 EXTERN long p_pvh; /* 'previewheight' */
710 #endif 704 #endif
711 #ifdef WIN3264 705 #ifdef WIN3264
712 EXTERN int p_rs; /* 'restorescreen' */ 706 EXTERN int p_rs; /* 'restorescreen' */
713 #endif 707 #endif
793 EXTERN int p_smd; /* 'showmode' */ 787 EXTERN int p_smd; /* 'showmode' */
794 EXTERN long p_ss; /* 'sidescroll' */ 788 EXTERN long p_ss; /* 'sidescroll' */
795 EXTERN long p_siso; /* 'sidescrolloff' */ 789 EXTERN long p_siso; /* 'sidescrolloff' */
796 EXTERN int p_scs; /* 'smartcase' */ 790 EXTERN int p_scs; /* 'smartcase' */
797 EXTERN int p_sta; /* 'smarttab' */ 791 EXTERN int p_sta; /* 'smarttab' */
798 #ifdef FEAT_WINDOWS
799 EXTERN int p_sb; /* 'splitbelow' */ 792 EXTERN int p_sb; /* 'splitbelow' */
800 EXTERN long p_tpm; /* 'tabpagemax' */ 793 EXTERN long p_tpm; /* 'tabpagemax' */
801 # if defined(FEAT_STL_OPT) 794 # if defined(FEAT_STL_OPT)
802 EXTERN char_u *p_tal; /* 'tabline' */ 795 EXTERN char_u *p_tal; /* 'tabline' */
803 # endif 796 # endif
804 #endif
805 #ifdef FEAT_SPELL 797 #ifdef FEAT_SPELL
806 EXTERN char_u *p_sps; /* 'spellsuggest' */ 798 EXTERN char_u *p_sps; /* 'spellsuggest' */
807 #endif 799 #endif
808 #ifdef FEAT_WINDOWS
809 EXTERN int p_spr; /* 'splitright' */ 800 EXTERN int p_spr; /* 'splitright' */
810 #endif
811 EXTERN int p_sol; /* 'startofline' */ 801 EXTERN int p_sol; /* 'startofline' */
812 EXTERN char_u *p_su; /* 'suffixes' */ 802 EXTERN char_u *p_su; /* 'suffixes' */
813 EXTERN char_u *p_sws; /* 'swapsync' */ 803 EXTERN char_u *p_sws; /* 'swapsync' */
814 EXTERN char_u *p_swb; /* 'switchbuf' */ 804 EXTERN char_u *p_swb; /* 'switchbuf' */
815 EXTERN unsigned swb_flags; 805 EXTERN unsigned swb_flags;
909 EXTERN char_u *p_udir; /* 'undodir' */ 899 EXTERN char_u *p_udir; /* 'undodir' */
910 EXTERN long p_ul; /* 'undolevels' */ 900 EXTERN long p_ul; /* 'undolevels' */
911 EXTERN long p_ur; /* 'undoreload' */ 901 EXTERN long p_ur; /* 'undoreload' */
912 EXTERN long p_uc; /* 'updatecount' */ 902 EXTERN long p_uc; /* 'updatecount' */
913 EXTERN long p_ut; /* 'updatetime' */ 903 EXTERN long p_ut; /* 'updatetime' */
914 #if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING)
915 EXTERN char_u *p_fcs; /* 'fillchar' */ 904 EXTERN char_u *p_fcs; /* 'fillchar' */
916 #endif
917 #ifdef FEAT_VIMINFO 905 #ifdef FEAT_VIMINFO
918 EXTERN char_u *p_viminfo; /* 'viminfo' */ 906 EXTERN char_u *p_viminfo; /* 'viminfo' */
919 EXTERN char_u *p_viminfofile; /* 'viminfofile' */ 907 EXTERN char_u *p_viminfofile; /* 'viminfofile' */
920 #endif 908 #endif
921 #ifdef FEAT_SESSION 909 #ifdef FEAT_SESSION
961 EXTERN long p_wic; /* 'wildignorecase' */ 949 EXTERN long p_wic; /* 'wildignorecase' */
962 EXTERN char_u *p_wim; /* 'wildmode' */ 950 EXTERN char_u *p_wim; /* 'wildmode' */
963 #ifdef FEAT_WILDMENU 951 #ifdef FEAT_WILDMENU
964 EXTERN int p_wmnu; /* 'wildmenu' */ 952 EXTERN int p_wmnu; /* 'wildmenu' */
965 #endif 953 #endif
966 #ifdef FEAT_WINDOWS
967 EXTERN long p_wh; /* 'winheight' */ 954 EXTERN long p_wh; /* 'winheight' */
968 EXTERN long p_wmh; /* 'winminheight' */ 955 EXTERN long p_wmh; /* 'winminheight' */
969 EXTERN long p_wmw; /* 'winminwidth' */ 956 EXTERN long p_wmw; /* 'winminwidth' */
970 EXTERN long p_wiw; /* 'winwidth' */ 957 EXTERN long p_wiw; /* 'winwidth' */
971 #endif
972 #if defined(WIN3264) && defined(FEAT_TERMINAL) 958 #if defined(WIN3264) && defined(FEAT_TERMINAL)
973 EXTERN char_u *p_winptydll; /* 'winptydll' */ 959 EXTERN char_u *p_winptydll; /* 'winptydll' */
974 #endif 960 #endif
975 EXTERN int p_ws; /* 'wrapscan' */ 961 EXTERN int p_ws; /* 'wrapscan' */
976 EXTERN int p_write; /* 'write' */ 962 EXTERN int p_write; /* 'write' */
1162 , WV_NU 1148 , WV_NU
1163 , WV_RNU 1149 , WV_RNU
1164 #ifdef FEAT_LINEBREAK 1150 #ifdef FEAT_LINEBREAK
1165 , WV_NUW 1151 , WV_NUW
1166 #endif 1152 #endif
1167 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) 1153 #if defined(FEAT_QUICKFIX)
1168 , WV_PVW 1154 , WV_PVW
1169 #endif 1155 #endif
1170 #ifdef FEAT_RIGHTLEFT 1156 #ifdef FEAT_RIGHTLEFT
1171 , WV_RL 1157 , WV_RL
1172 , WV_RLC 1158 , WV_RLC
1184 , WV_CC 1170 , WV_CC
1185 #endif 1171 #endif
1186 #ifdef FEAT_STL_OPT 1172 #ifdef FEAT_STL_OPT
1187 , WV_STL 1173 , WV_STL
1188 #endif 1174 #endif
1189 #ifdef FEAT_WINDOWS
1190 , WV_WFH 1175 , WV_WFH
1191 , WV_WFW 1176 , WV_WFW
1192 #endif
1193 , WV_WRAP 1177 , WV_WRAP
1194 #ifdef FEAT_SIGNS 1178 #ifdef FEAT_SIGNS
1195 , WV_SCL 1179 , WV_SCL
1196 #endif 1180 #endif
1197 , WV_COUNT /* must be the last one */ 1181 , WV_COUNT /* must be the last one */