diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-12 01:20:13 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-12 01:20:13 +1200 |
commit | e3cfbf8e680aae93fcb778a77c20247570453c8c (patch) | |
tree | 63631f2ea936b6e92db315e99031fde422f5d727 /vim/vimrc | |
parent | Merge branch 'release/v1.25.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-e3cfbf8e680aae93fcb778a77c20247570453c8c.tar.gz dotfiles-e3cfbf8e680aae93fcb778a77c20247570453c8c.zip |
Merge branch 'release/v1.26.0'v1.26.0
* release/v1.26.0:
Bump VERSION
Upgrade insert_cancel.vim again
Check for +conceal before setting 'conceallevel'
Upgrade insert_cancel.vim
Remove session_lazy.vim
Add missing dot to mutt filetype.vim path
Add session_lazy.vim plugin
Add 'sessionoptions' settings
Correct login around ftplugin/make.vim mappings
Move after/ftplugin/sed.vim to ftplugin/sed.vim
Clean up existing ftplugins a bit
Overhaul after/ftplugin
Add explicit group to ftdetect rule
Move angle-bracket matchpairs to Perl filetype
Diffstat (limited to 'vim/vimrc')
-rw-r--r-- | vim/vimrc | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -98,9 +98,6 @@ if v:version >= 700 set listchars+=nbsp:+ " Non-breaking spaces endif -" Add angle brackets to pairs of matched characters -set matchpairs+=<:> - " Don't allow setting options via buffer content set nomodeline @@ -144,6 +141,12 @@ if has('linebreak') endif endif +" Don't store any options or mappings in sessions +if has('mksession') + set sessionoptions-=localoptions + set sessionoptions-=options +endif + " Let me move beyond buffer text in visual block mode if has('virtualedit') set virtualedit+=block |