aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-06-13 14:20:51 +0200
committerGitHub <noreply@github.com>2019-06-13 14:20:51 +0200
commitcc4d463cad6ccc81ca4803092be09cd27185d646 (patch)
treef8db8e308d3d25d09f3f8b8a066b460c34df977f /runtime
parent424ddd01f5881007cfd2dbb2195bbb4c7b9aa10c (diff)
parent66613ace48141d71ab12de56d0b0db79f48697d9 (diff)
downloadrneovim-cc4d463cad6ccc81ca4803092be09cd27185d646.tar.gz
rneovim-cc4d463cad6ccc81ca4803092be09cd27185d646.tar.bz2
rneovim-cc4d463cad6ccc81ca4803092be09cd27185d646.zip
Merge pull request #10202 from blueyed/vim-8.0.1704
vim-patch:8.0.1704: 'backupskip' default doesn't work for Mac Also aligns tests from two previous patched to the ones in upstream.
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a0adf7ec20..82be2f9033 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -874,7 +874,9 @@ A jump table for the options with a short description can be found at |Q_op|.
< Use 'backupdir' to put the backup in a different directory.
*'backupskip'* *'bsk'*
-'backupskip' 'bsk' string (default: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*")
+'backupskip' 'bsk' string (default: "$TMPDIR/*,$TMP/*,$TEMP/*"
+ Unix: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*"
+ Mac: "/private/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*")
global
A list of file patterns. When one of the patterns matches with the
name of the file which is written, no backup file is created. Both