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.

diff --git a/src/auto/configure b/src/auto/configure
index ba0d0b05ab5bfcf06dbc2f4db8a3f20db840da12..ff3a63b4b503be156866ef83d1f91229c9dc5b43 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -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.

diff --git a/src/config.h.in b/src/config.h.in
index 6c0f7798decde7e58c64973da36862e269b61388..9d35e48fa6c9b201f16680ed19be383520dfa59a 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -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

diff --git a/src/configure.in b/src/configure.in
index d1d78388020f753bb555eed824109052069769d0..279ed47227967df3969225633a5bcc7740a18ce2 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -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.], ,

diff --git a/src/feature.h b/src/feature.h
index 75b888033f35d6ec521d311e8a76aa6bc23c230f..d3d768eb379e982e52548e1f9ef3258359478476 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -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

diff --git a/src/version.c b/src/version.c
index a4f325205a951599db18d3313598f65b2fdb1cab..e6d04ee482b372d27dadbf2ed5c292aaa952e982 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1784,
 /**/
     1783,
 /**/