Do not resolve reparse point when :e or :file

vim · Feb 5, 2019 · e17c269 · e17c269
1 parent 8843bb3
commit e17c269
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/buffer.c b/src/buffer.c
@@ -4847,7 +4847,7 @@ fname_expand(
 	char_u  *rfname;
 
 	// If the file name is a shortcut file, use the file it links to.
-	rfname = mch_resolve_path(*ffname);
+	rfname = mch_resolve_path(*ffname, FALSE);
 	if (rfname != NULL)
 	{
 	    vim_free(*ffname);

diff --git a/src/evalfunc.c b/src/evalfunc.c
@@ -9894,7 +9894,7 @@ f_resolve(typval_T *argvars, typval_T *rettv)
     {
 	char_u	*v = NULL;
 
-	v = mch_resolve_path(p);
+	v = mch_resolve_path(p, TRUE);
 	if (v != NULL)
 	    rettv->vval.v_string = v;
 	else

diff --git a/src/os_mswin.c b/src/os_mswin.c
@@ -2107,10 +2107,10 @@ resolve_shortcut(char_u *fname)
 }
 
     char_u *
-mch_resolve_path(char_u *fname)
+mch_resolve_path(char_u *fname, int reparse_point)
 {
     char_u  *path = resolve_shortcut(fname);
-    if (path == NULL)
+    if (path == NULL && reparse_point)
 	path = resolve_reparse_point(fname);
     return path;
 }

diff --git a/src/proto/os_mswin.pro b/src/proto/os_mswin.pro
@@ -37,7 +37,7 @@ int mch_print_text_out(char_u *p, int len);
 void mch_print_set_font(int iBold, int iItalic, int iUnderline);
 void mch_print_set_bg(long_u bgcol);
 void mch_print_set_fg(long_u fgcol);
-char_u *mch_resolve_path(char_u *fname);
+char_u *mch_resolve_path(char_u *fname, int reparse_point);
 void win32_set_foreground(void);
 void serverInitMessaging(void);
 void serverSetName(char_u *name);