From d857f0e0f419ffcc8a17d2724d5f3fa62da590a7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 21 Jun 2005 22:37:39 +0000
Subject: updated for version 7.0089

---
 src/window.c | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

(limited to 'src/window.c')

diff --git a/src/window.c b/src/window.c
index e57976c77..c9c6c99ab 100644
--- a/src/window.c
+++ b/src/window.c
@@ -458,11 +458,8 @@ do_window(nchar, Prenum, xchar)
     case 'f':
     case Ctrl_F:
 		CHECK_CMDWIN
-#ifdef FEAT_VISUAL
-		reset_VIsual_and_resel();	/* stop Visual mode */
-#endif
-		ptr = file_name_at_cursor(FNAME_MESS|FNAME_HYP|FNAME_EXP,
-								     Prenum1);
+
+		ptr = grab_file_name(Prenum1);
 		if (ptr != NULL)
 		{
 #ifdef FEAT_GUI
@@ -4477,6 +4474,30 @@ last_status_rec(fr, statusline)
 #endif /* FEAT_WINDOWS */
 
 #if defined(FEAT_SEARCHPATH) || defined(PROTO)
+/*
+ * Get the file name at the cursor.
+ * If Visual mode is active, use the selected text if it's in one line.
+ * Returns the name in allocated memory, NULL for failure.
+ */
+    char_u *
+grab_file_name(count)
+    long count;
+{
+# ifdef FEAT_VISUAL
+    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,
+		     FNAME_MESS|FNAME_EXP|FNAME_REL, count, curbuf->b_ffname);
+    }
+# endif
+    return file_name_at_cursor(FNAME_MESS|FNAME_HYP|FNAME_EXP|FNAME_REL, count);
+}
+
 /*
  * Return the file name under or after the cursor.
  *
-- 
cgit v1.2.1