From 7805004319691ee026342525e0bf9df146358dc0 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 31 Jul 2010 20:53:54 +0200
Subject: [PATCH] Fix: on MS-Windows the "open with..." menu starts Vim without
 a file.

---
 runtime/doc/todo.txt | 5 ++---
 src/dosinst.c        | 8 ++++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 7f327c4cb0..6b0c5a7235 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -30,9 +30,6 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Windows 7: "Open with..." menu starts Vim without a file.
-Need to use other registry methods in if_ole.cpp?
-
 Windows 7: installing Vim again doesn't find the previously installed Vim.
 
 Move more common code from if_python.c and if_python3.c to if_py_both.h
@@ -45,6 +42,8 @@ Cursor positioning wrong with 0x200e character. (John Becket, 2010 May 6)
 Test 69 breaks on MS-Windows, both 32 and 64 builds. (George Reilly, 2010 Feb
 26)
 
+Should readfile() ignore BOM when not in binary mode?
+
 Bug: searching for tags file uses 'suffixesadd', should not happen. (Dominique
 Pelle, 2010 June 28)
 
diff --git a/src/dosinst.c b/src/dosinst.c
index ef41081ef9..6dcb5e30db 100644
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -1468,11 +1468,15 @@ register_openwith(
     HKEY hRootKey,
     const char *exe_path)
 {
-    LONG lRet = reg_create_key_and_value(
+    char	exe_cmd[BUFSIZE];
+    LONG	lRet;
+
+    sprintf(exe_cmd, "%s \"%%1\"", exe_path);
+    lRet = reg_create_key_and_value(
 	    hRootKey,
 	    "Applications\\gvim.exe\\shell\\edit\\command",
 	    NULL,
-	    exe_path);
+	    exe_cmd);
 
     if (ERROR_SUCCESS == lRet)
     {