-
-
Notifications
You must be signed in to change notification settings - Fork 680
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'vim/master'
- Loading branch information
Showing
46 changed files
with
1,442 additions
and
1,357 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,25 @@ | ||
" Vim support file to help with paste mappings and menus | ||
" Maintainer: Bram Moolenaar <Bram@vim.org> | ||
" Last Change: 2017 Aug 30 | ||
" Last Change: 2019 Jan 27 | ||
|
||
" Define the string to use for items that are present both in Edit, Popup and | ||
" Toolbar menu. Also used in mswin.vim and macmap.vim. | ||
|
||
" Pasting blockwise and linewise selections is not possible in Insert and | ||
" Visual mode without the +virtualedit feature. They are pasted as if they | ||
" were characterwise instead. Add to that some tricks to leave the cursor in | ||
" the right position, also for "gi". | ||
if has("virtualedit") | ||
let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"} | ||
let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n'] | ||
let paste#paste_cmd['i'] = "\<c-\>\<c-o>\"+gP" | ||
let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"} | ||
let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n'] | ||
let paste#paste_cmd['i'] = "\<c-\>\<c-o>\"+gP" | ||
|
||
func! paste#Paste() | ||
let ove = &ve | ||
set ve=all | ||
normal! `^ | ||
if @+ != '' | ||
normal! "+gP | ||
endif | ||
let c = col(".") | ||
normal! i | ||
if col(".") < c " compensate for i<ESC> moving the cursor left | ||
normal! l | ||
endif | ||
let &ve = ove | ||
endfunc | ||
else | ||
let paste#paste_cmd = {'n': "\"=@+.'xy'<CR>gPFx\"_2x"} | ||
let paste#paste_cmd['v'] = '"-c<Esc>gix<Esc>' . paste#paste_cmd['n'] . '"_x' | ||
let paste#paste_cmd['i'] = 'x<Esc>' . paste#paste_cmd['n'] . '"_s' | ||
endif | ||
func! paste#Paste() | ||
let ove = &ve | ||
set ve=all | ||
normal! `^ | ||
if @+ != '' | ||
normal! "+gP | ||
endif | ||
let c = col(".") | ||
normal! i | ||
if col(".") < c " compensate for i<ESC> moving the cursor left | ||
normal! l | ||
endif | ||
let &ve = ove | ||
endfunc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.