aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastian Winkler <buz@netbuz.org>2015-04-29 20:26:49 +0200
committerJustin M. Keyes <justinkz@gmail.com>2015-05-07 00:33:20 -0400
commita2cf628603bf5948f96ceb90b653d2879a9d2f9e (patch)
tree4a61074b432f6808fd01feed176bcef66b7dfe32
parent83a2a638a993f26ea818c8340b07f1054720b98c (diff)
downloadrneovim-a2cf628603bf5948f96ceb90b653d2879a9d2f9e.tar.gz
rneovim-a2cf628603bf5948f96ceb90b653d2879a9d2f9e.tar.bz2
rneovim-a2cf628603bf5948f96ceb90b653d2879a9d2f9e.zip
vim-patch:7.4.707 #2541
Problem: Undo files can have their executable bit set. Solution: Strip of the executable bit. (Mikael Berthe) https://github.com/vim/vim/commit/v7-4-707
-rw-r--r--src/nvim/undo.c4
-rw-r--r--src/nvim/version.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index d8cf8aa7b7..3999f475c6 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -1035,8 +1035,8 @@ void u_write_undo(char_u *name, int forceit, buf_T *buf, char_u *hash)
}
}
- /* strip any s-bit */
- perm = perm & 0777;
+ // Strip any sticky and executable bits.
+ perm = perm & 0666;
/* If the undo file already exists, verify that it actually is an undo
* file, and delete it. */
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 7d5196a707..e80b653c00 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -76,7 +76,7 @@ static int included_patches[] = {
710,
//709,
//708,
- //707,
+ 707,
706,
//705,
//704,