To: vim_dev@googlegroups.com
Subject: Patch 7.4.1784
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

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.
Files:      src/configure.in, src/config.h.in, src/auto/configure,
            src/feature.h


*** ../vim-7.4.1783/src/configure.in	2016-04-21 21:08:11.785949050 +0200
--- src/configure.in	2016-04-24 14:48:07.766260764 +0200
***************
*** 1926,1940 ****
    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.], ,
--- 1926,1931 ----
*** ../vim-7.4.1783/src/config.h.in	2016-04-21 21:08:11.785949050 +0200
--- src/config.h.in	2016-04-24 14:48:57.765745484 +0200
***************
*** 362,370 ****
  /* 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
--- 362,367 ----
*** ../vim-7.4.1783/src/auto/configure	2016-04-21 21:08:11.785949050 +0200
--- src/auto/configure	2016-04-24 14:49:29.473418708 +0200
***************
*** 810,816 ****
  enable_rubyinterp
  with_ruby_command
  enable_cscope
- enable_termtruecolor
  enable_workshop
  enable_netbeans
  enable_channel
--- 810,815 ----
***************
*** 1477,1483 ****
    --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.
--- 1476,1481 ----
***************
*** 7218,7239 ****
  
  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.
--- 7216,7221 ----
*** ../vim-7.4.1783/src/feature.h	2016-03-19 22:11:47.440674791 +0100
--- src/feature.h	2016-04-24 14:51:41.800050818 +0200
***************
*** 814,819 ****
--- 814,826 ----
  # 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
*** ../vim-7.4.1783/src/version.c	2016-04-24 14:40:04.103244711 +0200
--- src/version.c	2016-04-24 14:59:13.899372755 +0200
***************
*** 755,756 ****
--- 755,758 ----
  {   /* Add new patch number below this line */
+ /**/
+     1784,
  /**/

-- 
We learn from our mistakes.  Politicians don't make mistakes.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///