Mercurial > vim

comparison src/option.c @ 3678:b06578f1390f v7.3.599

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.599 Problem: Missing change in one file. Solution: Patch for changed clip_autoselect().
author Bram Moolenaar <bram@vim.org>
date Tue, 10 Jul 2012 18:31:54 +0200
parents 286ba0251c0a
children 7de7ef01288d
comparison
equal deleted inserted replaced
3677:7131379c2b8d 3678:b06578f1390f
7375 */ 7375 */
7376 static char_u * 7376 static char_u *
7377 check_clipboard_option() 7377 check_clipboard_option()
7378 { 7378 {
7379 int new_unnamed = 0; 7379 int new_unnamed = 0;
7380 int new_autoselect = FALSE; 7380 int new_autoselect_star = FALSE;
7381 int new_autoselect_plus = FALSE;
7381 int new_autoselectml = FALSE; 7382 int new_autoselectml = FALSE;
7382 int new_html = FALSE; 7383 int new_html = FALSE;
7383 regprog_T *new_exclude_prog = NULL; 7384 regprog_T *new_exclude_prog = NULL;
7384 char_u *errmsg = NULL; 7385 char_u *errmsg = NULL;
7385 char_u *p; 7386 char_u *p;
7396 { 7397 {
7397 new_unnamed |= CLIP_UNNAMED_PLUS; 7398 new_unnamed |= CLIP_UNNAMED_PLUS;
7398 p += 11; 7399 p += 11;
7399 } 7400 }
7400 else if (STRNCMP(p, "autoselect", 10) == 0 7401 else if (STRNCMP(p, "autoselect", 10) == 0
7401 && (p[10] == ',' || p[10] == NUL)) 7402 && (p[10] == ',' || p[10] == NUL))
7402 { 7403 {
7403 new_autoselect = TRUE; 7404 new_autoselect_star = TRUE;
7404 p += 10; 7405 p += 10;
7405 } 7406 }
7407 else if (STRNCMP(p, "autoselectplus", 14) == 0
7408 && (p[14] == ',' || p[14] == NUL))
7409 {
7410 new_autoselect_plus = TRUE;
7411 p += 14;
7412 }
7406 else if (STRNCMP(p, "autoselectml", 12) == 0 7413 else if (STRNCMP(p, "autoselectml", 12) == 0
7407 && (p[12] == ',' || p[12] == NUL)) 7414 && (p[12] == ',' || p[12] == NUL))
7408 { 7415 {
7409 new_autoselectml = TRUE; 7416 new_autoselectml = TRUE;
7410 p += 12; 7417 p += 12;
7411 } 7418 }
7412 else if (STRNCMP(p, "html", 4) == 0 && (p[4] == ',' || p[4] == NUL)) 7419 else if (STRNCMP(p, "html", 4) == 0 && (p[4] == ',' || p[4] == NUL))
7431 ++p; 7438 ++p;
7432 } 7439 }
7433 if (errmsg == NULL) 7440 if (errmsg == NULL)
7434 { 7441 {
7435 clip_unnamed = new_unnamed; 7442 clip_unnamed = new_unnamed;
7436 clip_autoselect = new_autoselect; 7443 clip_autoselect_star = new_autoselect_star;
7444 clip_autoselect_plus = new_autoselect_plus;
7437 clip_autoselectml = new_autoselectml; 7445 clip_autoselectml = new_autoselectml;
7438 clip_html = new_html; 7446 clip_html = new_html;
7439 vim_free(clip_exclude_prog); 7447 vim_free(clip_exclude_prog);
7440 clip_exclude_prog = new_exclude_prog; 7448 clip_exclude_prog = new_exclude_prog;
7441 #ifdef FEAT_GUI_GTK 7449 #ifdef FEAT_GUI_GTK