# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1501605905 -7200
# Node ID 1e8d353cb827ed93d96671579da828d98568d74c
# Parent  15b97761c03332e5b6f0e4e945a021c53a31d87c
patch 8.0.0834: can't build without the client-server feature

commit https://github.com/vim/vim/commit/2a4f06f370df0eb6fb77a05343604f5124ae5a11
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Aug 1 18:44:29 2017 +0200

    patch 8.0.0834: can't build without the client-server feature

    Problem:    Can't build without the client-server feature.
    Solution:   Add #ifdef.

diff --git a/src/os_unix.c b/src/os_unix.c
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4108,7 +4108,9 @@ set_child_environment(long rows, long co
     static char	envbuf_Lines[20];
     static char	envbuf_Columns[20];
     static char	envbuf_Colors[20];
+#  ifdef FEAT_CLIENTSERVER
     static char	envbuf_Servername[60];
+#  endif
 # endif
     long	colors =
 #  ifdef FEAT_GUI
@@ -4126,7 +4128,9 @@ set_child_environment(long rows, long co
     setenv("COLUMNS", (char *)envbuf, 1);
     sprintf((char *)envbuf, "%ld", colors);
     setenv("COLORS", (char *)envbuf, 1);
+#  ifdef FEAT_CLIENTSERVER
     setenv("VIM_SERVERNAME", serverName == NULL ? "" : (char *)serverName, 1);
+#  endif
 # else
     /*
      * Putenv does not copy the string, it has to remain valid.
@@ -4144,9 +4148,11 @@ set_child_environment(long rows, long co
     putenv(envbuf_Columns);
     vim_snprintf(envbuf_Colors, sizeof(envbuf_Colors), "COLORS=%ld", colors);
     putenv(envbuf_Colors);
+#  ifdef FEAT_CLIENTSERVER
     vim_snprintf(envbuf_Servername, sizeof(envbuf_Servername),
 	    "VIM_SERVERNAME=%s", serverName == NULL ? "" : (char *)serverName);
     putenv(envbuf_Servername);
+#  endif
 # endif
 }
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    834,
+/**/
     833,
 /**/
     832,