summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-05-21 13:39:40 +0200
committerBram Moolenaar <Bram@vim.org>2018-05-21 13:39:40 +0200
commit1f131aee0ed4383009c0a67cc15581cc4c0dcad7 (patch)
tree01660b676bcb3a422b8c93a71ecb88d874fc0f99
parentf88a5bc10232cc3fac92dba4e8455f4c14311f8e (diff)
downloadvim-git-1f131aee0ed4383009c0a67cc15581cc4c0dcad7.tar.gz
patch 8.1.0012: misplaced #endifv8.1.0012
Problem: Misplaced #endif. Solution: Move the #endif to after the expression. (David Binderman)
-rw-r--r--src/fileio.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 98631e074..d34605ca7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -714,8 +714,8 @@ readfile(
&& st.st_gid != swap_st.st_gid
# ifdef HAVE_FCHOWN
&& fchown(curbuf->b_ml.ml_mfp->mf_fd, -1, st.st_gid)
-# endif
== -1
+# endif
)
swap_mode &= 0600;
}
diff --git a/src/version.c b/src/version.c
index 3ebeb772d..6dfc3aaef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 12,
+/**/
11,
/**/
10,