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

updated for version 7.3.221

Browse Source 
Problem:    Text from the clipboard is sometimes handled as linewise, but not
            consistently.
Solution:   Assume the text is linewise when it ends in a CR or NL.
This commit is contained in:
Bram Moolenaar
2011-06-19 01:14:29 +02:00
parent 19e6094378
commit d44347f1e7
8 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ops.c
View File

@@ -5733,7 +5733,9 @@ clip_get_selection(cbd)
}
}
/* Convert from the GUI selection string into the '*'/'+' register */
/*
* Convert from the GUI selection string into the '*'/'+' register.
*/
void
clip_yank_selection(type, str, len, cbd)
int type;
@@ -6090,9 +6092,6 @@ write_reg_contents_ex(name, str, maxlen, must_append, yank_type, block_len)
if (yank_type == MBLOCK)
yank_type = MAUTO;
#endif
if (yank_type == MAUTO)
yank_type = ((len > 0 && (str[len - 1] == '\n' || str[len - 1] == '\r'))
? MLINE : MCHAR);
str_to_reg(y_current, yank_type, str, len, block_len);
# ifdef FEAT_CLIPBOARD
@@ -6113,13 +6112,14 @@ write_reg_contents_ex(name, str, maxlen, must_append, yank_type, block_len)
* is appended.
*/
static void
str_to_reg(y_ptr, type, str, len, blocklen)
str_to_reg(y_ptr, yank_type, str, len, blocklen)
struct yankreg *y_ptr; /* pointer to yank register */
int type; /* MCHAR, MLINE or MBLOCK */
int yank_type; /* MCHAR, MLINE, MBLOCK, MAUTO */
char_u *str; /* string to put in register */
long len; /* length of string */
long blocklen; /* width of Visual block */
{
int type; /* MCHAR, MLINE or MBLOCK */
int lnum;
long start;
long i;
@@ -6136,6 +6136,12 @@ str_to_reg(y_ptr, type, str, len, blocklen)
if (y_ptr->y_array == NULL) /* NULL means empty register */
y_ptr->y_size = 0;
if (yank_type == MAUTO)
type = ((len > 0 && (str[len - 1] == NL || str[len - 1] == CAR))
? MLINE : MCHAR);
else
type = yank_type;
/*
* Count the number of lines within the string
*/