patch 9.0.1650: MS-Windows: default 'viewdir' may include read-only directory

Problem:    MS-Windows: default 'viewdir' may include read-only directory.
Solution:   Use $HOME instead of $VIM for 'viewdir' default. (closes #12119)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f368de35ba63c30f2f3f7e9f52d39c9542a7d3f8..6653807866062fce69996f8101235717890883a3 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -8912,11 +8912,11 @@ A jump table for the options with a short description can be found at |Q_op|.
        displayed when 'verbosefile' is set.
 
                                                *'viewdir'* *'vdir'*
-'viewdir' 'vdir'       string  (default for Amiga and Win32:
-                                                        "$VIM/vimfiles/view",
-                                for Unix: "~/.vim/view",
-                                for macOS: "$VIM:vimfiles:view"
-                                for VMS: "sys$login:vimfiles/view")
+'viewdir' 'vdir'       string  (default for Amiga "$VIM/vimfiles/view",
+                                        for Win32: "$HOME/vimfiles/view",
+                                        for Unix: "~/.vim/view",
+                                        for macOS: "$VIM/vimfiles/view"
+                                        for VMS: "sys$login:vimfiles/view")
                        global
                        {not available when compiled without the |+mksession|
                        feature}

diff --git a/src/os_dos.h b/src/os_dos.h
index f1fcbe6b793d2c9e65db3dbc2beb7469deb532c2..f53434824e487fd3641fbc8dc9a160a620e5efe8 100644 (file)
--- a/src/os_dos.h
+++ b/src/os_dos.h
@@ -97,7 +97,7 @@
 #endif
 
 #ifndef DFLT_VDIR
-# define DFLT_VDIR     "$VIM/vimfiles/view"    // default for 'viewdir'
+# define DFLT_VDIR     "$HOME/vimfiles/view"   // default for 'viewdir'
 #endif
 
 #ifndef DFLT_DIR
@@ -105,7 +105,7 @@
 #endif
 
 #define DFLT_ERRORFILE         "errors.err"
-#define DFLT_RUNTIMEPATH       "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/vimfiles/after"
+#define DFLT_RUNTIMEPATH       "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$HOME/vimfiles/after,$VIM/vimfiles/after"
 #define CLEAN_RUNTIMEPATH      "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
 
 #define CASE_INSENSITIVE_FILENAME   // ignore case when comparing file names

diff --git a/src/version.c b/src/version.c
index 5535b9a3570468a0d01ff7bd635faf1ee827b524..85f4db12b62f72482af79402fa3ec09f825f3730 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1650,
 /**/
     1649,
 /**/