From 15140e21c2721775bd3c6213c017ea7d2dcf7e9d Mon Sep 17 00:00:00 2001
From: IdanA <IdanA@traffilog.com>
Date: Sun, 9 Dec 2012 16:14:27 +0200
Subject: [PATCH] Fixed things for windows.

---
 editors/vim/README.md              | 17 +++++++++++++++--
 editors/vim/autoload/dcomplete.vim |  6 ++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/editors/vim/README.md b/editors/vim/README.md
index 2a99c78..c7e1294 100644
--- a/editors/vim/README.md
+++ b/editors/vim/README.md
@@ -1,6 +1,6 @@
 A plugin for using dscanner with vim.
 
-Tested on Linux
+Tested on Linux and Windows(see comment for windows)
 
 Installation and Configuration
 ==============================
@@ -8,4 +8,17 @@ Put the autoload and ftplugin folders in your vim runtime path.
 
 Compile dscanner and put it in your path, or set the global variable g:dscanner\_path to where you put dscanner.
 
-If you need to use an include path, use the global variable g:dscanner\_includePath.
+If you need to use an include path, use the global variable g:dscanner\_includePath as a list of those paths.
+
+Using on Windows
+================
+Under Linux, Dscanner can /etc/dmd.conf to get the default include paths. I've found no such file in the Windows distribution of dmd(it's probably in the registry), so you need to configure it manually. You need to \src\phobos and \src\druntime\import folders from where you installed dmd. For example,
+```
+let g:dscanner_includePath=['C:\Program Files\dmd2\src\phobos','C:\Program Files\dmd2\src\druntime\import']
+```
+
+Also, the Dscanner has a problem reading files in windows format, so use
+```
+set fileformat=unix
+```
+to make you files use unix format.
diff --git a/editors/vim/autoload/dcomplete.vim b/editors/vim/autoload/dcomplete.vim
index 82a29f3..5cd7bf5 100644
--- a/editors/vim/autoload/dcomplete.vim
+++ b/editors/vim/autoload/dcomplete.vim
@@ -59,13 +59,15 @@ function! s:runDScanner(scanCommand)
 	endif
 
 	if exists('g:dscanner_includePath')
-		let l:dscannerCommand=l:dscannerCommand.' -I'.g:dscanner_includePath
+		for l:includePath in g:dscanner_includePath
+			let l:dscannerCommand=l:dscannerCommand.' '.shellescape('-I'.l:includePath)
+		endfor
 	endif
 
 
 	let l:tmpFileName=tempname()
 	exec "write ".l:tmpFileName
-	let scanResult=system(l:dscannerCommand.' --'.a:scanCommand.' '.(line2byte('.')+col('.')-2).' <'.l:tmpFileName)
+	let scanResult=system(l:dscannerCommand.' --'.a:scanCommand.' '.(line2byte('.')+col('.')-2).' <'.shellescape(l:tmpFileName))
 	call delete(l:tmpFileName)
 	return scanResult
 endfunction