Skip to content

Commit 858e185

Browse files
committed
vim: require Vim 7.4+ or Neovim 0.2.2+
Ubuntu xenial has Vim 7.4. Neovim 0.2.1 bumped its 'v:version' to 800. Neovim 0.2.2 is in Ubuntu bionic and Debian sid. Define commands outside of feature folds. 8.1.1210+ includes the +user_commands feature. Update termguicolor restrictions. Require Neovim v0.3.2+. neovim/neovim@98eaf60 Require Vim v8.1.0839+ with +vcon feature on Windows. vim/vim@f58d81a Unset $TERM in GUIs for fzf on Windows Workaround for junegunn/fzf#1677 (comment) Set nvim defaults in vimrc shared.vim should have shared defaults only. Reorder features in Vim 8.1.x.
1 parent 1d3a440 commit 858e185

File tree

5 files changed

+129
-124
lines changed

5 files changed

+129
-124
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
[![Build Status][Travis-Status]][Travis]
44

5-
Vim 8+ / Neovim 0.2+ config folder for Windows support and async jobs.
5+
Vim 8+ / Neovim 0.2.2+ config folder for Windows support and async jobs.
66

77
- `shared.vim` for shared code between Vim and Neovim
8-
- backward compatibility up to Vim 7.2 (tiny) and Neovim 0.1.6
8+
- backward compatibility up to Vim 7.4 (tiny) and Neovim 0.2.2
99
- self-contained vimrc, independent of the entire repo
1010
- [vim-plug][gh-vim-plug] as package manager for bundles in Github
1111
- `autoload/dotvim8.vim` resolves idiosyncrasies in Vim and Neovim, based on [fzf][gh-fzf]'s Vim plugin
@@ -21,17 +21,17 @@ For performance, use GUIs when navigating or editing inside folds.
2121

2222
## Editor Support
2323

24-
- Vim 7.3+ to be compatible with most plugins in Github
25-
- Neovim 0.2+ to use [fzf][gh-fzf] and async jobs in Windows
24+
- Vim 7.4+
25+
- Neovim 0.2.2+
2626
- gui: gvim, [nvim-qt][gh-nvim-qt]
2727

2828
## OS Support
2929

3030
- Linux
31-
- os: Ubuntu xenial, Debian stretch
31+
- os: Ubuntu xenial, bionic
3232
- terminal: sakura, tilda
3333
- Windows
34-
- os: 7, 8.1, 10
34+
- see https://github.com/lukesampson/scoop#requirements
3535
- terminal: ConEmu for truecolor (Neovim only)
3636

3737
## LICENSE

autoload/dotvim8.vim

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@ endif
1818
let g:loaded_autoload_dotvim8 = 1
1919
let s:cpoptions = &cpoptions
2020
set cpoptions&vim
21-
let s:has_term = has('nvim') ?
22-
\ (has('nvim-0.2.1') || !has('win32')) :
23-
\ (has('terminal') && has('patch-8.0.1108'))
24-
let s:has_job = has('nvim') ?
25-
\ (has('nvim-0.2') || !has('win32')) :
26-
\ (has('job') && has('channel') && has('patch-8.0.87'))
21+
let s:has_term = has('nvim') || (has('terminal') && has('patch-8.0.1108'))
22+
let s:has_job = has('nvim') || (has('job') && has('channel')
23+
\ && has('patch-8.0.87'))
2724

2825
function! s:escape_ex(cmd)
2926
return escape(a:cmd, '%#!')

init.vim

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,20 @@
1212
" See the License for the specific language governing permissions and
1313
" limitations under the License.
1414
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
15-
if has('nvim-0.2')
16-
set inccommand=nosplit
17-
else
18-
let g:loaded_python_provider = 1
19-
let g:loaded_python3_provider = 1
20-
endif
15+
set inccommand=nosplit
2116

22-
if has('nvim-0.3')
23-
if has('win32') && $TERM =~# 'cygwin' && executable('cygpath.exe')
24-
let s:msys_root = get(split(system('cygpath.exe -w /'), "\n"), 0, '')
25-
if isdirectory(s:msys_root)
26-
let s:terminfo = s:msys_root.'usr\share\terminfo'
27-
if empty($TERMINFO) && isdirectory(s:terminfo)
28-
let $TERMINFO = s:terminfo
29-
endif
30-
unlet s:terminfo
17+
if !has('nvim-0.3.2') && has('win32') && $TERM =~# 'cygwin' && executable('cygpath.exe')
18+
let s:msys_root = get(split(system('cygpath.exe -w /'), "\n"), 0, '')
19+
if isdirectory(s:msys_root) && empty($TERMINFO)
20+
let s:terminfo = s:msys_root.'usr\share\terminfo'
21+
if isdirectory(s:terminfo)
22+
let $TERMINFO = s:terminfo
3123
endif
32-
unlet s:msys_root
24+
unlet s:terminfo
3325
endif
34-
else
26+
unlet s:msys_root
27+
endif
28+
if !has('nvim-0.3')
3529
let g:loaded_node_provider = 1
3630
let g:loaded_ruby_provider = 1
3731

0 commit comments

Comments
 (0)