Patch 9.0.0700

[Bram Moolenaar]

Patch 9.0.0700
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)
Files: runtime/doc/various.txt, src/INSTALL, src/INSTALLvms.txt,
src/Make_ami.mak, src/Make_cyg_ming.mak, src/Make_mvc.mak,
src/Make_vms.mms, src/Makefile, src/auto/configure,
src/config.h.in, src/configure.ac, src/feature.h,
src/testdir/test_regexp_utf8.vim, src/version.c


*** ../vim-9.0.0699/runtime/doc/various.txt 2022-10-04 16:23:39.002042197 +0100
--- runtime/doc/various.txt 2022-10-08 18:34:46.109375837 +0100
***************
*** 330,337 ****
*+feature-list*
*+acl* |ACL| support included
*+ARP* Amiga only: ARP support included
! B *+arabic* |Arabic| language support
! B *+autochdir* support 'autochdir' option
T *+autocmd* |:autocmd|, automatic commands. Always enabled since
8.0.1564
H *+autoservername* Automatically enable |clientserver|
--- 332,339 ----
*+feature-list*
*+acl* |ACL| support included
*+ARP* Amiga only: ARP support included
! 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|
***************
*** 356,364 ****
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 *+cryptv* encryption support |encryption|
! B *+cscope* |cscope| support
T *+cursorbind* |'cursorbind'| support
m *+cursorshape* |termcap-cursor-shape| support
m *+debug* Compiled for debugging.
--- 358,366 ----
N *+cmdline_info* |'showcmd'| and |'ruler'|
T *+cmdwin* |cmdline-window| support; Always enabled since 9.0.0657
T *+comments* |'comments'| support
! N *+conceal* "conceal" support, see |conceal| |:syn-conceal| etc.
N *+cryptv* encryption support |encryption|
! H *+cscope* |cscope| support
T *+cursorbind* |'cursorbind'| support
m *+cursorshape* |termcap-cursor-shape| support
m *+debug* Compiled for debugging.
***************
*** 369,375 ****
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
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.
--- 371,377 ----
N *+digraphs* |digraphs| *E196*
*+directx* Win32 GUI only: DirectX and |'renderoptions'|
*+dnd* Support for DnD into the "~ register |quote_~|.
! 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.
***************
*** 395,406 ****
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'|
N *+lambda* |lambda| and |closure|
! B *+langmap* |'langmap'|
N *+libcall* |libcall()|
N *+linebreak* |'linebreak'|, |'breakat'| and |'showbreak'|
! 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|
--- 397,408 ----
m *+ipv6* Support for IPv6 networking |channel|
m *+job* starting and stopping jobs |job|
T *+jumplist* |jumplist|; Always enabled since 8.2.3795
! H *+keymap* |'keymap'|
N *+lambda* |lambda| and |closure|
! H *+langmap* |'langmap'|
N *+libcall* |libcall()|
N *+linebreak* |'linebreak'|, |'breakat'| and |'showbreak'|
! 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|
***************
*** 411,426 ****
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_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_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_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|
--- 413,428 ----
T *+modify_fname* |filename-modifiers|
T *+mouse* Mouse handling |mouse-using|
N *+mouseshape* |'mouseshape'|
! 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|
! 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|
! 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|
***************
*** 449,462 ****
N *+quickfix* |:make| and |quickfix| commands
N *+reltime* |reltime()| function, 'hlsearch'/'incsearch' timeout,
'redrawtime' option
! B *+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 *+spell* spell checking support, see |spell|
N *+startuptime* |--startuptime| argument
N *+statusline* Options 'statusline', 'rulerformat' and special
--- 451,464 ----
N *+quickfix* |:make| and |quickfix| commands
N *+reltime* |reltime()| function, 'hlsearch'/'incsearch' timeout,
'redrawtime' option
! H *+rightleft* Right to left typing |'rightleft'|
m *+ruby* Ruby interface |ruby|
m *+ruby/dyn* Ruby interface |ruby-dynamic| |/dyn|
T *+scrollbind* |'scrollbind'|
! 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
***************
*** 472,478 ****
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
T *+textobjects* |text-objects| selection. Always enabled since 9.0.0222.
N *+textprop* |text-properties|
*+tgetent* non-Unix only: able to use external termcap
--- 474,480 ----
m *+terminal* Support for terminal window |terminal|
*+terminfo* uses |terminfo| instead of termcap
N *+termresponse* support for |t_RV| and |v:termresponse|
! 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
***************
*** 481,487 ****
N *+toolbar* |gui-toolbar|
T *+user_commands* User-defined commands. |user-commands|
Always enabled since 8.1.1210.
! B *+vartabs* Variable-width tabstops. |'vartabstop'|
T *+vertsplit* Vertically split windows |:vsplit|; Always enabled
since 8.0.1118.
T *+vim9script* |Vim9| script
--- 483,489 ----
N *+toolbar* |gui-toolbar|
T *+user_commands* User-defined commands. |user-commands|
Always enabled since 8.1.1210.
! H *+vartabs* Variable-width tabstops. |'vartabstop'|
T *+vertsplit* Vertically split windows |:vsplit|; Always enabled
since 8.0.1118.
T *+vim9script* |Vim9| script
*** ../vim-9.0.0699/src/INSTALL 2021-08-26 13:56:26.000000000 +0100
--- src/INSTALL 2022-10-08 18:44:31.399149134 +0100
***************
*** 178,191 ****
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
--- 178,183 ----
*** ../vim-9.0.0699/src/INSTALLvms.txt 2022-10-04 16:23:39.002042197 +0100
--- src/INSTALLvms.txt 2022-10-08 18:45:53.390893076 +0100
***************
*** 79,89 ****
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

Parameter name : GUI
Description : GUI or terminal mode executable
--- 79,88 ----
Description : Build model selection
Options: : TINY - No optional features enabled
NORMAL - A default selection of features enabled
! (OpenVMS default)
HUGE - All possible features enabled.
! Uncommented - will default to NORMAL
! Default : MODEL = NORMAL

Parameter name : GUI
Description : GUI or terminal mode executable
*** ../vim-9.0.0699/src/Make_ami.mak 2022-10-04 16:23:39.002042197 +0100
--- src/Make_ami.mak 2022-10-08 18:56:28.511462545 +0100
***************
*** 29,42 ****
-DFEAT_HUGE
else

- # Vim 'big' build
- ifeq ($(BUILD),big)
- CFLAGS += \
- -DFEAT_BROWSE \
- -DFEAT_MOUSE \
- -DFEAT_BIG
- else
-
# Vim 'normal' build
ifeq ($(BUILD),normal)
CFLAGS +=\
--- 29,34 ----
*** ../vim-9.0.0699/src/Make_cyg_ming.mak 2022-10-04 16:23:39.002042197 +0100
--- src/Make_cyg_ming.mak 2022-10-08 18:56:28.511462545 +0100
***************
*** 28,34 ****
# Updated 2014 Oct 13.

#>>>>> choose options:
! # FEATURES=[TINY | NORMAL | BIG | HUGE]
# Set to TINY to make a minimal version (no optional features).
FEATURES=HUGE

--- 28,34 ----
# Updated 2014 Oct 13.

#>>>>> choose options:
! # FEATURES=[TINY | NORMAL | HUGE]
# Set to TINY to make a minimal version (no optional features).
FEATURES=HUGE

***************
*** 113,119 ****
endif

# Set to yes to enable sound support.
! ifneq ($(findstring $(FEATURES),BIG HUGE),)
SOUND=yes
else
SOUND=no
--- 113,119 ----
endif

# Set to yes to enable sound support.
! ifneq ($(findstring $(FEATURES),HUGE),)
SOUND=yes
else
SOUND=no
*** ../vim-9.0.0699/src/Make_mvc.mak 2022-10-04 16:23:39.002042197 +0100
--- src/Make_mvc.mak 2022-10-08 18:56:28.511462545 +0100
***************
*** 16,22 ****
#
# !!!! After changing any features do "nmake clean" first !!!!
#
! # Feature Set: FEATURES=[TINY, NORMAL, BIG, HUGE] (default is HUGE)
#
# Name to add to the version: MODIFIED_BY=[name of modifier]
#
--- 16,22 ----
#
# !!!! After changing any features do "nmake clean" first !!!!
#
! # Feature Set: FEATURES=[TINY, NORMAL, HUGE] (default is HUGE)
#
# Name to add to the version: MODIFIED_BY=[name of modifier]
#
***************
*** 354,360 ****
!endif

!ifndef SOUND
! ! if "$(FEATURES)"=="HUGE" || "$(FEATURES)"=="BIG"
SOUND = yes
! else
SOUND = no
--- 354,360 ----
!endif

!ifndef SOUND
! ! if "$(FEATURES)"=="HUGE"
SOUND = yes
! else
SOUND = no
***************
*** 1124,1130 ****
!endif # POSTSCRIPT

#
! # FEATURES: TINY, NORMAL, BIG or HUGE
#
CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES)

--- 1124,1130 ----
!endif # POSTSCRIPT

#
! # FEATURES: TINY, NORMAL, or HUGE
#
CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES)

*** ../vim-9.0.0699/src/Make_vms.mms 2022-10-04 16:23:39.006042192 +0100
--- src/Make_vms.mms 2022-10-08 18:56:28.511462545 +0100
***************
*** 29,35 ****
# 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
--- 29,34 ----
*** ../vim-9.0.0699/src/Makefile 2022-10-04 16:23:39.006042192 +0100
--- src/Makefile 2022-10-08 19:25:13.238835684 +0100
***************
*** 453,459 ****
# 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
--- 453,458 ----
***************
*** 482,488 ****
# MULTIBYTE - To edit multi-byte characters.
# This is now always enabled.

! # When building with at least "big" features, right-left and Arabic
# features are enabled. Use this to disable them.
#CONF_OPT_MULTIBYTE = --disable-rightleft --disable-arabic

--- 481,487 ----
# MULTIBYTE - To edit multi-byte characters.
# This is now always enabled.

! # 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,524 ****
# though you have /dev/sysmouse and includes.
#CONF_OPT_SYSMOUSE = --disable-sysmouse

! # libcanberra - For sound support. Default is on for big features.
# Uncomment one of the two to chose otherwise.
# CONF_OPT_CANBERRA = --enable-canberra
# CONF_OPT_CANBERRA = --disable-canberra
--- 517,523 ----
# though you have /dev/sysmouse and includes.
#CONF_OPT_SYSMOUSE = --disable-sysmouse

! # 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,538 ****
# 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".
--- 531,536 ----
*** ../vim-9.0.0699/src/auto/configure 2022-10-04 16:23:39.006042192 +0100
--- src/auto/configure 2022-10-08 19:10:19.919907910 +0100
***************
*** 1523,1529 ****
--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-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.
--- 1523,1529 ----
--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 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.
***************
*** 5220,5226 ****


case "$features" in
! small) features="tiny" ;;
esac

dovimdiff=""
--- 5220,5227 ----


case "$features" in
! small) features="tiny" ;;
! big) features="normal" ;;
esac

dovimdiff=""
***************
*** 5231,5239 ****
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
dovimdiff="installvimdiff";
dogvimdiff="installgvimdiff" ;;
--- 5232,5237 ----
***************
*** 12883,12889 ****


if test "$enable_canberra" = "maybe"; then
! if test "$features" = "big" -o "$features" = "huge"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5
$as_echo "Defaulting to yes" >&6; }
enable_canberra="yes"
--- 12881,12887 ----


if test "$enable_canberra" = "maybe"; 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,12963 ****


if test "$enable_libsodium" = "maybe"; then
! if test "$features" = "big" -o "$features" = "huge"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5
$as_echo "Defaulting to yes" >&6; }
enable_libsodium="yes"
--- 12955,12961 ----


if test "$enable_libsodium" = "maybe"; 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"
*** ../vim-9.0.0699/src/config.h.in 2022-10-04 16:23:39.006042192 +0100
--- src/config.h.in 2022-10-08 18:56:28.515462556 +0100
***************
*** 322,330 ****
/* 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

--- 322,327 ----
*** ../vim-9.0.0699/src/configure.ac 2022-10-08 13:49:41.889378451 +0100
--- src/configure.ac 2022-10-08 19:11:12.295870508 +0100
***************
*** 522,534 ****
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)],
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"
case "$features" in
! small) features="tiny" ;;
esac

dovimdiff=""
--- 522,536 ----
dnl Check user requested features.

AC_MSG_CHECKING(--with-features argument)
! 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,544 ****
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]) ;;
--- 539,544 ----
***************
*** 2266,2272 ****
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 unless ENABLE_RIGHTLEFT is undefined.
AC_MSG_CHECKING(--disable-rightleft argument)
AC_ARG_ENABLE(rightleft,
--- 2266,2272 ----
a problem with this, discuss on the Vim mailing list.])
fi

! 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,2285 ****
AC_DEFINE(DISABLE_RIGHTLEFT)
fi

! dnl Arabic language support for Vim will be included with big features,
dnl unless ENABLE_ARABIC is undefined.
AC_MSG_CHECKING(--disable-arabic argument)
AC_ARG_ENABLE(arabic,
--- 2279,2285 ----
AC_DEFINE(DISABLE_RIGHTLEFT)
fi

! 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,3723 ****
, [enable_canberra="maybe"])

if test "$enable_canberra" = "maybe"; then
! if test "$features" = "big" -o "$features" = "huge"; then
AC_MSG_RESULT(Defaulting to yes)
enable_canberra="yes"
else
--- 3717,3723 ----
, [enable_canberra="maybe"])

if test "$enable_canberra" = "maybe"; then
! if test "$features" = "huge"; then
AC_MSG_RESULT(Defaulting to yes)
enable_canberra="yes"
else
***************
*** 3763,3769 ****
, [enable_libsodium="maybe"])

if test "$enable_libsodium" = "maybe"; then
! if test "$features" = "big" -o "$features" = "huge"; then
AC_MSG_RESULT(Defaulting to yes)
enable_libsodium="yes"
else
--- 3763,3769 ----
, [enable_libsodium="maybe"])

if test "$enable_libsodium" = "maybe"; then
! if test "$features" = "huge"; then
AC_MSG_RESULT(Defaulting to yes)
enable_libsodium="yes"
else
*** ../vim-9.0.0699/src/feature.h 2022-10-08 15:30:52.271540199 +0100
--- src/feature.h 2022-10-08 19:09:04.839953930 +0100
***************
*** 33,42 ****
*
* +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.
*/

/*
--- 33,41 ----
*
* +tiny no optional features enabled, not even +eval
* +normal a default selection of features enabled
* +huge all possible features enabled.
*
! * When +normal is used, +tiny is also included. +huge implies +normal, etc.
*/

/*
***************
*** 50,82 ****
#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)
// #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(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

--- 49,83 ----
#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_HUGE)
// #define FEAT_TINY
// #define FEAT_NORMAL
// #define FEAT_HUGE
#endif

/*
* For Unix, Mac and Win32 use +huge by default. These days CPUs are fast and
* Memory is cheap.
* Otherwise use +normal
*/
! #if !defined(FEAT_TINY) && !defined(FEAT_NORMAL) && !defined(FEAT_HUGE)
# if defined(UNIX) || defined(MSWIN) || defined(MACOS_X)
# define FEAT_HUGE
# else
! # define FEAT_NORMAL
# endif
#endif

***************
*** 84,92 ****
* Each feature implies including the "smaller" ones.
*/
#ifdef FEAT_HUGE
- # define FEAT_BIG
- #endif
- #ifdef FEAT_BIG
# define FEAT_NORMAL
#endif
#ifdef FEAT_NORMAL
--- 85,90 ----
***************
*** 164,170 ****
* keyboard in a special language mode, e.g. for typing
* greek.
*/
! #ifdef FEAT_BIG
# define FEAT_LANGMAP
#endif

--- 162,168 ----
* keyboard in a special language mode, e.g. for typing
* greek.
*/
! #ifdef FEAT_HUGE
# define FEAT_LANGMAP
#endif

***************
*** 172,178 ****
* +keymap 'keymap' option. Allows you to map typed keys in
* Insert mode for a special language.
*/
! #ifdef FEAT_BIG
# define FEAT_KEYMAP
#endif

--- 170,176 ----
* +keymap 'keymap' option. Allows you to map typed keys in
* Insert mode for a special language.
*/
! #ifdef FEAT_HUGE
# define FEAT_KEYMAP
#endif

***************
*** 219,225 ****
/*
* +rightleft Right-to-left editing/typing support.
*/
! #if defined(FEAT_BIG) && !defined(DISABLE_RIGHTLEFT)
# define FEAT_RIGHTLEFT
#endif

--- 217,223 ----
/*
* +rightleft Right-to-left editing/typing support.
*/
! #if defined(FEAT_HUGE) && !defined(DISABLE_RIGHTLEFT)
# define FEAT_RIGHTLEFT
#endif

***************
*** 227,233 ****
* +arabic Arabic keymap and shaping support.
* Requires FEAT_RIGHTLEFT
*/
! #if defined(FEAT_BIG) && !defined(DISABLE_ARABIC)
# define FEAT_ARABIC
#endif
#ifdef FEAT_ARABIC
--- 225,231 ----
* +arabic Arabic keymap and shaping support.
* Requires FEAT_RIGHTLEFT
*/
! #if defined(FEAT_HUGE) && !defined(DISABLE_ARABIC)
# define FEAT_ARABIC
#endif
#ifdef FEAT_ARABIC
***************
*** 252,265 ****
* +emacs_tags When FEAT_EMACS_TAGS defined: Include support for
* emacs style TAGS file.
*/
! #ifdef FEAT_BIG
# define FEAT_EMACS_TAGS
#endif

/*
* +cscope Unix only: Cscope support.
*/
! #if defined(UNIX) && defined(FEAT_BIG) && !defined(FEAT_CSCOPE) && !defined(MACOS_X)
# define FEAT_CSCOPE
#endif

--- 250,263 ----
* +emacs_tags When FEAT_EMACS_TAGS defined: Include support for
* emacs style TAGS file.
*/
! #ifdef FEAT_HUGE
# define FEAT_EMACS_TAGS
#endif

/*
* +cscope Unix only: Cscope support.
*/
! #if defined(UNIX) && defined(FEAT_HUGE) && !defined(FEAT_CSCOPE) && !defined(MACOS_X)
# define FEAT_CSCOPE
#endif

***************
*** 374,380 ****
* +conceal 'conceal' option. Depends on syntax highlighting
* as this is how the concealed text is defined.
*/
! #if defined(FEAT_BIG) && defined(FEAT_SYN_HL)
# define FEAT_CONCEAL
#endif

--- 372,378 ----
* +conceal 'conceal' option. Depends on syntax highlighting
* as this is how the concealed text is defined.
*/
! #if defined(FEAT_NORMAL) && defined(FEAT_SYN_HL)
# define FEAT_CONCEAL
#endif

***************
*** 395,401 ****
/*
* libsodium - add cryptography support
*/
! #if defined(HAVE_SODIUM) && defined(FEAT_BIG)
# define FEAT_SODIUM
#endif

--- 393,399 ----
/*
* libsodium - add cryptography support
*/
! #if defined(HAVE_SODIUM) && defined(FEAT_HUGE)
# define FEAT_SODIUM
#endif

***************
*** 428,434 ****
// #define FEAT_MBYTE_IME
#endif

! #if defined(FEAT_BIG) && defined(FEAT_GUI_HAIKU) && !defined(FEAT_MBYTE_IME)
# define FEAT_MBYTE_IME
#endif

--- 426,432 ----
// #define FEAT_MBYTE_IME
#endif

! #if defined(FEAT_HUGE) && defined(FEAT_GUI_HAIKU) && !defined(FEAT_MBYTE_IME)
# define FEAT_MBYTE_IME
#endif

***************
*** 606,619 ****
/*
* +termguicolors 'termguicolors' option.
*/
! #if (defined(FEAT_BIG) && defined(FEAT_SYN_HL)) && !defined(ALWAYS_USE_GUI)
# define FEAT_TERMGUICOLORS
#endif

/*
* +vartabs 'vartabstop' and 'varsofttabstop' options.
*/
! #ifdef FEAT_BIG
# define FEAT_VARTABS
#endif

--- 604,617 ----
/*
* +termguicolors 'termguicolors' option.
*/
! #if (defined(FEAT_NORMAL) && defined(FEAT_SYN_HL)) && !defined(ALWAYS_USE_GUI)
# define FEAT_TERMGUICOLORS
#endif

/*
* +vartabs 'vartabstop' and 'varsofttabstop' options.
*/
! #ifdef FEAT_HUGE
# define FEAT_VARTABS
#endif

***************
*** 854,866 ****
// Amiga console has no mouse support
#if defined(UNIX) || defined(VMS)
# define FEAT_MOUSE_XTERM
! # ifdef FEAT_BIG
# define FEAT_MOUSE_NET
- # endif
- # ifdef FEAT_BIG
# define FEAT_MOUSE_DEC
- # endif
- # ifdef FEAT_BIG
# define FEAT_MOUSE_URXVT
# endif
#endif
--- 852,860 ----
// Amiga console has no mouse support
#if defined(UNIX) || defined(VMS)
# define FEAT_MOUSE_XTERM
! # ifdef FEAT_NORMAL
# define FEAT_MOUSE_NET
# define FEAT_MOUSE_DEC
# define FEAT_MOUSE_URXVT
# endif
#endif
***************
*** 1091,1097 ****
* +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)
# define FEAT_SIGNS
# if (defined(FEAT_GUI_MOTIF) && defined(HAVE_X11_XPM_H)) \
|| defined(FEAT_GUI_GTK) \
--- 1085,1091 ----
* +signs Allow signs to be displayed to the left of text lines.
* Adds the ":sign" command.
*/
! #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,1155 ****
/*
* +autochdir 'autochdir' option.
*/
! #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_BIG)
# define FEAT_AUTOCHDIR
#endif

--- 1143,1149 ----
/*
* +autochdir 'autochdir' option.
*/
! #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_NORMAL)
# define FEAT_AUTOCHDIR
#endif

*** ../vim-9.0.0699/src/testdir/test_regexp_utf8.vim 2022-10-05 21:45:23.775124283 +0100
--- src/testdir/test_regexp_utf8.vim 2022-10-08 19:09:47.775928771 +0100
***************
*** 228,235 ****
" 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.
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'])
--- 228,234 ----
" When there is no match use only the first two items.
let tl = []

! " 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'])
*** ../vim-9.0.0699/src/version.c 2022-10-08 17:55:29.231208875 +0100
--- src/version.c 2022-10-08 18:56:28.515462556 +0100
***************
*** 2419,2426 ****

#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
--- 2421,2426 ----
*** ../vim-9.0.0699/src/version.c 2022-10-08 17:55:29.231208875 +0100
--- src/version.c 2022-10-08 18:56:28.515462556 +0100
***************
*** 701,702 ****
--- 701,704 ----
{ /* Add new patch number below this line */
+ /**/
+ 700,
/**/

--
LAUNCELOT leaps into SHOT with a mighty cry and runs the GUARD through and
hacks him to the floor. Blood. Swashbuckling music (perhaps).
LAUNCELOT races through into the castle screaming.
SECOND SENTRY: Hey!
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///