summaryrefslogtreecommitdiff
path: root/src
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
commitb050c6418647c5358564e4608e8bb6ac7caa93b8 (patch)
tree5b2c0fb26708bb119898c559cc23a6aa8223030a /src
parentc2401d62e0f8de45598c8ed7d9e9b09227f6682d (diff)
downloadvim-b050c6418647c5358564e4608e8bb6ac7caa93b8.zip
updated for version 7.4.112
Problem: The defaults for 'directory' and 'backupdir' on MS-Windows do not include a directory that exists. Solution: Use $TEMP.
Diffstat (limited to 'src')
-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 17246d4f7..19748c496 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 5ec247874..69be33b06 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,