summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuval Adam <yuv.adm@gmail.com>2012-01-26 13:19:08 +0200
committerYuval Adam <yuv.adm@gmail.com>2012-01-26 13:19:08 +0200
commit7bfd48bfbba0b371acb528518d4d52a6d703c8d5 (patch)
tree9df3441b85a34ad058f4bc616396e99e9b1b29bc
parentd4001e654c7b40d6df1e93998876cb93d2b121df (diff)
parente1b553f4d166a0208b571b4f0b0570173cb9ca2f (diff)
Merge branch 'master' of github.com:yuvadm/configurations
-rw-r--r--.vimrc22
1 files changed, 10 insertions, 12 deletions
diff --git a/.vimrc b/.vimrc
index 8e2e5af..a92a1e0 100644
--- a/.vimrc
+++ b/.vimrc
@@ -4,17 +4,15 @@ colorscheme solarized
set nocompatible
set encoding=utf-8
-set showcmd " display incomplete commands
-filetype plugin indent on " load file type plugins + indentation
+set showcmd
+filetype plugin indent on
-"" Whitespace
-set nowrap " don't wrap lines
-set tabstop=4 shiftwidth=4 " a tab is two spaces
-set expandtab " use spaces, not tabs
-set backspace=indent,eol,start " backspace through everything in insert mode
+set nowrap
+set tabstop=4 shiftwidth=4
+set expandtab
+set backspace=indent,eol,start
-"" Searching
-set hlsearch " highlight matches
-set incsearch " incremental searching
-set ignorecase " searches are case insensitive...
-set smartcase " ... unless they contain at least one capital letter
+set hlsearch
+set incsearch
+set ignorecase
+set smartcase