summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-13 20:00:29 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-13 20:00:29 +0200
commit76ae22fef3cb224ca7fbf97517f881e825d4d0c2 (patch)
treec3f903fde379b6ada66885108e4f9f31e63ea06d
parent5b7d177e8994c003ae77ddab5bd54f8cd1ee181b (diff)
downloadvim-git-76ae22fef3cb224ca7fbf97517f881e825d4d0c2.tar.gz
patch 7.4.1928v7.4.1928
Problem: Overwriting pointer argument. Solution: Assign to what it points to. (Dominique Pelle)
-rw-r--r--src/fileio.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 37b43a39a..1ceeaa735 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -7328,8 +7328,8 @@ vim_settempdir(char_u *tempdir)
/*
* vim_tempname(): Return a unique name that can be used for a temp file.
*
- * The temp file is NOT garanteed to be created. If "keep" is FALSE it is
- * garanteed to NOT be created.
+ * The temp file is NOT guaranteed to be created. If "keep" is FALSE it is
+ * guaranteed to NOT be created.
*
* The returned pointer is to allocated memory.
* The returned pointer is NULL if no valid name was found.
@@ -8696,7 +8696,7 @@ do_doautocmd(
int group;
if (did_something != NULL)
- did_something = FALSE;
+ *did_something = FALSE;
/*
* Check for a legal group name. If not, use AUGROUP_ALL.
diff --git a/src/version.c b/src/version.c
index 1323fb7d8..516e5ff96 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1928,
+/**/
1927,
/**/
1926,