summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-06-29 20:28:31 +0200
committerBram Moolenaar <Bram@vim.org>2018-06-29 20:28:31 +0200
commit7c365fb190225d98af818daf195dc19921fe01ca (patch)
treee848877539d1e033be7f7f430bbc880a4918b877
parent307ac5c68e9e624ab713136d79f35bb73f780d2d (diff)
downloadvim-7c365fb190225d98af818daf195dc19921fe01ca.zip
patch 8.1.0127: build failure when disabling the session feature
Problem: Build failure when disabling the session feature. (Pawel Slowik) Solution: Adjust #ifdef for vim_chdirfile().
-rw-r--r--src/misc2.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/misc2.c b/src/misc2.c
index e5b678158..4a4908c19 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3381,8 +3381,8 @@ same_directory(char_u *f1, char_u *f2)
&& pathcmp((char *)ffname, (char *)f2, (int)(t1 - ffname)) == 0);
}
-#if defined(FEAT_SESSION) || defined(MSWIN) || defined(FEAT_GUI_MAC) \
- || defined(FEAT_GUI_GTK) \
+#if defined(FEAT_SESSION) || defined(FEAT_AUTOCHDIR) \
+ || defined(MSWIN) || defined(FEAT_GUI_MAC) || defined(FEAT_GUI_GTK) \
|| defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG) \
|| defined(PROTO)
/*
diff --git a/src/version.c b/src/version.c
index 4e3770e44..72e85473c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 127,
+/**/
126,
/**/
125,