commit dffa5b8ecfa2091495b77ab487c07792646d0633
author Bram Moolenaar <Bram@vim.org> Wed Nov 19 16:38:07 2014 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Nov 19 16:38:07 2014 +0100
tree 9f9ccaac14e2fffceec8ee02ac7e6590de1c226b
parent df46f6f07f90c0014352ff05aecb8caf61e7cfa0

updated for version 7.4.519
Problem:    Crash when using syntax highlighting.
Solution:   When regprog is freed and replaced, store the result.

src/os_unix.c

diff --git a/src/os_unix.c b/src/os_unix.c
index 6209605..8cd6b14 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1610,8 +1610,6 @@
     static int
 x_connect_to_server()
 {
-    regmatch_T	regmatch;
-
 #if defined(FEAT_CLIENTSERVER)
     if (x_force_connect)
 	return TRUE;
@@ -1622,9 +1620,7 @@
     /* Check for a match with "exclude:" from 'clipboard'. */
     if (clip_exclude_prog != NULL)
     {
-	regmatch.rm_ic = FALSE;		/* Don't ignore case */
-	regmatch.regprog = clip_exclude_prog;
-	if (vim_regexec(&regmatch, T_NAME, (colnr_T)0))
+	if (vim_regexec_prog(&clip_exclude_prog, FALSE, T_NAME, (colnr_T)0))
 	    return FALSE;
     }
     return TRUE;