thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 9.0.1653: Amiga: default 'viewdir' may not work

Browse Source 
Problem:    Amiga: default 'viewdir' may not work.
Solution:   Use "home:" instead of "$VIM". Add a test. (Christian Brabandt,
            closes #12576)
This commit is contained in:
Christian Brabandt 2023-06-23 22:23:01 +01:00 committed by Bram Moolenaar
parent bd32e8ad8d
commit b8b1c8ebd4
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/options.txt
View File

@ -8912,9 +8912,9 @@ 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 "$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

2
src/os_amiga.h
View File

@ -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

4
src/testdir/setup.vim
View File

@ -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'

13
src/testdir/test_mksession.vim
View File

@ -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

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1653,
/**/
1652,
/**/