Merge pull request #32 from andersonba/master

Escape the current path in keywordprg

Author: dag

ftplugin/fish.vim

@@ -29,7 +29,7 @@ endif
 " Use the 'man' wrapper function in fish to include fish's man pages.
 " Have to use a script for this; 'fish -c man' would make the the man page an
 " argument to fish instead of man.
-execute 'setlocal keywordprg=fish\ '.expand('<sfile>:p:h:h').'/bin/man.fish'
+execute 'setlocal keywordprg=fish\ '.escape(expand('<sfile>:p:h:h'), ' ').'/bin/man.fish'
 
 let b:match_words =
             \ escape('<%(begin|function|if|switch|while|for)>:<end>', '<>%|)')