Mercurial > vim
changeset 32643:852040d9b096 v9.0.1653
patch 9.0.1653: Amiga: default 'viewdir' may not work
Commit: https://github.com/vim/vim/commit/b8b1c8ebd4e62d4567aa16b57b25823b80bfc76f
Author: Christian Brabandt <cb@256bit.org>
Date: Fri Jun 23 22:23:01 2023 +0100
patch 9.0.1653: Amiga: default 'viewdir' may not work
Problem: Amiga: default 'viewdir' may not work.
Solution: Use "home:" instead of "$VIM". Add a test. (Christian Brabandt,
closes #12576)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 23 Jun 2023 23:30:04 +0200 |
| parents | c16adfd4e94f |
| children | 09725bcf05bd |
| files | runtime/doc/options.txt src/os_amiga.h src/testdir/setup.vim src/testdir/test_mksession.vim src/version.c |
| diffstat | 5 files changed, 22 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -8912,9 +8912,9 @@ A jump table for the options with a shor displayed when 'verbosefile' is set. *'viewdir'* *'vdir'* -'viewdir' 'vdir' string (default for Amiga "$VIM/vimfiles/view", +'viewdir' 'vdir' string (default for Amiga "home:vimfiles/view", for Win32: "$HOME/vimfiles/view", - for Unix: "~/.vim/view", + for Unix: "$HOME/.vim/view", for macOS: "$VIM/vimfiles/view" for VMS: "sys$login:vimfiles/view") global
--- 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
--- a/src/testdir/setup.vim +++ b/src/testdir/setup.vim @@ -30,6 +30,10 @@ if 1 " Avoid storing shell history. let $HISTFILE = "" + " Have current $HOME available as $ORIGHOME. $HOME is used for option + " defaults before we get here, and test_mksession checks that. + 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'
--- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -1262,4 +1262,17 @@ func Test_mkview_manual_fold() bw! endfunc +" Test default 'viewdir' value +func Test_mkview_default_home() + if has('win32') + call assert_match('^' .. $ORIGHOME .. '/vimfiles', &viewdir) + elseif has('unix') + call assert_match('^' .. $ORIGHOME .. '/.vim', &viewdir) + elseif has('amiga') + call assert_match('^home:vimfiles', &viewdir) + elseif has('mac') + call assert_match('^' .. $VIM .. '/vimfiles', &viewdir) + endif +endfunc + " vim: shiftwidth=2 sts=2 expandtab