0
0
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00

updated for version 7.3.599

Problem:    Missing change in one file.
Solution:   Patch for changed clip_autoselect().
This commit is contained in:
Bram Moolenaar
2012-07-10 18:31:54 +02:00
parent cfa3caec0c
commit 89af439409
2 changed files with 15 additions and 5 deletions

View File

@@ -7377,7 +7377,8 @@ check_stl_option(s)
check_clipboard_option()
{
int new_unnamed = 0;
int new_autoselect = FALSE;
int new_autoselect_star = FALSE;
int new_autoselect_plus = FALSE;
int new_autoselectml = FALSE;
int new_html = FALSE;
regprog_T *new_exclude_prog = NULL;
@@ -7398,13 +7399,19 @@ check_clipboard_option()
p += 11;
}
else if (STRNCMP(p, "autoselect", 10) == 0
&& (p[10] == ',' || p[10] == NUL))
&& (p[10] == ',' || p[10] == NUL))
{
new_autoselect = TRUE;
new_autoselect_star = TRUE;
p += 10;
}
else if (STRNCMP(p, "autoselectplus", 14) == 0
&& (p[14] == ',' || p[14] == NUL))
{
new_autoselect_plus = TRUE;
p += 14;
}
else if (STRNCMP(p, "autoselectml", 12) == 0
&& (p[12] == ',' || p[12] == NUL))
&& (p[12] == ',' || p[12] == NUL))
{
new_autoselectml = TRUE;
p += 12;
@@ -7433,7 +7440,8 @@ check_clipboard_option()
if (errmsg == NULL)
{
clip_unnamed = new_unnamed;
clip_autoselect = new_autoselect;
clip_autoselect_star = new_autoselect_star;
clip_autoselect_plus = new_autoselect_plus;
clip_autoselectml = new_autoselectml;
clip_html = new_html;
vim_free(clip_exclude_prog);

View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
599,
/**/
598,
/**/