vim: src/window.c comparison

updated for version 7.4.642 Problem: When using "gf" escaped spaces are not handled. Solution: Recognize escaped spaces.

comparison

equal deleted inserted replaced

-:dd52e8b22614
+:75444015837a
 char_u *
 grab_file_name(count, file_lnum)
 long	count;
 linenr_T	*file_lnum;
 {
+int options = FNAME_MESS|FNAME_EXP|FNAME_REL|FNAME_UNESC;
 if (VIsual_active)
 {
 	int	len;
 	char_u	*ptr;
 	if (get_visual_text(NULL, &ptr, &len) == FAIL)
 	    return NULL;
-	return find_file_name_in_path(ptr, len,
+	return find_file_name_in_path(ptr, len, options,
-		     FNAME_MESS|FNAME_EXP|FNAME_REL, count, curbuf->b_ffname);
+						     count, curbuf->b_ffname);
 }
-return file_name_at_cursor(FNAME_MESS|FNAME_HYP|FNAME_EXP|FNAME_REL, count,
+return file_name_at_cursor(options | FNAME_HYP, count, file_lnum);
-			       file_lnum);
 }
 /*
 * Return the file name under or after the cursor.
 /*
 * Search forward for the last char of the file name.
 * Also allow "://" when ':' is not in 'isfname'.
 */
 len = 0;
-while (vim_isfilec(ptr[len])
+while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ')
 			 || ((options & FNAME_HYP) && path_is_url(ptr + len)))
+{
+	if (ptr[len] == '\\')
+	    /* Skip over the "\" in "\ ". */
+	    ++len;
 #ifdef FEAT_MBYTE
 	if (has_mbyte)
 	    len += (*mb_ptr2len)(ptr + len);
 	else
 #endif
 	    ++len;
+}
 /*
 * If there is trailing punctuation, remove it.
 * But don't remove "..", could be a directory name.
 */

Mercurial > vim