forked from aniani/vim
patch 9.0.0700: there is no real need for a "big" build
Problem: There is no real need for a "big" build. Solution: Move common features to "normal" build, less often used features to the "huge" build. (Martin Tournoij, closes #11283)
This commit is contained in:
committed by
Bram Moolenaar
parent
bf499c0e6f
commit
25f3a146a0
@@ -332,8 +332,8 @@ g8 Print the hex values of the bytes used in the
|
||||
*+feature-list*
|
||||
*+acl* |ACL| support included
|
||||
*+ARP* Amiga only: ARP support included
|
||||
B *+arabic* |Arabic| language support
|
||||
B *+autochdir* support 'autochdir' option
|
||||
H *+arabic* |Arabic| language support
|
||||
N *+autochdir* support 'autochdir' option
|
||||
T *+autocmd* |:autocmd|, automatic commands. Always enabled since
|
||||
8.0.1564
|
||||
H *+autoservername* Automatically enable |clientserver|
|
||||
@@ -358,9 +358,9 @@ T *+cmdline_hist* command line history |cmdline-history|
|
||||
N *+cmdline_info* |'showcmd'| and |'ruler'|
|
||||
T *+cmdwin* |cmdline-window| support; Always enabled since 9.0.0657
|
||||
T *+comments* |'comments'| support
|
||||
B *+conceal* "conceal" support, see |conceal| |:syn-conceal| etc.
|
||||
N *+conceal* "conceal" support, see |conceal| |:syn-conceal| etc.
|
||||
N *+cryptv* encryption support |encryption|
|
||||
B *+cscope* |cscope| support
|
||||
H *+cscope* |cscope| support
|
||||
T *+cursorbind* |'cursorbind'| support
|
||||
m *+cursorshape* |termcap-cursor-shape| support
|
||||
m *+debug* Compiled for debugging.
|
||||
@@ -371,7 +371,7 @@ N *+diff* |vimdiff| and 'diff'
|
||||
N *+digraphs* |digraphs| *E196*
|
||||
*+directx* Win32 GUI only: DirectX and |'renderoptions'|
|
||||
*+dnd* Support for DnD into the "~ register |quote_~|.
|
||||
B *+emacs_tags* |emacs-tags| files
|
||||
H *+emacs_tags* |emacs-tags| files
|
||||
N *+eval* expression evaluation |eval.txt|
|
||||
T *+ex_extra* always on now, used to be for Vim's extra Ex commands
|
||||
N *+extra_search* |'hlsearch'| and |'incsearch'| options.
|
||||
@@ -397,12 +397,12 @@ T *+insert_expand* |insert_expand| Insert mode completion
|
||||
m *+ipv6* Support for IPv6 networking |channel|
|
||||
m *+job* starting and stopping jobs |job|
|
||||
T *+jumplist* |jumplist|; Always enabled since 8.2.3795
|
||||
B *+keymap* |'keymap'|
|
||||
H *+keymap* |'keymap'|
|
||||
N *+lambda* |lambda| and |closure|
|
||||
B *+langmap* |'langmap'|
|
||||
H *+langmap* |'langmap'|
|
||||
N *+libcall* |libcall()|
|
||||
N *+linebreak* |'linebreak'|, |'breakat'| and |'showbreak'|
|
||||
t *+lispindent* |'lisp'|
|
||||
T *+lispindent* |'lisp'|
|
||||
T *+listcmds* Vim commands for the list of buffers |buffer-hidden|
|
||||
and argument list |:argdelete|
|
||||
T *+localmap* Support for mappings local to a buffer |:map-local|
|
||||
@@ -413,16 +413,16 @@ N *+mksession* |:mksession|
|
||||
T *+modify_fname* |filename-modifiers|
|
||||
T *+mouse* Mouse handling |mouse-using|
|
||||
N *+mouseshape* |'mouseshape'|
|
||||
B *+mouse_dec* Unix only: Dec terminal mouse handling |dec-mouse|
|
||||
N *+mouse_dec* Unix only: Dec terminal mouse handling |dec-mouse|
|
||||
N *+mouse_gpm* Unix only: Linux console mouse handling |gpm-mouse|
|
||||
m *+mouse_gpm/dyn* Same as |+mouse_gpm| with optional library dependency
|
||||
|/dyn|
|
||||
N *+mouse_jsbterm* JSB mouse handling |jsbterm-mouse|
|
||||
B *+mouse_netterm* Unix only: netterm mouse handling |netterm-mouse|
|
||||
N *+mouse_netterm* Unix only: netterm mouse handling |netterm-mouse|
|
||||
N *+mouse_pterm* QNX only: pterm mouse handling |qnx-terminal|
|
||||
N *+mouse_sysmouse* Unix only: *BSD console mouse handling |sysmouse|
|
||||
B *+mouse_sgr* Unix only: sgr mouse handling |sgr-mouse|
|
||||
B *+mouse_urxvt* Unix only: urxvt mouse handling |urxvt-mouse|
|
||||
N *+mouse_sgr* Unix only: sgr mouse handling |sgr-mouse|
|
||||
N *+mouse_urxvt* Unix only: urxvt mouse handling |urxvt-mouse|
|
||||
N *+mouse_xterm* Unix only: xterm mouse handling |xterm-mouse|
|
||||
T *+multi_byte* Unicode support, 16 and 32 bit characters |multibyte|
|
||||
*+multi_byte_ime* Win32 input method for multibyte chars |multibyte-ime|
|
||||
@@ -451,14 +451,14 @@ m *+python3/dyn* Python 3 interface |python-dynamic| |/dyn|
|
||||
N *+quickfix* |:make| and |quickfix| commands
|
||||
N *+reltime* |reltime()| function, 'hlsearch'/'incsearch' timeout,
|
||||
'redrawtime' option
|
||||
B *+rightleft* Right to left typing |'rightleft'|
|
||||
H *+rightleft* Right to left typing |'rightleft'|
|
||||
m *+ruby* Ruby interface |ruby|
|
||||
m *+ruby/dyn* Ruby interface |ruby-dynamic| |/dyn|
|
||||
T *+scrollbind* |'scrollbind'|
|
||||
B *+signs* |:sign|
|
||||
t *+smartindent* |'smartindent'|
|
||||
B *+sodium* compiled with libsodium for better encryption support
|
||||
B *+sound* |sound_playevent()|, |sound_playfile()| functions, etc.
|
||||
N *+signs* |:sign|
|
||||
T *+smartindent* |'smartindent'|
|
||||
H *+sodium* compiled with libsodium for better encryption support
|
||||
H *+sound* |sound_playevent()|, |sound_playfile()| functions, etc.
|
||||
N *+spell* spell checking support, see |spell|
|
||||
N *+startuptime* |--startuptime| argument
|
||||
N *+statusline* Options 'statusline', 'rulerformat' and special
|
||||
@@ -474,7 +474,7 @@ m *+tcl/dyn* Tcl interface |tcl-dynamic| |/dyn|
|
||||
m *+terminal* Support for terminal window |terminal|
|
||||
*+terminfo* uses |terminfo| instead of termcap
|
||||
N *+termresponse* support for |t_RV| and |v:termresponse|
|
||||
B *+termguicolors* 24-bit color in xterm-compatible terminals support
|
||||
N *+termguicolors* 24-bit color in xterm-compatible terminals support
|
||||
T *+textobjects* |text-objects| selection. Always enabled since 9.0.0222.
|
||||
N *+textprop* |text-properties|
|
||||
*+tgetent* non-Unix only: able to use external termcap
|
||||
@@ -483,7 +483,7 @@ T *+title* Setting the window 'title' and 'icon'; Always enabled
|
||||
N *+toolbar* |gui-toolbar|
|
||||
T *+user_commands* User-defined commands. |user-commands|
|
||||
Always enabled since 8.1.1210.
|
||||
B *+vartabs* Variable-width tabstops. |'vartabstop'|
|
||||
H *+vartabs* Variable-width tabstops. |'vartabstop'|
|
||||
T *+vertsplit* Vertically split windows |:vsplit|; Always enabled
|
||||
since 8.0.1118.
|
||||
T *+vim9script* |Vim9| script
|
||||
|
@@ -178,14 +178,6 @@ There used to be a KDE version of Vim, using Qt libraries, but since it didn't
|
||||
work very well and there was no maintainer it was dropped.
|
||||
|
||||
|
||||
Unix: COMPILING WITH MULTI-BYTE
|
||||
|
||||
When you want to compile with the multi-byte features enabled, make sure you
|
||||
compile on a machine where the locale settings actually work, otherwise the
|
||||
configure tests may fail. You need to compile with "big" features:
|
||||
|
||||
./configure --with-features=big
|
||||
|
||||
Unix: COMPILING ON LINUX
|
||||
|
||||
On Linux, when using -g to compile (which is default for gcc), the executable
|
||||
|
@@ -79,11 +79,10 @@ from CVS mirror ftp://ftp.polarhome.com/pub/cvs/SOURCE/
|
||||
Description : Build model selection
|
||||
Options: : TINY - No optional features enabled
|
||||
NORMAL - A default selection of features enabled
|
||||
BIG - Many features enabled, as rich as possible.
|
||||
(OpenVMS default)
|
||||
HUGE - All possible features enabled.
|
||||
Uncommented - will default to BIG
|
||||
Default : MODEL = BIG
|
||||
Uncommented - will default to NORMAL
|
||||
Default : MODEL = NORMAL
|
||||
|
||||
Parameter name : GUI
|
||||
Description : GUI or terminal mode executable
|
||||
|
@@ -29,14 +29,6 @@ CFLAGS += \
|
||||
-DFEAT_HUGE
|
||||
else
|
||||
|
||||
# Vim 'big' build
|
||||
ifeq ($(BUILD),big)
|
||||
CFLAGS += \
|
||||
-DFEAT_BROWSE \
|
||||
-DFEAT_MOUSE \
|
||||
-DFEAT_BIG
|
||||
else
|
||||
|
||||
# Vim 'normal' build
|
||||
ifeq ($(BUILD),normal)
|
||||
CFLAGS +=\
|
||||
|
@@ -28,7 +28,7 @@
|
||||
# Updated 2014 Oct 13.
|
||||
|
||||
#>>>>> choose options:
|
||||
# FEATURES=[TINY | NORMAL | BIG | HUGE]
|
||||
# FEATURES=[TINY | NORMAL | HUGE]
|
||||
# Set to TINY to make a minimal version (no optional features).
|
||||
FEATURES=HUGE
|
||||
|
||||
@@ -113,7 +113,7 @@ TERMINAL=no
|
||||
endif
|
||||
|
||||
# Set to yes to enable sound support.
|
||||
ifneq ($(findstring $(FEATURES),BIG HUGE),)
|
||||
ifneq ($(findstring $(FEATURES),HUGE),)
|
||||
SOUND=yes
|
||||
else
|
||||
SOUND=no
|
||||
|
@@ -16,7 +16,7 @@
|
||||
#
|
||||
# !!!! After changing any features do "nmake clean" first !!!!
|
||||
#
|
||||
# Feature Set: FEATURES=[TINY, NORMAL, BIG, HUGE] (default is HUGE)
|
||||
# Feature Set: FEATURES=[TINY, NORMAL, HUGE] (default is HUGE)
|
||||
#
|
||||
# Name to add to the version: MODIFIED_BY=[name of modifier]
|
||||
#
|
||||
@@ -354,7 +354,7 @@ TERM_DEPS = \
|
||||
!endif
|
||||
|
||||
!ifndef SOUND
|
||||
! if "$(FEATURES)"=="HUGE" || "$(FEATURES)"=="BIG"
|
||||
! if "$(FEATURES)"=="HUGE"
|
||||
SOUND = yes
|
||||
! else
|
||||
SOUND = no
|
||||
@@ -1124,7 +1124,7 @@ CFLAGS = $(CFLAGS) -DMSWINPS
|
||||
!endif # POSTSCRIPT
|
||||
|
||||
#
|
||||
# FEATURES: TINY, NORMAL, BIG or HUGE
|
||||
# FEATURES: TINY, NORMAL, or HUGE
|
||||
#
|
||||
CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES)
|
||||
|
||||
|
@@ -29,7 +29,6 @@ DECC = YES
|
||||
# Build model selection
|
||||
# TINY - No optional features enabled
|
||||
# NORMAL - A default selection of features enabled
|
||||
# BIG - Many features enabled, as rich as possible. (default)
|
||||
# HUGE - All possible features enabled.
|
||||
# Please select one of these alternatives above.
|
||||
MODEL = HUGE
|
||||
|
@@ -453,7 +453,6 @@ CClink = $(CC)
|
||||
# Uncomment this when you want to include the Tcl interface.
|
||||
# First one is for static linking, second one for dynamic loading.
|
||||
# Debian package is "tcl-dev".
|
||||
# This requires at least "normal" features, "tiny" doesn't work.
|
||||
#CONF_OPT_TCL = --enable-tclinterp
|
||||
#CONF_OPT_TCL = --enable-tclinterp=dynamic
|
||||
#CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4
|
||||
@@ -482,7 +481,7 @@ CClink = $(CC)
|
||||
# MULTIBYTE - To edit multi-byte characters.
|
||||
# This is now always enabled.
|
||||
|
||||
# When building with at least "big" features, right-left and Arabic
|
||||
# When building with "huge" features, right-left and Arabic
|
||||
# features are enabled. Use this to disable them.
|
||||
#CONF_OPT_MULTIBYTE = --disable-rightleft --disable-arabic
|
||||
|
||||
@@ -518,7 +517,7 @@ CClink = $(CC)
|
||||
# though you have /dev/sysmouse and includes.
|
||||
#CONF_OPT_SYSMOUSE = --disable-sysmouse
|
||||
|
||||
# libcanberra - For sound support. Default is on for big features.
|
||||
# libcanberra - For sound support. Default is on for huge features.
|
||||
# Uncomment one of the two to chose otherwise.
|
||||
# CONF_OPT_CANBERRA = --enable-canberra
|
||||
# CONF_OPT_CANBERRA = --disable-canberra
|
||||
@@ -532,7 +531,6 @@ CClink = $(CC)
|
||||
# The default is "huge" for most systems.
|
||||
#CONF_OPT_FEAT = --with-features=tiny
|
||||
#CONF_OPT_FEAT = --with-features=normal
|
||||
#CONF_OPT_FEAT = --with-features=big
|
||||
#CONF_OPT_FEAT = --with-features=huge
|
||||
|
||||
# COMPILED BY - For including a specific e-mail address for ":version".
|
||||
|
10
src/auto/configure
vendored
10
src/auto/configure
vendored
@@ -1523,7 +1523,7 @@ Optional Packages:
|
||||
--with-view-name=NAME what to call the View executable
|
||||
--with-global-runtime=DIR global runtime directory in 'runtimepath', comma-separated for multiple directories
|
||||
--with-modified-by=NAME name of who modified a release version
|
||||
--with-features=TYPE tiny, normal, big or huge (default: huge)
|
||||
--with-features=TYPE tiny, normal or huge (default: huge)
|
||||
--with-compiledby=NAME name to show in :version message
|
||||
--with-lua-prefix=PFX Prefix where Lua is installed.
|
||||
--with-luajit Link with LuaJIT instead of Lua.
|
||||
@@ -5221,6 +5221,7 @@ fi
|
||||
|
||||
case "$features" in
|
||||
small) features="tiny" ;;
|
||||
big) features="normal" ;;
|
||||
esac
|
||||
|
||||
dovimdiff=""
|
||||
@@ -5229,9 +5230,6 @@ case "$features" in
|
||||
tiny) $as_echo "#define FEAT_TINY 1" >>confdefs.h
|
||||
;;
|
||||
normal) $as_echo "#define FEAT_NORMAL 1" >>confdefs.h
|
||||
dovimdiff="installvimdiff";
|
||||
dogvimdiff="installgvimdiff" ;;
|
||||
big) $as_echo "#define FEAT_BIG 1" >>confdefs.h
|
||||
dovimdiff="installvimdiff";
|
||||
dogvimdiff="installgvimdiff" ;;
|
||||
huge) $as_echo "#define FEAT_HUGE 1" >>confdefs.h
|
||||
@@ -12883,7 +12881,7 @@ fi
|
||||
|
||||
|
||||
if test "$enable_canberra" = "maybe"; then
|
||||
if test "$features" = "big" -o "$features" = "huge"; then
|
||||
if test "$features" = "huge"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5
|
||||
$as_echo "Defaulting to yes" >&6; }
|
||||
enable_canberra="yes"
|
||||
@@ -12957,7 +12955,7 @@ fi
|
||||
|
||||
|
||||
if test "$enable_libsodium" = "maybe"; then
|
||||
if test "$features" = "big" -o "$features" = "huge"; then
|
||||
if test "$features" = "huge"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5
|
||||
$as_echo "Defaulting to yes" >&6; }
|
||||
enable_libsodium="yes"
|
||||
|
@@ -322,9 +322,6 @@
|
||||
/* Define if you want normal features. */
|
||||
#undef FEAT_NORMAL
|
||||
|
||||
/* Define if you want big features. */
|
||||
#undef FEAT_BIG
|
||||
|
||||
/* Define if you want huge features. */
|
||||
#undef FEAT_HUGE
|
||||
|
||||
|
@@ -522,13 +522,15 @@ fi
|
||||
dnl Check user requested features.
|
||||
|
||||
AC_MSG_CHECKING(--with-features argument)
|
||||
AC_ARG_WITH(features, [ --with-features=TYPE tiny, normal, big or huge (default: huge)],
|
||||
AC_ARG_WITH(features, [ --with-features=TYPE tiny, normal or huge (default: huge)],
|
||||
features="$withval"; AC_MSG_RESULT($features),
|
||||
features="huge"; AC_MSG_RESULT(Defaulting to huge))
|
||||
|
||||
dnl "small" is supported for backwards compatibility, now an alias for "tiny"
|
||||
dnl "big" is supported for backwards compatibility, now an alias for "normal"
|
||||
case "$features" in
|
||||
small) features="tiny" ;;
|
||||
big) features="normal" ;;
|
||||
esac
|
||||
|
||||
dovimdiff=""
|
||||
@@ -537,8 +539,6 @@ case "$features" in
|
||||
tiny) AC_DEFINE(FEAT_TINY) ;;
|
||||
normal) AC_DEFINE(FEAT_NORMAL) dovimdiff="installvimdiff";
|
||||
dogvimdiff="installgvimdiff" ;;
|
||||
big) AC_DEFINE(FEAT_BIG) dovimdiff="installvimdiff";
|
||||
dogvimdiff="installgvimdiff" ;;
|
||||
huge) AC_DEFINE(FEAT_HUGE) dovimdiff="installvimdiff";
|
||||
dogvimdiff="installgvimdiff" ;;
|
||||
*) AC_MSG_RESULT([Sorry, $features is not supported]) ;;
|
||||
@@ -2266,7 +2266,7 @@ if test "$enable_multibyte" != "yes"; then
|
||||
a problem with this, discuss on the Vim mailing list.])
|
||||
fi
|
||||
|
||||
dnl Right-to-Left language support for Vim will be included with big features,
|
||||
dnl Right-to-Left language support for Vim will be included with huge features,
|
||||
dnl unless ENABLE_RIGHTLEFT is undefined.
|
||||
AC_MSG_CHECKING(--disable-rightleft argument)
|
||||
AC_ARG_ENABLE(rightleft,
|
||||
@@ -2279,7 +2279,7 @@ else
|
||||
AC_DEFINE(DISABLE_RIGHTLEFT)
|
||||
fi
|
||||
|
||||
dnl Arabic language support for Vim will be included with big features,
|
||||
dnl Arabic language support for Vim will be included with huge features,
|
||||
dnl unless ENABLE_ARABIC is undefined.
|
||||
AC_MSG_CHECKING(--disable-arabic argument)
|
||||
AC_ARG_ENABLE(arabic,
|
||||
@@ -3717,7 +3717,7 @@ AC_ARG_ENABLE(canberra,
|
||||
, [enable_canberra="maybe"])
|
||||
|
||||
if test "$enable_canberra" = "maybe"; then
|
||||
if test "$features" = "big" -o "$features" = "huge"; then
|
||||
if test "$features" = "huge"; then
|
||||
AC_MSG_RESULT(Defaulting to yes)
|
||||
enable_canberra="yes"
|
||||
else
|
||||
@@ -3763,7 +3763,7 @@ AC_ARG_ENABLE(libsodium,
|
||||
, [enable_libsodium="maybe"])
|
||||
|
||||
if test "$enable_libsodium" = "maybe"; then
|
||||
if test "$features" = "big" -o "$features" = "huge"; then
|
||||
if test "$features" = "huge"; then
|
||||
AC_MSG_RESULT(Defaulting to yes)
|
||||
enable_libsodium="yes"
|
||||
else
|
||||
|
@@ -33,10 +33,9 @@
|
||||
*
|
||||
* +tiny no optional features enabled, not even +eval
|
||||
* +normal a default selection of features enabled
|
||||
* +big many features enabled, except "expensive" ones
|
||||
* +huge all possible features enabled.
|
||||
*
|
||||
* When +normal is used, +tiny is also included. +big implies +normal, etc.
|
||||
* When +normal is used, +tiny is also included. +huge implies +normal, etc.
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -49,44 +48,43 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* +big is now an alias for +normal
|
||||
*/
|
||||
#if defined(FEAT_BIG)
|
||||
# undef FEAT_BIG
|
||||
# if !defined(FEAT_NORMAL)
|
||||
# define FEAT_NORMAL
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Uncomment one of these to override the default. For unix use a configure
|
||||
* argument, see Makefile.
|
||||
*/
|
||||
#if !defined(FEAT_TINY) && !defined(FEAT_NORMAL) \
|
||||
&& !defined(FEAT_BIG) && !defined(FEAT_HUGE)
|
||||
#if !defined(FEAT_TINY) && !defined(FEAT_NORMAL) && !defined(FEAT_HUGE)
|
||||
// #define FEAT_TINY
|
||||
// #define FEAT_NORMAL
|
||||
// #define FEAT_BIG
|
||||
// #define FEAT_HUGE
|
||||
#endif
|
||||
|
||||
/*
|
||||
* For Unix, Mac and Win32 use +huge by default. These days CPUs are fast and
|
||||
* Memory is cheap.
|
||||
* Use +big for older systems: VMS and Amiga.
|
||||
* Otherwise use +normal
|
||||
*/
|
||||
#if !defined(FEAT_TINY) && !defined(FEAT_NORMAL) \
|
||||
&& !defined(FEAT_BIG) && !defined(FEAT_HUGE)
|
||||
#if !defined(FEAT_TINY) && !defined(FEAT_NORMAL) && !defined(FEAT_HUGE)
|
||||
# if defined(UNIX) || defined(MSWIN) || defined(MACOS_X)
|
||||
# define FEAT_HUGE
|
||||
# else
|
||||
# if defined(VMS) || defined(AMIGA)
|
||||
# define FEAT_BIG
|
||||
# else
|
||||
# define FEAT_NORMAL
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Each feature implies including the "smaller" ones.
|
||||
*/
|
||||
#ifdef FEAT_HUGE
|
||||
# define FEAT_BIG
|
||||
#endif
|
||||
#ifdef FEAT_BIG
|
||||
# define FEAT_NORMAL
|
||||
#endif
|
||||
#ifdef FEAT_NORMAL
|
||||
@@ -164,7 +162,7 @@
|
||||
* keyboard in a special language mode, e.g. for typing
|
||||
* greek.
|
||||
*/
|
||||
#ifdef FEAT_BIG
|
||||
#ifdef FEAT_HUGE
|
||||
# define FEAT_LANGMAP
|
||||
#endif
|
||||
|
||||
@@ -172,7 +170,7 @@
|
||||
* +keymap 'keymap' option. Allows you to map typed keys in
|
||||
* Insert mode for a special language.
|
||||
*/
|
||||
#ifdef FEAT_BIG
|
||||
#ifdef FEAT_HUGE
|
||||
# define FEAT_KEYMAP
|
||||
#endif
|
||||
|
||||
@@ -219,7 +217,7 @@
|
||||
/*
|
||||
* +rightleft Right-to-left editing/typing support.
|
||||
*/
|
||||
#if defined(FEAT_BIG) && !defined(DISABLE_RIGHTLEFT)
|
||||
#if defined(FEAT_HUGE) && !defined(DISABLE_RIGHTLEFT)
|
||||
# define FEAT_RIGHTLEFT
|
||||
#endif
|
||||
|
||||
@@ -227,7 +225,7 @@
|
||||
* +arabic Arabic keymap and shaping support.
|
||||
* Requires FEAT_RIGHTLEFT
|
||||
*/
|
||||
#if defined(FEAT_BIG) && !defined(DISABLE_ARABIC)
|
||||
#if defined(FEAT_HUGE) && !defined(DISABLE_ARABIC)
|
||||
# define FEAT_ARABIC
|
||||
#endif
|
||||
#ifdef FEAT_ARABIC
|
||||
@@ -252,14 +250,14 @@
|
||||
* +emacs_tags When FEAT_EMACS_TAGS defined: Include support for
|
||||
* emacs style TAGS file.
|
||||
*/
|
||||
#ifdef FEAT_BIG
|
||||
#ifdef FEAT_HUGE
|
||||
# define FEAT_EMACS_TAGS
|
||||
#endif
|
||||
|
||||
/*
|
||||
* +cscope Unix only: Cscope support.
|
||||
*/
|
||||
#if defined(UNIX) && defined(FEAT_BIG) && !defined(FEAT_CSCOPE) && !defined(MACOS_X)
|
||||
#if defined(UNIX) && defined(FEAT_HUGE) && !defined(FEAT_CSCOPE) && !defined(MACOS_X)
|
||||
# define FEAT_CSCOPE
|
||||
#endif
|
||||
|
||||
@@ -374,7 +372,7 @@
|
||||
* +conceal 'conceal' option. Depends on syntax highlighting
|
||||
* as this is how the concealed text is defined.
|
||||
*/
|
||||
#if defined(FEAT_BIG) && defined(FEAT_SYN_HL)
|
||||
#if defined(FEAT_NORMAL) && defined(FEAT_SYN_HL)
|
||||
# define FEAT_CONCEAL
|
||||
#endif
|
||||
|
||||
@@ -395,7 +393,7 @@
|
||||
/*
|
||||
* libsodium - add cryptography support
|
||||
*/
|
||||
#if defined(HAVE_SODIUM) && defined(FEAT_BIG)
|
||||
#if defined(HAVE_SODIUM) && defined(FEAT_HUGE)
|
||||
# define FEAT_SODIUM
|
||||
#endif
|
||||
|
||||
@@ -428,7 +426,7 @@
|
||||
// #define FEAT_MBYTE_IME
|
||||
#endif
|
||||
|
||||
#if defined(FEAT_BIG) && defined(FEAT_GUI_HAIKU) && !defined(FEAT_MBYTE_IME)
|
||||
#if defined(FEAT_HUGE) && defined(FEAT_GUI_HAIKU) && !defined(FEAT_MBYTE_IME)
|
||||
# define FEAT_MBYTE_IME
|
||||
#endif
|
||||
|
||||
@@ -606,14 +604,14 @@
|
||||
/*
|
||||
* +termguicolors 'termguicolors' option.
|
||||
*/
|
||||
#if (defined(FEAT_BIG) && defined(FEAT_SYN_HL)) && !defined(ALWAYS_USE_GUI)
|
||||
#if (defined(FEAT_NORMAL) && defined(FEAT_SYN_HL)) && !defined(ALWAYS_USE_GUI)
|
||||
# define FEAT_TERMGUICOLORS
|
||||
#endif
|
||||
|
||||
/*
|
||||
* +vartabs 'vartabstop' and 'varsofttabstop' options.
|
||||
*/
|
||||
#ifdef FEAT_BIG
|
||||
#ifdef FEAT_HUGE
|
||||
# define FEAT_VARTABS
|
||||
#endif
|
||||
|
||||
@@ -854,13 +852,9 @@
|
||||
// Amiga console has no mouse support
|
||||
#if defined(UNIX) || defined(VMS)
|
||||
# define FEAT_MOUSE_XTERM
|
||||
# ifdef FEAT_BIG
|
||||
# ifdef FEAT_NORMAL
|
||||
# define FEAT_MOUSE_NET
|
||||
# endif
|
||||
# ifdef FEAT_BIG
|
||||
# define FEAT_MOUSE_DEC
|
||||
# endif
|
||||
# ifdef FEAT_BIG
|
||||
# define FEAT_MOUSE_URXVT
|
||||
# endif
|
||||
#endif
|
||||
@@ -1091,7 +1085,7 @@
|
||||
* +signs Allow signs to be displayed to the left of text lines.
|
||||
* Adds the ":sign" command.
|
||||
*/
|
||||
#if defined(FEAT_BIG) || defined(FEAT_NETBEANS_INTG) || defined(FEAT_PROP_POPUP)
|
||||
#if defined(FEAT_NORMAL) || defined(FEAT_NETBEANS_INTG) || defined(FEAT_PROP_POPUP)
|
||||
# define FEAT_SIGNS
|
||||
# if (defined(FEAT_GUI_MOTIF) && defined(HAVE_X11_XPM_H)) \
|
||||
|| defined(FEAT_GUI_GTK) \
|
||||
@@ -1149,7 +1143,7 @@
|
||||
/*
|
||||
* +autochdir 'autochdir' option.
|
||||
*/
|
||||
#if defined(FEAT_NETBEANS_INTG) || defined(FEAT_BIG)
|
||||
#if defined(FEAT_NETBEANS_INTG) || defined(FEAT_NORMAL)
|
||||
# define FEAT_AUTOCHDIR
|
||||
#endif
|
||||
|
||||
|
@@ -228,8 +228,7 @@ func Test_multibyte_chars()
|
||||
" When there is no match use only the first two items.
|
||||
let tl = []
|
||||
|
||||
" Multi-byte character tests. These will fail unless vim is compiled
|
||||
" with Multibyte (FEAT_MBYTE) or BIG/HUGE features.
|
||||
" Multi-byte character tests.
|
||||
call add(tl, [2, '[[:alpha:][=a=]]\+', '879 aiaãâaiuvna ', 'aiaãâaiuvna'])
|
||||
call add(tl, [2, '[[=a=]]\+', 'ddaãâbcd', 'aãâ']) " equivalence classes
|
||||
call add(tl, [2, '[^ม ]\+', 'มม oijasoifjos ifjoisj f osij j มมมมม abcd', 'oijasoifjos'])
|
||||
|
@@ -699,6 +699,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
700,
|
||||
/**/
|
||||
699,
|
||||
/**/
|
||||
@@ -2419,8 +2421,6 @@ list_version(void)
|
||||
|
||||
#if defined(FEAT_HUGE)
|
||||
msg_puts(_("\nHuge version "));
|
||||
#elif defined(FEAT_BIG)
|
||||
msg_puts(_("\nBig version "));
|
||||
#elif defined(FEAT_NORMAL)
|
||||
msg_puts(_("\nNormal version "));
|
||||
#else
|
||||
|
Reference in New Issue
Block a user