summaryrefslogtreecommitdiff
path: root/src/option.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-07-10 18:31:54 +0200
committerBram Moolenaar <Bram@vim.org>2012-07-10 18:31:54 +0200
commit89af4394091ed4544570676a7de5434cccfd65db (patch)
treee937c4089834de22505a095beb1743725e689a70 /src/option.c
parentcfa3caec0c0d54e593d6c19241da996b4111591b (diff)
downloadvim-git-89af4394091ed4544570676a7de5434cccfd65db.tar.gz
updated for version 7.3.599v7.3.599
Problem: Missing change in one file. Solution: Patch for changed clip_autoselect().
Diffstat (limited to 'src/option.c')
-rw-r--r--src/option.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/option.c b/src/option.c
index 308d7a81f..97e45cd53 100644
--- a/src/option.c
+++ b/src/option.c
@@ -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);