Merge pull request #4072 from jbradaric/vim-7.4.642

vim-patch:7.4.642

4 files changed, 24 insertions, 10 deletions

diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index 4f345158cf..b213a42c52 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -1340,6 +1340,7 @@ void free_findfile(void)
  *
  * options:
  * FNAME_MESS	    give error message when not found
+ * FNAME_UNESC      unescape backslashes
  *
  * Uses NameBuff[]!
  *
@@ -1385,6 +1386,14 @@ find_file_in_path_option (
 
     xfree(ff_file_to_find);
     ff_file_to_find = vim_strsave(NameBuff);
+    if (options & FNAME_UNESC) {
+      // Change all "\ " to " ".
+      for (ptr = ff_file_to_find; *ptr != NUL; ++ptr) {
+        if (ptr[0] == '\\' && ptr[1] == ' ') {
+          memmove(ptr, ptr + 1, STRLEN(ptr));
+        }
+      }
+    }
   }
 
   rel_to_curdir = (ff_file_to_find[0] == '.'
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 4ac224fecb..9fb7314949 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -482,7 +482,7 @@ static int included_patches[] = {
   645,
   // 644 NA
   // 643,
-  // 642,
+  642,
   // 641 NA
   640,
   // 639,
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 16ff7dfb14..f0c6cacdf0 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -4837,17 +4837,15 @@ static void frame_add_height(frame_T *frp, int n)
  */
 char_u *grab_file_name(long count, linenr_T *file_lnum)
 {
+  int options = FNAME_MESS | FNAME_EXP | FNAME_REL | FNAME_UNESC;
   if (VIsual_active) {
     size_t len;
     char_u  *ptr;
     if (get_visual_text(NULL, &ptr, &len) == FAIL)
       return NULL;
-    return find_file_name_in_path(ptr, len,
-                                  FNAME_MESS|FNAME_EXP|FNAME_REL,
-                                  count, curbuf->b_ffname);
+    return find_file_name_in_path(ptr, len, options, count, curbuf->b_ffname);
   }
-  return file_name_at_cursor(FNAME_MESS|FNAME_HYP|FNAME_EXP|FNAME_REL, count,
-                             file_lnum);
+  return file_name_at_cursor(options | FNAME_HYP, count, file_lnum);
 }
 
 /*
@@ -4918,12 +4916,18 @@ file_name_in_line (
    * Also allow "://" when ':' is not in 'isfname'.
    */
   len = 0;
-  while (vim_isfilec(ptr[len])
-         || ((options & FNAME_HYP) && path_is_url((char *)ptr + len)))
-    if (has_mbyte)
+  while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ')
+         || ((options & FNAME_HYP) && path_is_url((char *)ptr + len))) {
+    if (ptr[len] == '\\' && ptr[len + 1] == ' ') {
+      // Skip over the "\" in "\ ".
+      ++len;
+    }
+    if (has_mbyte) {
       len += (size_t)(*mb_ptr2len)(ptr + len);
-    else
+    } else {
       ++len;
+    }
+  }
 
   /*
    * If there is trailing punctuation, remove it.
diff --git a/src/nvim/window.h b/src/nvim/window.h
index eccc7835a8..2ac4c00c28 100644
--- a/src/nvim/window.h
+++ b/src/nvim/window.h
@@ -10,6 +10,7 @@
 #define FNAME_INCL      8       /* apply 'includeexpr' */
 #define FNAME_REL       16      /* ".." and "./" are relative to the (current)
                                    file instead of the current directory */
+#define FNAME_UNESC     32      // remove backslashes used for escaping
 
 /*
  * arguments for win_split()