aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-01-13 13:00:09 +1300
committerTom Ryder <tom@sanctum.geek.nz>2020-01-13 13:00:09 +1300
commit5223721622107f42d4b2967382c0c4ee18b4b536 (patch)
tree0f1dedac1f3b1982d90cb70c1e23483a6a559647
parent4fab9517f9bd115a6abbf49231bab66f05f81279 (diff)
parent5b84b3b44fc3e4dc0580a850635b025df76fd552 (diff)
downloaddotfiles-5223721622107f42d4b2967382c0c4ee18b4b536.tar.gz
dotfiles-5223721622107f42d4b2967382c0c4ee18b4b536.zip
Merge branch 'release/v8.11.0'v8.11.0
* release/v8.11.0: Update PGP key Update spellfile_local.vim plugin to v0.2.0 Correct a vimrc comment Remove 'synmaxcol' setting
-rw-r--r--VERSION4
-rw-r--r--finger/pgpkey2
m---------vim/bundle/spellfile_local0
-rw-r--r--vim/vimrc8
4 files changed, 4 insertions, 10 deletions
diff --git a/VERSION b/VERSION
index c5e7377d..f6914680 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v8.10.0
-Sat, 04 Jan 2020 12:07:46 +0000
+tejr dotfiles v8.11.0
+Mon, 13 Jan 2020 00:00:06 +0000
diff --git a/finger/pgpkey b/finger/pgpkey
index a19c98f8..667d6625 100644
--- a/finger/pgpkey
+++ b/finger/pgpkey
@@ -1,4 +1,4 @@
-pub rsa4096 2013-03-12 [SC] [expires: 2020-04-03]
+pub rsa4096 2013-03-12 [C] [expires: 2020-04-03]
FA09 C06E 1B67 0CD0 B2F5 DE60 C142 86EA 77BB 8872
uid [ultimate] Thomas Ryder (tyrmored, tejr) <tom@sanctum.geek.nz>
uid [ultimate] Thomas Ryder <tejr@echo-n.nz>
diff --git a/vim/bundle/spellfile_local b/vim/bundle/spellfile_local
-Subproject 7124a05b1ed53ccc1bae6f4dc99a1fe78c47451
+Subproject 16dbdc90b39c1ebf43ca1881a493edc816d2d9f
diff --git a/vim/vimrc b/vim/vimrc
index 601341f0..2328bb11 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -707,12 +707,6 @@ endif
"
set splitbelow splitright
-" Limit the number of characters per line that syntax highlighting will
-" attempt to match. This is as much an effort to encourage me to break long
-" lines and do hard wrapping correctly as it is for efficiency.
-"
-set synmaxcol=500
-
" Vim has an internal list of terminal types that support using smoother
" terminal redrawing, and for which 'ttyfast' is normally set, described in
" ‘:help 'ttyfast'’. That list includes most of the terminals I use, but
@@ -1443,7 +1437,7 @@ sunmap <Leader>r
nnoremap <Leader>!
\ :<Up><Home><S-Right>!<CR>
nmap <Leader>1 <Leader>!
-"" Leader,#/3 gives me my fortune
+"" Leader,#/3 switches the current buffer to the next altenate filetype
nmap <Leader># <Plug>(AlternateFileType)
nmap <Leader>3 <Leader>#
"" Leader,$/4 gives me my fortune