aboutsummaryrefslogtreecommitdiffstats
path: root/vim
diff options
context:
space:
mode:
Diffstat (limited to 'vim')
-rw-r--r--vim/ftplugin/mail.vim20
-rw-r--r--vim/vimrc5
2 files changed, 22 insertions, 3 deletions
diff --git a/vim/ftplugin/mail.vim b/vim/ftplugin/mail.vim
index 7b38173..49a1b8e 100644
--- a/vim/ftplugin/mail.vim
+++ b/vim/ftplugin/mail.vim
@@ -1,2 +1,18 @@
-set tw=78
-set fo+=aw
+set formatoptions=w
+
+" * <F1> to re-format the current paragraph correctly
+" * <F2> to format a line which is too long, and go to the next line
+" * <F3> to merge the previous line with the current one, with a correct
+" formatting (sometimes useful associated with <F2>)
+"
+" These keys might be used both in command mode and edit mode.
+"
+" <F1> might be smarter to use with the Mail_Del_Empty_Quoted() function
+" defined below
+
+nmap <F1> gqap
+nmap <F2> gqqj
+nmap <F3> kgqj
+map! <F1> <ESC>gqapi
+map! <F2> <ESC>gqqji
+map! <F3> <ESC>kgqji
diff --git a/vim/vimrc b/vim/vimrc
index 51f0672..5e2dac8 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -31,12 +31,13 @@ colorscheme Darkcustomside
" Smart Tabs (http://www.emacswiki.org/emacs/SmartTabs)
NeoBundle 'gustavo-hms/vim-smart-tabs'
+NeoBundle 'rust'
+
syntax on
filetype plugin indent on
set autoindent " always set autoindenting on
set copyindent " copy the previous indentation on autoindenting
set number " always show line numbers
-set showmatch " set show matching parenthesis
set smartcase " ignore case if search pattern is all lowercase,
" case-sensitive otherwise
set hlsearch " highlight search terms
@@ -99,3 +100,5 @@ autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
autocmd InsertLeave * match ExtraWhitespace /\s\+$/
autocmd BufWinLeave * call clearmatches()
+
+highlight Comment cterm=italic