Merge pull request yi-editor#43 from ethercrow/filename_completion

Sanitize filename expanded from '%' in ex mode
jun0 · Sep 16, 2012 · 1a52ed8 · 1a52ed8
2 parents 1846f05 + cbdb9a6
commit 1a52ed8
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/yi/src/library/Yi/Keymap/Vim.hs b/yi/src/library/Yi/Keymap/Vim.hs
@@ -1261,16 +1261,18 @@ exMode self prompt = do
                       -- current buffer is minibuffer
                       -- actual file is in the second buffer in bufferStack
                       bufferRef <- withEditor $ gets (head . drop 1 . bufferStack)
-                      maybeCurrentFileName <- withGivenBuffer bufferRef (gets file)
-
-                      case maybeCurrentFileName of
-                        Just fn -> withBuffer $ do
-                            -- now modifying minibuffer
-                            point <- pointB
-                            deleteNAt Forward 1 (point-1)
-                            insertN fn
-
-                        Nothing -> return ()
+                      currentFileName <- withGivenBuffer bufferRef $
+                          fmap bufInfoFileName bufInfoB
+
+                      let sanitizedFileName = case currentFileName of
+                                              ('/':'/':f) -> '/':f
+                                              otherwise -> currentFileName
+
+                      -- now modifying minibuffer
+                      withBuffer $ do
+                          point <- pointB
+                          deleteNAt Forward 1 (point-1)
+                          insertN sanitizedFileName
                    | otherwise = exFileNameComplete f
 
       b_complete = exSimpleComplete matchingBufferNames