Added formatoptions.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index b3a506dd7566768cb61f5eaa178696b503983af3..7f8700e667e99334f5098bc35012278b8d0196c8 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -27,8 +27,10 @@ set autoindent
 
 " Activate lines display.
 set number
-" Display the ruler.
+" Display the ruler with current line/file position.
 set ruler
+" Display partial commands in the status line.
+set showcmd
 
 " Activate syntax folding.
 set foldmethod=syntax
@@ -50,6 +52,14 @@ set nojoinspaces
 " Allow backspacing over autoindent, line breaks and insert mode starts.
 set backspace=indent,eol,start
 
+" Add a comment when hitting enter after a commented line (r) and when using o
+" or O around a commented line (o).
+set formatoptions+=ro
+" Don't break a line if was already longer then 'textwidth' when insert mode
+" started.
+set formatoptions+=l
+
+
 " Don't use any modelines.
 set nomodeline
 
@@ -68,6 +78,12 @@ set background=dark
 let mapleader = ","
 let maplocalleader = ","
 
+" Settings for the NERD commenter.
+" Don't create any mappings I don't want to use.
+let NERDCreateDefaultMappings=0
+" Map toggle comment.
+map <Leader><Leader> <plug>NERDCommenterToggle
+
 " I often type "W" instead of "w" when trying to save a file. Fix my mistake.
 cmap W w
 cmap Wq wq