Permalink
Browse files

patch 7.4.1784

Problem:    The termtruecolor feature is enabled differently from many other
            features.
Solution:   Enable the termtruecolor feature for the big build, not through
            configure.
  • Loading branch information...
brammool committed Apr 24, 2016
1 parent af98a49 commit 8e9eb3a6a1e589949f1c878c839528d917fdfc4a
Showing with 9 additions and 30 deletions.
  1. +0 −18 src/auto/configure
  2. +0 −3 src/config.h.in
  3. +0 −9 src/configure.in
  4. +7 −0 src/feature.h
  5. +2 −0 src/version.c
View
@@ -810,7 +810,6 @@ with_tclsh
enable_rubyinterp
with_ruby_command
enable_cscope
enable_termtruecolor
enable_workshop
enable_netbeans
enable_channel
@@ -1477,7 +1476,6 @@ Optional Features:
--enable-tclinterp=OPTS Include Tcl interpreter. default=no OPTS=no/yes/dynamic
--enable-rubyinterp=OPTS Include Ruby interpreter. default=no OPTS=no/yes/dynamic
--enable-cscope Include cscope interface.
--enable-termtruecolor Include support for 24-bit colors in ISO-8613-3 compatible terminals
--enable-workshop Include Sun Visual Workshop support.
--disable-netbeans Disable NetBeans integration support.
--disable-channel Disable process communication support.
@@ -7218,22 +7216,6 @@ if test "$enable_cscope" = "yes"; then
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-termtruecolor argument" >&5
$as_echo_n "checking --enable-termtruecolor argument... " >&6; }
# Check whether --enable-termtruecolor was given.
if test "${enable_termtruecolor+set}" = set; then :
enableval=$enable_termtruecolor;
else
enable_termtruecolor="no"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_termtruecolor" >&5
$as_echo "$enable_termtruecolor" >&6; }
if test "$enable_termtruecolor" = "yes"; then
$as_echo "#define FEAT_TERMTRUECOLOR 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-workshop argument" >&5
$as_echo_n "checking --enable-workshop argument... " >&6; }
# Check whether --enable-workshop was given.
View
@@ -362,9 +362,6 @@
/* Define for linking via dlopen() or LoadLibrary() */
#undef DYNAMIC_TCL
/* Define if you want 24-bit colors in ISO-8613-3 compatible terminals. */
#undef FEAT_TERMTRUECOLOR
/* Define if you want to add support for ACL */
#undef HAVE_POSIX_ACL
#undef HAVE_SOLARIS_ZFS_ACL
View
@@ -1926,15 +1926,6 @@ if test "$enable_cscope" = "yes"; then
AC_DEFINE(FEAT_CSCOPE)
fi
AC_MSG_CHECKING(--enable-termtruecolor argument)
AC_ARG_ENABLE(termtruecolor,
[ --enable-termtruecolor Include support for 24-bit colors in ISO-8613-3 compatible terminals], ,
[enable_termtruecolor="no"])
AC_MSG_RESULT($enable_termtruecolor)
if test "$enable_termtruecolor" = "yes"; then
AC_DEFINE(FEAT_TERMTRUECOLOR)
fi
AC_MSG_CHECKING(--enable-workshop argument)
AC_ARG_ENABLE(workshop,
[ --enable-workshop Include Sun Visual Workshop support.], ,
View
@@ -814,6 +814,13 @@
# endif
#endif
/*
* +termtruecolor 'guicolor' option.
*/
#if (defined(FEAT_BIG) && defined(FEAT_SYN_HL)) && !defined(ALWAYS_USE_GUI)
# define FEAT_TERMTRUECOLOR
#endif
/* Mac specific thing: Codewarrior interface. */
#ifdef FEAT_GUI_MAC
# define FEAT_CW_EDITOR
View
@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1784,
/**/
1783,
/**/

0 comments on commit 8e9eb3a

Please sign in to comment.