summaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2016-03-23 23:25:33 +0000
committerUrbain Vaes <urbain@vaes.uk>2016-03-23 23:25:33 +0000
commitc96931ff008e7be08fbfc6287d3af8fcb2205006 (patch)
tree76d6c512816163ff025d664a667e2587958face3 /vim
parente1145d4fa9cad91e2e1e5d63151b802b9039adcd (diff)
Update hook website
Diffstat (limited to 'vim')
-rw-r--r--vim/after/ftplugin/freefem/folding.vim20
-rw-r--r--vim/vimrc11
2 files changed, 28 insertions, 3 deletions
diff --git a/vim/after/ftplugin/freefem/folding.vim b/vim/after/ftplugin/freefem/folding.vim
new file mode 100644
index 0000000..7d2f6fd
--- /dev/null
+++ b/vim/after/ftplugin/freefem/folding.vim
@@ -0,0 +1,20 @@
+function! FreeFemFolds()
+ let thisline = getline(v:lnum)
+ if match(thisline,'^/// ') >= 0
+ return ">1"
+ else
+ return "="
+ endif
+endfunction
+
+function! FreeFemFoldText()
+ let startline = getline(v:foldstart)
+ if match(startline,'^/// ') >= 0
+ let title = substitute(startline,'^/// \(.*\)$','\1',"")
+ return '# ' . title
+ endif
+endfunction
+
+setlocal foldmethod=expr
+setlocal foldexpr=FreeFemFolds()
+setlocal foldtext=FreeFemFoldText()
diff --git a/vim/vimrc b/vim/vimrc
index 69d2ea8..d0f6a78 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -27,6 +27,9 @@ Plug 'honza/vim-snippets'
Plug 'jamessan/vim-gnupg'
Plug 'junegunn/seoul256.vim'
Plug 'junegunn/vim-easy-align'
+xmap ga <Plug>(EasyAlign)
+nmap ga <Plug>(EasyAlign)
+
Plug 'junegunn/vim-peekaboo'
Plug 'junegunn/vim-pseudocl'
Plug 'junegunn/vim-oblique'
@@ -71,7 +74,10 @@ Plug 'tpope/vim-commentary'
Plug 'tpope/vim-dispatch'
Plug 'tpope/vim-eunuch'
Plug 'tpope/vim-flagship'
-function Mixed_indent()
+let g:tabprefix = ""
+let g:tablabel = "%N%{flagship#tabmodified()} %{flagship#tabcwds('shorten',',')}"
+
+function! Mixed_indent()
let l:spaces=search('\v(^ +)','n')
let l:tabs=search('\v(^\t+)','n')
return (l:spaces * l:tabs > 0)
@@ -134,7 +140,6 @@ call plug#end()
let g:tex_conceal= 'adgm'
let g:tex_flavor='latex'
-let g:tabprefix = ""
"" Vim options
@@ -273,7 +278,7 @@ if has("nvim")
nnoremap <a-w> :w<cr>
nnoremap <a-d> :q<cr>
- nnoremap <a-cr> :tabnew<cr>
+ nnoremap <a-t> :tabnew<cr>
nnoremap <a-b> :CtrlPBuffer<cr>
nnoremap <a-f> :CtrlP<cr>