viewdir: make it writable by default on Windows + Amiga

fixes vim#12119
chrisbra · Jun 22, 2023 · a62820d · a62820d
1 parent 7f29122
commit a62820d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
@@ -8913,7 +8913,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'viewdir'* *'vdir'*
 'viewdir' 'vdir'	string	(default for Amiga and Win32:
-							 "$VIM/vimfiles/view",
+							 "$HOME/vimfiles/view",
 				 for Unix: "~/.vim/view",
 				 for macOS: "$VIM:vimfiles:view"
 				 for VMS: "sys$login:vimfiles/view")

diff --git a/src/os_amiga.h b/src/os_amiga.h
@@ -199,7 +199,7 @@ typedef long off_t;
 #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_MAXMEM

diff --git 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

diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim
@@ -30,6 +30,8 @@ if 1
   " Avoid storing shell history.
   let $HISTFILE = ""
 
+  " have $HOME available as $ORIGHOME (required for test_mksession)
+  let $ORIGHOME = $HOME
   " Make sure $HOME does not get read or written.
   " It must exist, gnome tries to create $HOME/.gnome2
   let $HOME = getcwd() . '/XfakeHOME'

diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
@@ -1262,4 +1262,15 @@ func Test_mkview_manual_fold()
   bw!
 endfunc
 
+" Test Viewdir is in $HOME
+func Test_mkview_default_home()
+  if !has('win32') || !has('unix')
+    throw 'Skipped: only runs on MS-Windows or Unix'
+  endif
+  " We don't want Vim to potentially create $viewdir for the user that is
+  " running the test, so therefore just test that it points to $HOME
+  " and assume that will be writable.
+  call assert_equal(0, stridx(&viewdir, $ORIGHOME))
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab