Merge pull request #4072 from jbradaric/vim-7.4.642

vim-patch:7.4.642

1 files changed, 13 insertions, 9 deletions

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.