From b47295518fdaafcb04d90e7fc65affcebe357654 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Fri, 23 Oct 2015 12:29:26 +0100 Subject: [PATCH 01/10] Fold blocks by syntax --- vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/vimrc b/vimrc index fa6fc1e..0241130 100644 --- a/vimrc +++ b/vimrc @@ -13,6 +13,7 @@ set cursorline set directory=$TEMP//,/tmp//,. set encoding=utf-8 set expandtab +set foldmethod=syntax set ignorecase set linebreak set list From 71a2f75e78add97ea0978d50183183bf26c7bf8b Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Mon, 26 Oct 2015 16:06:43 +0000 Subject: [PATCH 02/10] Add lightline --- .gitmodules | 3 +++ bundle/lightline.vim | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/lightline.vim diff --git a/.gitmodules b/.gitmodules index 9f45c9a..85c1802 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "bundle/jellybeans.vim"] path = bundle/jellybeans.vim url = https://github.com/nanotech/jellybeans.vim.git +[submodule "bundle/lightline.vim"] + path = bundle/lightline.vim + url = https://github.com/itchyny/lightline.vim.git diff --git a/bundle/lightline.vim b/bundle/lightline.vim new file mode 160000 index 0000000..47a9f87 --- /dev/null +++ b/bundle/lightline.vim @@ -0,0 +1 @@ +Subproject commit 47a9f8776f84385273db1c7b0e73e3881c0a5073 From 995652c050018becdc103b09998b6d277c0c75e7 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Mon, 26 Oct 2015 16:07:38 +0000 Subject: [PATCH 03/10] Remove airline --- .gitmodules | 3 --- bundle/vim-airline | 1 - 2 files changed, 4 deletions(-) delete mode 160000 bundle/vim-airline diff --git a/.gitmodules b/.gitmodules index 85c1802..144c4e3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,9 +19,6 @@ [submodule "bundle/vim-indent-guides"] path = bundle/vim-indent-guides url = https://github.com/nathanaelkane/vim-indent-guides.git -[submodule "bundle/vim-airline"] - path = bundle/vim-airline - url = https://github.com/bling/vim-airline.git [submodule "bundle/vim-surround"] path = bundle/vim-surround url = https://github.com/tpope/vim-surround.git diff --git a/bundle/vim-airline b/bundle/vim-airline deleted file mode 160000 index 14d14cf..0000000 --- a/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 14d14cf951c08fc88ca6c3e6f28fe47b99421e23 From ab0a6cff557c16c2770e325ed57fcfd4daa359cd Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Tue, 27 Oct 2015 09:26:32 +0000 Subject: [PATCH 04/10] Use default list characters --- vimrc | 1 - 1 file changed, 1 deletion(-) diff --git a/vimrc b/vimrc index 0241130..0c4baa1 100644 --- a/vimrc +++ b/vimrc @@ -17,7 +17,6 @@ set foldmethod=syntax set ignorecase set linebreak set list -set listchars="tab:> ,trail:$,extends:>,precedes:<,nbsp:+" set modelines=0 set number set omnifunc=syntaxcomplete#Complete From 73c1ed23bed54b02565f22ee85709568f7813f67 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Tue, 27 Oct 2015 14:55:17 +0000 Subject: [PATCH 05/10] Revert "Remove airline" This reverts commit 995652c050018becdc103b09998b6d277c0c75e7. --- .gitmodules | 3 +++ bundle/vim-airline | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/vim-airline diff --git a/.gitmodules b/.gitmodules index 144c4e3..85c1802 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,6 +19,9 @@ [submodule "bundle/vim-indent-guides"] path = bundle/vim-indent-guides url = https://github.com/nathanaelkane/vim-indent-guides.git +[submodule "bundle/vim-airline"] + path = bundle/vim-airline + url = https://github.com/bling/vim-airline.git [submodule "bundle/vim-surround"] path = bundle/vim-surround url = https://github.com/tpope/vim-surround.git diff --git a/bundle/vim-airline b/bundle/vim-airline new file mode 160000 index 0000000..14d14cf --- /dev/null +++ b/bundle/vim-airline @@ -0,0 +1 @@ +Subproject commit 14d14cf951c08fc88ca6c3e6f28fe47b99421e23 From c451c9e6142720e6a28948d059538a04017c477f Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Tue, 27 Oct 2015 14:55:58 +0000 Subject: [PATCH 06/10] Revert "Add lightline" This reverts commit 71a2f75e78add97ea0978d50183183bf26c7bf8b. --- .gitmodules | 3 --- bundle/lightline.vim | 1 - 2 files changed, 4 deletions(-) delete mode 160000 bundle/lightline.vim diff --git a/.gitmodules b/.gitmodules index 85c1802..9f45c9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,3 @@ [submodule "bundle/jellybeans.vim"] path = bundle/jellybeans.vim url = https://github.com/nanotech/jellybeans.vim.git -[submodule "bundle/lightline.vim"] - path = bundle/lightline.vim - url = https://github.com/itchyny/lightline.vim.git diff --git a/bundle/lightline.vim b/bundle/lightline.vim deleted file mode 160000 index 47a9f87..0000000 --- a/bundle/lightline.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 47a9f8776f84385273db1c7b0e73e3881c0a5073 From 15a6ff7e627b0c4111dd1b432e6033c02f4d1858 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Tue, 3 Nov 2015 09:35:22 +0000 Subject: [PATCH 07/10] Prevent error if foldmethod doesn't work --- vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 0c4baa1..34dcc59 100644 --- a/vimrc +++ b/vimrc @@ -13,7 +13,6 @@ set cursorline set directory=$TEMP//,/tmp//,. set encoding=utf-8 set expandtab -set foldmethod=syntax set ignorecase set linebreak set list @@ -32,6 +31,7 @@ set ttyfast set wrap silent! colorscheme desert silent! filetype plugin indent on +silent! set foldmethod=syntax silent! syntax on if has("gui_running") From c496deccd30cc202fa571bd916d1e96742e044c8 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Wed, 4 Nov 2015 10:42:47 +0000 Subject: [PATCH 08/10] Highlight the column *after* the last --- vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 34dcc59..6ee2d76 100644 --- a/vimrc +++ b/vimrc @@ -26,7 +26,7 @@ set shiftwidth=4 set smartcase set spl=en_gb nospell set tabstop=4 -set textwidth=72 +set textwidth=73 set ttyfast set wrap silent! colorscheme desert From 421d79a45db1f176b2e4217e330b00c926993480 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Wed, 4 Nov 2015 10:48:14 +0000 Subject: [PATCH 09/10] Correct commit c496deccd30cc202fa571bd916d1e96742e044c8 --- vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vimrc b/vimrc index 6ee2d76..47b740b 100644 --- a/vimrc +++ b/vimrc @@ -7,7 +7,7 @@ nmap :wincmd l nmap :wincmd k set autoindent set background=dark -set colorcolumn=72 +set colorcolumn=73 set cursorcolumn set cursorline set directory=$TEMP//,/tmp//,. @@ -26,7 +26,7 @@ set shiftwidth=4 set smartcase set spl=en_gb nospell set tabstop=4 -set textwidth=73 +set textwidth=72 set ttyfast set wrap silent! colorscheme desert From 932276ed3d0904fc5642934b615a9858f65bca5f Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Fri, 13 Nov 2015 09:11:01 +0000 Subject: [PATCH 10/10] Add GnuPG plugin --- .gitmodules | 3 +++ bundle/vim-gnupg | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/vim-gnupg diff --git a/.gitmodules b/.gitmodules index 9f45c9a..20c87b6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "bundle/jellybeans.vim"] path = bundle/jellybeans.vim url = https://github.com/nanotech/jellybeans.vim.git +[submodule "bundle/vim-gnupg"] + path = bundle/vim-gnupg + url = https://github.com/jamessan/vim-gnupg.git diff --git a/bundle/vim-gnupg b/bundle/vim-gnupg new file mode 160000 index 0000000..ccdf455 --- /dev/null +++ b/bundle/vim-gnupg @@ -0,0 +1 @@ +Subproject commit ccdf455426cd7538de0139ae9d583d2a38ac0e89