vim: src/quickfix.c comparison

updated for version 7.0140

comparison

equal deleted inserted replaced

-:ce2181d14aa0
+:52e76e2b5b65
 {
 	char_u	convchar;
 	char	*pattern;
 }		    fmt_pat[FMT_PATTERNS] =
 		    {
-			{'f', "\\f\\+"},
+			{'f', ".\\+"},	    /* only used when at end */
 			{'n', "\\d\\+"},
 			{'l', "\\d\\+"},
 			{'c', "\\d\\+"},
 			{'t', "."},
 			{'m', ".\\+"},
 			 * "\%(\a:\)\=" */
 			STRCPY(ptr, "\\%(\\a:\\)\\=");
 			ptr += 10;
 		    }
 #endif
-		    if (*efmp == 'f' && efmp[1] != NUL
+		    if (*efmp == 'f' && efmp[1] != NUL)
-					 && efmp[1] != '\\' && efmp[1] != '%')
 		    {
-			/* A file name may contain spaces, but this isn't in
+			if (efmp[1] != '\\' && efmp[1] != '%')
-			 * "\f".  For "%f:%l:%m" there may be a ":" in the
+			{
-			 * file name.  Use ".\{-1,}x" instead (x is the next
+			    /* A file name may contain spaces, but this isn't
-			 * character), the requirement that :999: follows
+			     * in "\f".  For "%f:%l:%m" there may be a ":" in
-			 * should work. */
+			     * the file name.  Use ".\{-1,}x" instead (x is
-			STRCPY(ptr, ".\\{-1,}");
+			     * the next character), the requirement that :999:
-			ptr += 7;
+			     * follows should work. */
+			    STRCPY(ptr, ".\\{-1,}");
+			    ptr += 7;
+			}
+			else
+			{
+			    /* File name followed by '\\' or '%': include as
+			     * many file name chars as possible. */
+			    STRCPY(ptr, "\\f\\+");
+			    ptr += 4;
+			}
 		    }
 		    else
 		    {
 			srcptr = (char_u *)fmt_pat[idx].pattern;
 			while ((*ptr = *srcptr++) != NUL)

Mercurial > vim