summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-12-07 14:32:09 +0100
committerBram Moolenaar <bram@vim.org>2013-12-07 14:32:09 +0100
commitf6a0351eca8b31120e06f2c74f88a03ff2a99151 (patch)
tree5492475bf119c34570922a73c0b17e58b8d69f2d
parent55a4533992346c69ef6c360f047eae9e0ec48faf (diff)
downloadvim-f6a0351eca8b31120e06f2c74f88a03ff2a99151.tar.gz
updated for version 7.4.112v7.4.112v7-4-112
Problem: The defaults for 'directory' and 'backupdir' on MS-Windows do not include a directory that exists. Solution: Use $TEMP.
-rw-r--r--src/os_dos.h4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/os_dos.h b/src/os_dos.h
index 17246d4f..19748c49 100644
--- a/src/os_dos.h
+++ b/src/os_dos.h
@@ -109,7 +109,7 @@
#endif
#ifndef DFLT_BDIR
-# define DFLT_BDIR ".,c:\\tmp,c:\\temp" /* default for 'backupdir' */
+# define DFLT_BDIR ".,$TEMP,c:\\tmp,c:\\temp" /* default for 'backupdir' */
#endif
#ifndef DFLT_VDIR
@@ -117,7 +117,7 @@
#endif
#ifndef DFLT_DIR
-# define DFLT_DIR ".,c:\\tmp,c:\\temp" /* default for 'directory' */
+# define DFLT_DIR ".,$TEMP,c:\\tmp,c:\\temp" /* default for 'directory' */
#endif
#define DFLT_ERRORFILE "errors.err"
diff --git a/src/version.c b/src/version.c
index 5ec24787..69be33b0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 112,
+/**/
111,
/**/
110,