aboutsummaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
Diffstat (limited to 'vim')
m---------vim/bundle/copy_linebreak0
m---------vim/bundle/mail_mutt0
m---------vim/bundle/redact_pass0
-rw-r--r--vim/filetype.vim2
-rw-r--r--vim/vimrc15
5 files changed, 6 insertions, 11 deletions
diff --git a/vim/bundle/copy_linebreak b/vim/bundle/copy_linebreak
-Subproject 3448f6ae2bc974af48fb16aaabff85fe1bc250e
+Subproject 21c7d37dd2806034dcad7f1ee2334f685874e38
diff --git a/vim/bundle/mail_mutt b/vim/bundle/mail_mutt
deleted file mode 160000
-Subproject 3e0e4306641a759758a4eb746708f0efec9cc7e
diff --git a/vim/bundle/redact_pass b/vim/bundle/redact_pass
-Subproject 97e019dbe8459d34108212e905b63142ac19410
+Subproject 095a09fe160e9b342c817a5a2df075f9256242c
diff --git a/vim/filetype.vim b/vim/filetype.vim
index ccb38ca3..d7cafef9 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -175,7 +175,7 @@ augroup filetypedetect
\ setfiletype tsv
" VimL files
autocmd BufNewFile,BufRead
- \ *.vim,vimrc,*[._]vimrc,exrc,*[._]exrc
+ \ *.vim,vimrc,*[._]vimrc,gvimrc,*[._]gvimrc,exrc,*[._]exrc
\ setfiletype vim
" .viminfo files
autocmd BufNewFile,BufRead
diff --git a/vim/vimrc b/vim/vimrc
index 723e69da..f5a2ac85 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -363,9 +363,11 @@ nnoremap <silent> <Leader>w :<C-U>set wrap! wrap?<CR>
" column with @ symbols instead, which I don't find very helpful
set display=lastline
-" Clearly show when the start or end of the row does not correspond to the
-" start and end of the line
-set listchars+=precedes:<,extends:>
+" Define list characters
+set listchars+=extends:> " Unwrapped text to screen right
+set listchars+=precedes:< " Unwrapped text to screen left
+set listchars+=tab:>- " Tab characters, preserve width
+set listchars+=trail:_ " Trailing spaces
" Swap the j/gj and k/gk command pairs so that we move by screen row, not
" buffer line, with j/k
@@ -428,13 +430,6 @@ nmap ]<Space> <Plug>PutBlankLinesBelow
" \b toggles copy-pasteable linebreak settings
nmap <Leader>b <Plug>CopyLinebreakToggle
-" \m in visual/select mode starts a mail message with the selected lines
-vmap <Leader>m <Plug>MailMuttSelected
-" \m in normal mode starts a mail message with the current line
-nmap <Leader>m <Plug>MailMuttLine
-" \M in normal mode starts a mail message with the whole buffer
-nmap <Leader>M <Plug>MailMuttBuffer
-
" \x strips trailing whitespace via a custom plugin
nmap <Leader>x <Plug>StripTrailingWhitespace