aboutsummaryrefslogtreecommitdiff
path: root/vim/vimrc
diff options
context:
space:
mode:
Diffstat (limited to 'vim/vimrc')
-rw-r--r--vim/vimrc19
1 files changed, 5 insertions, 14 deletions
diff --git a/vim/vimrc b/vim/vimrc
index f59fbc25..470b4cb1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,7 +2,7 @@
" Tom Ryder (tejr)’s Literate Vimrc
" ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
"
-" Last updated: Sun, 24 May 2020 10:00:15 UTC
+" Last updated: Mon, 01 Jun 2020 21:38:45 UTC
"
" │ And I was lifted up in heart, and thought
" │ Of all my late-shown prowess in the lists,
@@ -325,7 +325,7 @@ filetype plugin indent on
" There are a couple of contexts in which it's useful to reload filetypes for
" the current buffer, quietly doing nothing if filetypes aren't enabled.
" We'll set up a user command named :ReloadFileType to do this, with
-" a script-local function backing it.
+" an autloaded function backing it.
"
command! -bar ReloadFileType
\ call reload#FileType()
@@ -340,10 +340,6 @@ command! -bar ReloadFileType
" define the new command wrapper around an autoloaded function that itself
" issues a :ReloadFileType command after the vimrc file is sourced.
"
-" We can't put the actual :source command into the script-local function we
-" define here, because Vim would get upset that we're trying to redefine
-" a function as it executes!
-"
command! -bar ReloadVimrc
\ call reload#Vimrc()
@@ -364,7 +360,7 @@ autocmd vimrc BufWritePost $MYVIMRC
\ ReloadVimrc
if $MYVIM !=# ''
autocmd vimrc BufWritePost $MYVIM/vimrc
- \ ReloadVimrc
+ \ doautocmd vimrc BufWritePost $MYVIMRC
endif
" If Vim is new enough (v7.0.187) to support the ##SourceCmd event for
@@ -375,11 +371,11 @@ endif
" <https://github.com/vim/vim/releases/tag/v7.0.187>
"
if exists('##SourceCmd')
- autocmd vimrc SourceCmd $MYVIMRC/vimrc
+ autocmd vimrc SourceCmd $MYVIMRC
\ ReloadVimrc
if $MYVIM !=# ''
autocmd vimrc SourceCmd $MYVIM/vimrc
- \ ReloadVimrc
+ \ doautocmd vimrc SourceCmd $MYVIMRC
endif
endif
@@ -1548,11 +1544,6 @@ nmap <Leader>#
\ <Plug>(AlternateFileType)
nmap <Leader>3
\ <Leader>#
-"" Leader,$/4 gives me my fortune
-nmap <Leader>$
- \ <Plug>(Fortune)
-nmap <Leader>4
- \ <Leader>$
"" Leader,&/7 escapes regex metacharacters
map <Leader>&
\ <Plug>(RegexEscape)