aboutsummaryrefslogtreecommitdiff
path: root/vim/config/whitespace.vim
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-13 00:16:55 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-13 00:16:55 +1300
commit0a717e403db652ca602603617642d8bc7de7e9bb (patch)
treee2be9751fd22fe7cc3f19f44c48d20531fe66cdd /vim/config/whitespace.vim
parentMerge branch 'release/v0.14.0' (diff)
parentBump version number to 0.15.0 (diff)
downloaddotfiles-0a717e403db652ca602603617642d8bc7de7e9bb.tar.gz
dotfiles-0a717e403db652ca602603617642d8bc7de7e9bb.zip
Merge branch 'release/v0.15.0'v0.15.0
* release/v0.15.0: (24 commits) Bump version number to 0.15.0 Limit \f mapping to normal mode Move 'hlsearch' insert-mode suspension into plugin Separate g:loaded/&cp tests from feat tests Use :set not :setlocal for 'hlsearch'/'incsearch' Correct nonexistent 'wildmode' value in Vim config Document each 'backspace' flag in Vim config Mention req of toggle_option_flag.vim Adjust first sentence of format_option_toggle.txt Add help links to toggle_option_flag.vim interface Flesh out strip_trailing_whitespace.vim help Specify type of example in mail_mutt.vim doc Adjust layout of headings/links in Vim plugin help Flesh out fixed_join.vim interface documentation Add help tag for detect_background.vim function Flesh out copy_linebreak.vim interface docs Remove nonexistent keyword references from Vim doc Move Vim doc requirement to correct section Apply boilerplate to Vim plugin docs Update and correct detect_background.vim help ...
Diffstat (limited to 'vim/config/whitespace.vim')
-rw-r--r--vim/config/whitespace.vim7
1 files changed, 0 insertions, 7 deletions
diff --git a/vim/config/whitespace.vim b/vim/config/whitespace.vim
index 12d41a4e..981def81 100644
--- a/vim/config/whitespace.vim
+++ b/vim/config/whitespace.vim
@@ -24,12 +24,5 @@ set shiftround
" despite the noble Steve Losh's exhortations
set nojoinspaces
-" Rebind normal J to run plugin-defined join that doesn't jump around, but
-" only if we have the eval feature, because otherwise this mapping won't exist
-" and we should keep the default behaviour
-if has('eval')
- nmap J <Plug>FixedJoin
-endif
-
" \x strips trailing whitespace via a custom plugin
nmap <Leader>x <Plug>StripTrailingWhitespace