diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/api/window.c | 4 | ||||
| -rw-r--r-- | src/nvim/option.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/Makefile | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test105.in | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test105.ok | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 12 |
6 files changed, 15 insertions, 15 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 548d8171a5..1ab441bed3 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -35,7 +35,7 @@ Buffer window_get_buffer(Window window, Error *err) /// @return the (row, col) tuple Position window_get_cursor(Window window, Error *err) { - Position rv = {.row = 0, .col = 0}; + Position rv = POSITION_INIT; win_T *win = find_window_by_handle(window, err); if (win) { @@ -245,7 +245,7 @@ void window_set_option(Window window, String name, Object value, Error *err) /// @return The (row, col) tuple with the window position Position window_get_position(Window window, Error *err) { - Position rv; + Position rv = POSITION_INIT; win_T *win = find_window_by_handle(window, err); if (win) { diff --git a/src/nvim/option.c b/src/nvim/option.c index a878ba6455..6eac1033c4 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -6850,7 +6850,7 @@ void check_win_options(win_T *win) /* * Check for NULL pointers in a winopt_T and replace them with empty_option. */ -void check_winopt(winopt_T *wop) +static void check_winopt(winopt_T *wop) { check_string_option(&wop->wo_fdi); check_string_option(&wop->wo_fdm); diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index db88755a01..92fd47ff6b 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -90,7 +90,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) test1.out RM_ON_RUN := test.out X* viminfo RM_ON_START := tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok -RUN_VIM := export VIMRUNTIME=$(SCRIPTSOURCE); $(TOOL) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in +RUN_VIM := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in clean: -rm -rf *.out \ diff --git a/src/nvim/testdir/test105.in b/src/nvim/testdir/test105.in index 73d92e899d..bfb4b65fbb 100644 --- a/src/nvim/testdir/test105.in +++ b/src/nvim/testdir/test105.in @@ -7,7 +7,7 @@ STARTTEST :set shellslash :let tab="\t" :command -nargs=1 Put :let expr=<q-args> | $put =expr.tab.strtrans(string(eval(expr))) -:let $HOME=fnamemodify('.', ':p:h:h:h:h') +:let $HOME=fnamemodify('.', ':p:h:h:h') :Put fnamemodify('.', ':p' )[-1:] :Put fnamemodify('.', ':p:h' )[-1:] :Put fnamemodify('test.out', ':p' )[-1:] @@ -23,7 +23,7 @@ STARTTEST :Put fnamemodify('abc.fb2.tar.gz', ':r' ) :Put fnamemodify('abc.fb2.tar.gz', ':r:r' ) :Put fnamemodify('abc.fb2.tar.gz', ':r:r:r' ) -:Put substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/nvim/testdir/.*\)', '\1', '') +:Put substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(nvim/testdir/.*\)', '\1', '') :Put fnamemodify('abc.fb2.tar.gz', ':e' ) :Put fnamemodify('abc.fb2.tar.gz', ':e:e' ) :Put fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) diff --git a/src/nvim/testdir/test105.ok b/src/nvim/testdir/test105.ok index be1eca8f8f..0b30ee4281 100644 --- a/src/nvim/testdir/test105.ok +++ b/src/nvim/testdir/test105.ok @@ -3,8 +3,8 @@ fnamemodify('.', ':p:h' )[-1:] 'r' fnamemodify('test.out', ':p' )[-1:] 't' fnamemodify('test.out', ':.' ) 'test.out' fnamemodify('../testdir/a', ':.' ) 'a' -fnamemodify('test.out', ':~' ) '~/src/nvim/testdir/test.out' -fnamemodify('../testdir/a', ':~' ) '~/src/nvim/testdir/a' +fnamemodify('test.out', ':~' ) '~/nvim/testdir/test.out' +fnamemodify('../testdir/a', ':~' ) '~/nvim/testdir/a' fnamemodify('../testdir/a', ':t' ) 'a' fnamemodify('.', ':p:t' ) '' fnamemodify('test.out', ':p:t' ) 'test.out' @@ -13,7 +13,7 @@ fnamemodify('test.out', ':p:t:e' ) 'out' fnamemodify('abc.fb2.tar.gz', ':r' ) 'abc.fb2.tar' fnamemodify('abc.fb2.tar.gz', ':r:r' ) 'abc.fb2' fnamemodify('abc.fb2.tar.gz', ':r:r:r' ) 'abc' -substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/nvim/testdir/.*\)', '\1', '') 'src/nvim/testdir/abc.fb2' +substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(nvim/testdir/.*\)', '\1', '') 'nvim/testdir/abc.fb2' fnamemodify('abc.fb2.tar.gz', ':e' ) 'gz' fnamemodify('abc.fb2.tar.gz', ':e:e' ) 'tar.gz' fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) 'fb2.tar.gz' diff --git a/src/nvim/version.c b/src/nvim/version.c index 5684a3f8d8..b164f94bb1 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -256,7 +256,7 @@ static int included_patches[] = { //342 NA //341, //340 NA - //339, + 339, 338, //337, //336, @@ -299,7 +299,7 @@ static int included_patches[] = { //299 NA 298, //297, - //296, + 296, 295, 294, 293, @@ -375,7 +375,7 @@ static int included_patches[] = { //223 NA //222 NA 221, - //220, + 220, 219, 218, //217 NA @@ -406,11 +406,11 @@ static int included_patches[] = { 192, 191, //190 NA - //189, + //189 NA //188 NA 187, 186, - //185, + //185 NA 184, //183 NA //182 NA @@ -419,7 +419,7 @@ static int included_patches[] = { //179 NA 178, //177 NA - //176, + //176 NA //175 NA //174 NA 173, |