thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.973

Browse Source 
Problem:    When pasting on the command line line breaks result in literal
            <CR> characters. This makes pasting a long file name difficult.
Solution:   Skip the characters.
This commit is contained in:
Bram Moolenaar
2015-12-17 14:04:24 +01:00
parent a988496706
commit 6f62fed349
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ops.c
View File

@@ -1577,7 +1577,7 @@ get_spec_reg(regname, argp, allocated, errmsg)
cmdline_paste_reg(regname, literally, remcr)
int regname;
int literally; /* Insert text literally instead of "as typed" */
int remcr; /* don't add trailing CR */
int remcr; /* don't add CR characters */
{
long i;
@@ -1590,12 +1590,8 @@ cmdline_paste_reg(regname, literally, remcr)
cmdline_paste_str(y_current->y_array[i], literally);
/* Insert ^M between lines and after last line if type is MLINE.
* Don't do this when "remcr" is TRUE and the next line is empty. */
if (y_current->y_type == MLINE
|| (i < y_current->y_size - 1
&& !(remcr
&& i == y_current->y_size - 2
&& *y_current->y_array[i + 1] == NUL)))
* Don't do this when "remcr" is TRUE. */
if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr)
cmdline_paste_str((char_u *)"\r", literally);
/* Check for CTRL-C, in case someone tries to paste a few thousand