From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 16 Jun 2009 18:05:03 +0000 (+0200)
Subject: Merge commit 'rammstein/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=6f2cf38580db0de26020a1fc5bff4986c263cae9;p=config%2Fdotfiles.git

Merge commit 'rammstein/master'

Conflicts:

	vimrc
---

6f2cf38580db0de26020a1fc5bff4986c263cae9
diff --cc vimrc
index b200fa4,7d8ebf3..95318fe
--- a/vimrc
+++ b/vimrc
@@@ -174,8 -173,9 +174,9 @@@ els
  endif
  
  " Make sure xa0 (alt + space) is automatically changed to a normal whitespace
- " if pressed accidentally while in insert mode (happens on Mac sometimes).
+ " if pressed accidentally while in insert mode (happens on Mac when alt
+ " doesn't send escape).
 -if has("mac")
 +if has('mac')
      imap <Char-0xa0> <Space>
  endif