aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-20 20:44:11 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-20 20:44:11 +1200
commit3886e28823ac52d6adeff6e52b857298fb7348df (patch)
treece15fa79ba6e131187e1fc5f3e1d5834078e914d
parent91b08ae3e026e812e2be576b9cd61121ea813c16 (diff)
parentd7574df2c1f99d277875e550766417cdfa1b3512 (diff)
downloaddotfiles-1.36.0.tar.gz (sig)
dotfiles-1.36.0.zip
Merge branch 'release/v1.36.0'v1.36.0
* release/v1.36.0: Bump VERSION Remove any range from \e mapping Upgrade, reconfig strip_trailing_whitespace plugin Move 'encoding' .vimrc setting alphabetically Apply toggle_flag.vim hotfix Update and rename toggle_option_flags.vim plugin
-rw-r--r--.gitmodules6
-rw-r--r--VERSION4
m---------vim/bundle/strip_trailing_whitespace0
m---------vim/bundle/toggle_flags0
m---------vim/bundle/toggle_option_flags0
-rw-r--r--vim/vimrc19
6 files changed, 16 insertions, 13 deletions
diff --git a/.gitmodules b/.gitmodules
index 093f1fc4..c7d2d0bd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,9 +35,9 @@
[submodule "vim/bundle/strip_trailing_whitespace"]
path = vim/bundle/strip_trailing_whitespace
url = https://sanctum.geek.nz/code/vim-strip-trailing-whitespace.git
-[submodule "vim/bundle/toggle_option_flags"]
- path = vim/bundle/toggle_option_flags
- url = https://sanctum.geek.nz/code/vim-toggle-option-flags.git
+[submodule "vim/bundle/toggle_flags"]
+ path = vim/bundle/toggle_flags
+ url = https://sanctum.geek.nz/code/vim-toggle-flags.git
[submodule "vim/bundle/uncap_ex"]
path = vim/bundle/uncap_ex
url = https://sanctum.geek.nz/code/vim-uncap-ex.git
diff --git a/VERSION b/VERSION
index a5e11840..ac66eb83 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.35.0
-Wed Jul 18 22:47:49 UTC 2018
+tejr dotfiles v1.36.0
+Fri Jul 20 08:43:54 UTC 2018
diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace
-Subproject e689a60912a1832f167bdc88cf08cbba2a9ae7e
+Subproject 3ecc30fe80b32003414d2647efb17e89c27c6aa
diff --git a/vim/bundle/toggle_flags b/vim/bundle/toggle_flags
new file mode 160000
+Subproject 68624dcd8622a378dca46d1437af336157b8810
diff --git a/vim/bundle/toggle_option_flags b/vim/bundle/toggle_option_flags
deleted file mode 160000
-Subproject 4c6224a138eb5a479a462df3f384266bd9cfeff
diff --git a/vim/vimrc b/vim/vimrc
index ec997e02..6ec2e977 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -80,11 +80,6 @@ else
set display=lastline " Just let it run off the screen if not
endif
-" If $LANG isn't set and 'encoding' is the default, use UTF-8
-if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1'
- set encoding=utf-8
-endif
-
" Don't wait for a key after Escape in insert mode
if exists('+esckeys') " Not in Neovim
set noesckeys
@@ -171,6 +166,11 @@ if has('mksession')
set sessionoptions-=options
endif
+" If $LANG isn't set and 'encoding' is the default, use UTF-8
+if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1'
+ set encoding=utf-8
+endif
+
" Persistent undo settings
if has('persistent_undo')
@@ -252,7 +252,7 @@ nmap ]<Space> <Plug>(PutBlankLinesBelow)
" Normal leader maps; use <Bslash> not <Leader> for vim-tiny
" \a toggles 'formatoptions' 'a' flag using a plugin
-nnoremap <Bslash>a :<C-U>ToggleOptionFlagLocal formatoptions a<CR>
+nnoremap <Bslash>a :<C-U>ToggleFlagLocal formatoptions a<CR>
" \b toggles copy-pasteable linebreak settings
nmap <Bslash>b <Plug>(CopyLinebreakToggle)
" \c toggles 'cursorline'
@@ -264,7 +264,7 @@ nnoremap <Bslash>d :read !date<CR>
" \D inserts the UTC date (POSIX date)
nnoremap <Bslash>D :read !date -u<CR>
" \e forces a buffer to be editable
-nnoremap <Bslash>e :setlocal modifiable noreadonly<CR>
+nnoremap <Bslash>e :<C-U>setlocal modifiable noreadonly<CR>
" \f shows the current 'formatoptions' at a glance
nnoremap <Bslash>f :<C-U>setlocal formatoptions?<CR>
" \g changes directory to the current file's location
@@ -314,7 +314,10 @@ nnoremap <Bslash>V :<C-U>let b: t: w:<CR>
" \w toggles wrapping
nnoremap <Bslash>w :<C-U>setlocal wrap! wrap?<CR>
" \x strips trailing whitespace via a custom plugin
-nmap <Bslash>x <Plug>(StripTrailingWhitespace)
+nmap <Bslash>x :<C-U>StripTrailingWhitespace<CR>
+if v:version >= 700
+ xmap <Bslash>x :StripTrailingWhitespace<CR>
+endif
" \y shows all registers
nnoremap <Bslash>y :<C-U>registers<CR>
" \z sets NZ English spelling (compare \u)