gistfile1.diff

diff -r 18d84ed365a5 src/search.c
--- a/src/search.c	Wed Apr 22 22:18:22 2015 +0200
+++ b/src/search.c	Thu Apr 30 00:43:26 2015 +0900
@@ -2154,6 +2154,7 @@
 	    do_quotes = 0;
 	else if (do_quotes == -1)
 	{
+	    int do_squotes = -1;
 	    /*
 	     * Count the number of quotes in the line, skipping \" and '"'.
 	     * Watch out for "\\".
@@ -2162,10 +2163,12 @@
 	    for (ptr = linep; *ptr; ++ptr)
 	    {
 		if (ptr == linep + pos.col + backwards)
-		    at_start = (do_quotes & 1);
+		    at_start = (do_quotes & 1) || (do_squotes & 1);
 		if (*ptr == '"'
 			&& (ptr == linep || ptr[-1] != '\'' || ptr[1] != '\''))
 		    ++do_quotes;
+		else if (*ptr == '\'' && (do_quotes & 1))
+		    ++do_squotes;
 		if (*ptr == '\\' && ptr[1] != NUL)
 		    ++ptr;
 	    }
@@ -2295,6 +2298,11 @@
 			pos.col += 2;
 			break;
 		    }
+		    else
+		    {
+			inquote = !inquote;
+			start_in_quotes = FALSE;
+		    }
 		}
 	    }
 	    /* FALLTHROUGH */