aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.2.1266: Makefile preference were accidentally included

Browse Source 
Problem:    Makefile preference were accidentally included.
Solution:   Revert the Makefile changes.
This commit is contained in:
Bram Moolenaar
2020-07-21 22:34:41 +02:00
parent 7d5e744162
commit bc6fcbe4ce
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile
View File

@@ -404,7 +404,7 @@ CClink = $(CC)
# Use --with-luajit if you want to use LuaJIT instead of Lua. # Use --with-luajit if you want to use LuaJIT instead of Lua.
# Set PATH environment variable to find lua or luajit executable. # Set PATH environment variable to find lua or luajit executable.
# This requires at least "normal" features, "tiny" and "small" don't work. # This requires at least "normal" features, "tiny" and "small" don't work.
CONF_OPT_LUA = --enable-luainterp #CONF_OPT_LUA = --enable-luainterp
#CONF_OPT_LUA = --enable-luainterp=dynamic #CONF_OPT_LUA = --enable-luainterp=dynamic
#CONF_OPT_LUA = --enable-luainterp --with-luajit #CONF_OPT_LUA = --enable-luainterp --with-luajit
#CONF_OPT_LUA = --enable-luainterp=dynamic --with-luajit #CONF_OPT_LUA = --enable-luainterp=dynamic --with-luajit
@@ -447,10 +447,10 @@ CONF_OPT_LUA = --enable-luainterp
# dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available # dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available
# However, this may still cause problems, such as "import termios" failing. # However, this may still cause problems, such as "import termios" failing.
# Build two separate versions of Vim in that case. # Build two separate versions of Vim in that case.
CONF_OPT_PYTHON = --enable-pythoninterp #CONF_OPT_PYTHON = --enable-pythoninterp
#CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7 #CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7
#CONF_OPT_PYTHON = --enable-pythoninterp=dynamic #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
CONF_OPT_PYTHON3 = --enable-python3interp #CONF_OPT_PYTHON3 = --enable-python3interp
#CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6 #CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6
#CONF_OPT_PYTHON3 = --enable-python3interp=dynamic #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
@@ -472,7 +472,7 @@ CONF_OPT_PYTHON3 = --enable-python3interp
# CSCOPE # CSCOPE
# Uncomment this when you want to include the Cscope interface. # Uncomment this when you want to include the Cscope interface.
CONF_OPT_CSCOPE = --enable-cscope #CONF_OPT_CSCOPE = --enable-cscope
# NETBEANS - NetBeans interface. Only works with Motif, GTK, and gnome. # NETBEANS - NetBeans interface. Only works with Motif, GTK, and gnome.
# Motif version must have XPM libraries (see |netbeans-xpm|). # Motif version must have XPM libraries (see |netbeans-xpm|).
@@ -540,7 +540,7 @@ CONF_OPT_CSCOPE = --enable-cscope
#CONF_OPT_FEAT = --with-features=small #CONF_OPT_FEAT = --with-features=small
#CONF_OPT_FEAT = --with-features=normal #CONF_OPT_FEAT = --with-features=normal
#CONF_OPT_FEAT = --with-features=big #CONF_OPT_FEAT = --with-features=big
CONF_OPT_FEAT = --with-features=huge #CONF_OPT_FEAT = --with-features=huge
# COMPILED BY - For including a specific e-mail address for ":version". # COMPILED BY - For including a specific e-mail address for ":version".
#CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>" #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>"
@@ -614,7 +614,7 @@ CONF_OPT_FEAT = --with-features=huge
# Use this with GCC to check for mistakes, unused arguments, etc. # Use this with GCC to check for mistakes, unused arguments, etc.
# Note: If you use -Wextra and get warnings in GTK code about function # Note: If you use -Wextra and get warnings in GTK code about function
# parameters, you can add -Wno-cast-function-type # parameters, you can add -Wno-cast-function-type
CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
# Add -Wpedantic to find // comments and other C99 constructs. # Add -Wpedantic to find // comments and other C99 constructs.
# Better disable Perl and Python to avoid a lot of warnings. # Better disable Perl and Python to avoid a lot of warnings.
#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
@@ -709,7 +709,7 @@ SANITIZER_LIBS = $(SANITIZER_CFLAGS)
# Configuration is in the .ccmalloc or ~/.ccmalloc file. # Configuration is in the .ccmalloc or ~/.ccmalloc file.
# Doesn't work very well, since memory linked to from global variables # Doesn't work very well, since memory linked to from global variables
# (in libraries) is also marked as leaked memory. # (in libraries) is also marked as leaked memory.
LEAK_CFLAGS = -DEXITFREE #LEAK_CFLAGS = -DEXITFREE
#LEAK_LIBS = -lccmalloc #LEAK_LIBS = -lccmalloc
# Uncomment this line to have Vim call abort() when an internal error is # Uncomment this line to have Vim call abort() when an internal error is

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1266,
/**/ /**/
1265, 1265,
/**/ /**/