Mercurial > vim

changeset 32637:39cade5fb57a v9.0.1650

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1650: MS-Windows: default 'viewdir' may include read-only directory Commit: https://github.com/vim/vim/commit/801961d2c2876e5d2d0b52a585b9d04535168ebd Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jun 23 16:15:13 2023 +0100 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 https://github.com/vim/vim/issues/12119)
author Bram Moolenaar <Bram@vim.org>
date Fri, 23 Jun 2023 17:30:06 +0200
parents b03e568da2b9
children a977b192e348
files runtime/doc/options.txt src/os_dos.h src/version.c
diffstat 3 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -8912,11 +8912,11 @@ A jump table for the options with a shor
 	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}
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1650,
+/**/
     1649,
 /**/
     1648,