X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=inline;f=vimrc;h=3528719c8ec065b6f0c02f076554596fc102b11e;hb=7edaacb627e6c120a019150d0d17c6adf25f3b8a;hp=a8f944675020e815c8b2d74c0f9c593d3b1dc773;hpb=16d6835e7f6cce9c384e65e84ddc9114297a5b6a;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index a8f9446..3528719 100644
--- 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,9 +52,18 @@ set nojoinspaces
 " Allow backspacing over autoindent, line breaks and insert mode starts.
 set backspace=indent,eol,start
 
+" Start 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
 
+
 " When completing paths first use the longest path then display a list of all
 " possible files.
 set wildmode=longest,list
@@ -64,6 +75,21 @@ set cursorline
 set background=dark
 
 
+" Use "," as my mapleader.
+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
+
+
 " Disable Apple style movements in MacVim.
 if has("gui_macvim")
     let macvim_skip_cmd_opt_movement = 1