From 8973d0955440ac1cd821f78128596485c6f41280 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher <nicolasgallagher@gmail.com>
Date: Sun, 24 Nov 2013 12:37:10 -0800
Subject: [PATCH] vim: fix buggy console vim rendering

The `lines` setting has unintended consequences when using vim in a
terminal. The rendering of lines is all messed up. Moving the `lines`
setting to `.gvimrc` fixes the problem.

Fix gh-22
---
 vim/gvimrc | 2 ++
 vim/vimrc  | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vim/gvimrc b/vim/gvimrc
index 530f99832..e062049c7 100644
--- a/vim/gvimrc
+++ b/vim/gvimrc
@@ -10,3 +10,5 @@ set gcr=n:blinkon0
 set linespace=5
 " Set GUI font
 set guifont=Monaco:h13
+" Increase the default number of lines and columns
+set lines=999 columns=999
diff --git a/vim/vimrc b/vim/vimrc
index 250c76c46..9ef97fbd9 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -108,8 +108,6 @@ set expandtab
 set number
 " Highlight current line
 set cursorline
-" Increase default number of lines
-set lines=40
 " Start scrolling three lines before the horizontal window border
 set scrolloff=3
 " Don’t reset cursor to start of line when moving around.