jab2870/vim
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:Jab2870/vim

Browse source
This commit is contained in:
Jonathan Hodgson 2018-02-01 22:40:01 +00:00
commit d00a19e59a
17 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -56,3 +56,9 @@
[submodule "bundle/vim-es6"]
path = bundle/vim-es6
url = https://github.com/isRuslan/vim-es6.git
[submodule "bundle/phpcomplete.vim"]
path = bundle/phpcomplete.vim
url = https://github.com/shawncplus/phpcomplete.vim
[submodule "bundle/wordpress.vim"]
path = bundle/wordpress.vim
url = https://github.com/dsawardekar/wordpress.vim

11
.vimrc
View file

@ -262,6 +262,8 @@ endfunction
" Move lines up/down using arrow keys
nnoremap <Down> ddp
nnoremap <Up> ddkP
nnoremap <Right> xp
nnoremap <Left> xhP
" Activate spelling
nnoremap <F7> :set spell!<cr>
@ -310,7 +312,6 @@ iabbrev @@ jonathan@fellowshipproductions.co.uk
iabbrev @@@ jonathan@lunarweb.co.uk
" Start Screen Settings {{{1
fun! Start()
" Don't run if: we have commandline arguments, we don't have an empty
@ -363,7 +364,7 @@ augroup END
" Add Html maps, Currently only pandoc conversion {{{2
augroup html
autocmd!
" Run current line through pandoc.
" Run current line through pandoc.
" Convert from markdown to html
autocmd FileType html nnoremap <localleader>p :.!pandoc -t html -f markdown-auto_identifiers --wrap=preserve<cr>
"convert from html to markdown
@ -410,4 +411,10 @@ augroup detectES6
autocmd BufNew,BufNewFile,BufRead *.es6 :setlocal filetype=javascript
augroup END
""set htaccess variations to apache {{{2
augroup detectHtaccess
autocmd!
autocmd BufNew,BufNewFile,BufRead *.htaccess,*.localhtaccess,*.livehtaccess :setlocal filetype=apache
augroup END

2
bundle/emmet-vim

@ -1 +1 @@
Subproject commit ed79a9264d66def73c1ccc10198a58ebe1531ba4
Subproject commit 350f0ba10b9ee65837fc5b04a993b14a7a10e5ac

2
bundle/nerdtree

@ -1 +1 @@
Subproject commit 8a6ae7c6338378b6bb28ad0cf03e71ff0fd11a5a
Subproject commit 68572ef46143c5c7d420a6ec86f1ec4595765ce5

1
bundle/phpcomplete.vim Submodule

@ -0,0 +1 @@
Subproject commit 2c98f348d1192ec7793d93200ec7981fa0dd07fa

2
bundle/quicktex

@ -1 +1 @@
Subproject commit e49d7bd892fec29f0d96f3c96d9554d9a9a9376d
Subproject commit 75dcdd4cbfd5c9167044447a4922201ef630f246

2
bundle/united-front

@ -1 +1 @@
Subproject commit a8b3fc3762f3142c3a3f141e39ac23b759fe6582
Subproject commit 2320f65a364f82c1c019159e12b4f198e7e941f6

2
bundle/vim-airline

@ -1 +1 @@
Subproject commit 27acd851a780c563cb4807fc0ea3af9caccbb585
Subproject commit c2ffb8b3ec114301795036f7bf22995746d2acaf

2
bundle/vim-airline-themes

@ -1 +1 @@
Subproject commit af3292dbbb6d8abe35d0ad50bd86b6ac6219abb7
Subproject commit 4b7f77e770a2165726072a2b6f109f2457783080

2
bundle/vim-css3-syntax

@ -1 +1 @@
Subproject commit a552f6b7b299ba7138a34b4f3007eecc31e9f62b
Subproject commit 2ed61056a8e626394b63866ef6d58964d9544346

2
bundle/vim-fugitive

@ -1 +1 @@
Subproject commit 8f60d1d459362771cb68c0097565efdf52e62ec3
Subproject commit b82abd5bd583cfb90be63ae12adc36a84577bd45

2
bundle/vim-json

@ -1 +1 @@
Subproject commit f5e3181d0b33a9c51377bb7ea8492feddca8b503
Subproject commit 3727f089410e23ae113be6222e8a08dd2613ecf2

2
bundle/vim-pandoc

@ -1 +1 @@
Subproject commit fc209c66e937172efdd6db39ee64fcb3980ce329
Subproject commit 3a686781ab5ea622616798475deb394e48d3cc48

2
bundle/vim-rmarkdown

@ -1 +1 @@
Subproject commit 8c1c3979554bdff08239a2fe441af4d7dfeea8bc
Subproject commit 3de5ed4dbbdd58f436f2b9b3dad770e44db25831

2
bundle/vim-table-mode

@ -1 +1 @@
Subproject commit a646b4033ba86496ee0fff442ce8540551040275
Subproject commit bdd96b05cbaef55baf52bf79f765aad94f64941c

2
bundle/vimtex

@ -1 +1 @@
Subproject commit 770b5183d621eb5a0c8bbee7e05bbceff2d2c4f7
Subproject commit 51a7abefb5e321680eebb08007c1ca1356b90a5a

1
bundle/wordpress.vim Submodule

@ -0,0 +1 @@
Subproject commit 1d28c74c87d69f31e2768e57d3175a3a543e5a72