merge

fa62c260 · Murukesh Mohanan · 5b79dc84 · c85b47f7 · fa62c260 · fa62c260
Commit fa62c260 authored Aug 31, 2016 by Murukesh Mohanan
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

ftplugin/tex.vim ftplugin/tex.vim +1 -1

spell/en.utf-8.add spell/en.utf-8.add +2 -0

vimrc vimrc +1 -1

No files found.
--- a/ftplugin/tex.vim
+++ b/ftplugin/tex.vim
@@ -5,7 +5,7 @@ setlocal spell spelllang=en_gb
 autocmd CursorHold <buffer> update

 inoremap <buffer> $ $$<left>
-inoremap <buffer> gls \gls{}<left>
+inoremap <buffer> <leader>g \gls{}<left>
 inoremap <buffer> glr \gls{rsa}
 inoremap <buffer> glg \gls{gpg}
 inoremap <buffer> glf \gls{fr}

--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -72,3 +72,5 @@ manpages
 filetype
 QEMU
 deduplication
+ciphertext
+ciphertexts
--- a/vimrc
+++ b/vimrc
@@ -194,7 +194,7 @@ let g:ctrlp_prompt_mappings = {
 let g:ctrlp_max_depth = 40
 let g:ctrlp_max_files = 10000
 let g:ctrlp_custom_ignore = {
-			\ 'dir': '\v[\/](plugged|undo|view|\.git)$'
+			\ 'dir': '\v[\/](plugged|undo|view|\.git|_site)$'
 			\ }
 let g:DiffColors = 100
 let g:DiffUnit = "Word3"