aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-16 01:59:28 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-16 01:59:28 +1200
commit83f87af96a788a67a4e452cc2eafc4fd8f73b199 (patch)
tree3b7895419687e73536819bd1195a6826f3f8194b
parentMerge branch 'release/v6.3.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-83f87af96a788a67a4e452cc2eafc4fd8f73b199.tar.gz
dotfiles-83f87af96a788a67a4e452cc2eafc4fd8f73b199.zip
Merge branch 'release/v6.4.0'v6.4.0
* release/v6.4.0: Remove dead plugin reference from vimrc comment Add "GNUmakefile" to Vim ft=make pattern Make \\ map work in operator-pending mode
-rw-r--r--VERSION4
-rw-r--r--vim/filetype.vim1
-rw-r--r--vim/vimrc5
3 files changed, 5 insertions, 5 deletions
diff --git a/VERSION b/VERSION
index ea28a525..e642c104 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.3.0
-Fri Jun 14 11:11:13 UTC 2019
+tejr dotfiles v6.4.0
+Sat Jun 15 13:59:26 UTC 2019
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 6b52fab9..19f65e23 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -194,6 +194,7 @@ augroup filetypedetect
autocmd BufNewFile,BufRead
\ Makefile
\,makefile
+ \,GNUmakefile
\ setfiletype make
" Markdown files
autocmd BufNewFile,BufRead
diff --git a/vim/vimrc b/vim/vimrc
index d64711b7..fbfdd15d 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1467,8 +1467,8 @@ sunmap <Leader>{
map <Leader>} <Plug>(VerticalRegionDown)
sunmap <Leader>}
"" Leader,\ jumps to the last edit position mark: think "Now, where was I?"
-nnoremap <Leader>\ `"
-xnoremap <Leader>\ `"
+noremap <Leader>\ `"
+sunmap <Leader>\
" This group does both: useful motions on defined text objects.
@@ -1491,7 +1491,6 @@ nnoremap <Leader>?
" other place. The plugin mappings probably require their own documentation
" comment block, but my hands are getting tired from all this typing.
"
-" * <https://sanctum.geek.nz/cgit/vim-paste-open.git/about/>
" * <https://sanctum.geek.nz/cgit/vim-replace-operator.git/about/>
" * <https://sanctum.geek.nz/cgit/vim-regex-escape.git/about/>
"