diff options
Diffstat (limited to 'autoload')
| -rw-r--r-- | autoload/csv.vim | 4 | ||||
| -rw-r--r-- | autoload/go/config.vim | 20 |
2 files changed, 6 insertions, 18 deletions
diff --git a/autoload/csv.vim b/autoload/csv.vim index 28d85b63..a86e0b2d 100644 --- a/autoload/csv.vim +++ b/autoload/csv.vim @@ -267,7 +267,7 @@ fu! csv#GetPat(colnr, maxcolnr, pat, allowmore) "{{{3 " Allow space in front of the pattern, so that it works correctly " even if :Arrange Col has been used #100 return '^' . csv#GetColPat(a:colnr - 1,0) . - \ '\s*\zs' . a:pat . '\ze' . (a:allowmore ? '' : '$') + \ '.*\zs' . a:pat . '\ze' . (a:allowmore ? '' : '$') else return '\%' . b:csv_fixed_width_cols[-1] . \ 'c\zs' . a:pat . '\ze' . (a:allowmore ? '' : '$') @@ -504,7 +504,7 @@ fu! csv#WColumn(...) "{{{3 " Return on which column the cursor is let _cur = getpos('.') if !exists("b:csv_fixed_width_cols") - if line('.') > 1 && mode('') != 'n' + if line('.') > 1 && mode('') != 'n' && empty(getline('.')[0:col('.')-1]) " in insert mode, get line from above, just in case the current " line is empty let line = getline(line('.')-1) diff --git a/autoload/go/config.vim b/autoload/go/config.vim index a7fd29f9..9ab85637 100644 --- a/autoload/go/config.vim +++ b/autoload/go/config.vim @@ -170,8 +170,8 @@ function! go#config#EchoCommandInfo() abort endfunction function! go#config#DocUrl() abort - let godoc_url = get(g:, 'go_doc_url', 'https://godoc.org') - if godoc_url isnot 'https://godoc.org' + let godoc_url = get(g:, 'go_doc_url', 'https://pkg.go.dev') + if godoc_url isnot 'https://pkg.go.dev' " strip last '/' character if available let last_char = strlen(godoc_url) - 1 if godoc_url[last_char] == '/' @@ -266,23 +266,11 @@ function! go#config#MetalinterCommand() abort endfunction function! go#config#MetalinterAutosaveEnabled() abort - let l:default_enabled = ["vet", "golint"] - - if go#config#MetalinterCommand() == "golangci-lint" - let l:default_enabled = ["govet", "golint"] - endif - - return get(g:, "go_metalinter_autosave_enabled", default_enabled) + return get(g:, "go_metalinter_autosave_enabled", ["govet", "golint"]) endfunction function! go#config#MetalinterEnabled() abort - let l:default_enabled = ["vet", "golint", "errcheck"] - - if go#config#MetalinterCommand() == "golangci-lint" - let l:default_enabled = ["govet", "golint"] - endif - - return get(g:, "go_metalinter_enabled", default_enabled) + return get(g:, "go_metalinter_enabled", ["vet", "golint", "errcheck"]) endfunction function! go#config#GolintBin() abort |