Skip to content

Commit 2cbe946

Browse files
Mike Sharpevim-scripts
Mike Sharpe
authored andcommittedNov 6, 2010
Version 2.18
Recent versions since 2.16 broke user defined alternate specifications. This patch fixes that.
1 parent 1664544 commit 2cbe946

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed
 

‎plugin/a.vim

+20-6
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,16 @@ if (!exists('g:alternateNoDefaultAlternate'))
118118
let g:alternateNoDefaultAlternate = 0
119119
endif
120120

121+
" If this variable is true then a.vim will convert the alternate filename to a
122+
" filename relative to the current working directory.
123+
" Feature by Nathan Huizinga
124+
if (!exists('g:alternateRelativeFiles'))
125+
" by default a.vim will not convert the filename to one relative to the
126+
" current working directory
127+
let g:alternateRelativeFiles = 0
128+
endif
129+
130+
121131
" Function : GetNthItemFromList (PRIVATE)
122132
" Purpose : Support reading items from a comma seperated list
123133
" Used to iterate all the extensions in an extension spec
@@ -296,14 +306,14 @@ endfunction
296306
function! EnumerateFilesByExtension(path, baseName, extension)
297307
let enumeration = ""
298308
let extSpec = ""
299-
if (has_key(g:alternateExtensionsDict, a:extension))
300-
let extSpec = g:alternateExtensionsDict[a:extension]
309+
let v:errmsg = ""
310+
silent! echo g:alternateExtensions_{a:extension}
311+
if (v:errmsg == "")
312+
let extSpec = g:alternateExtensions_{a:extension}
301313
endif
302314
if (extSpec == "")
303-
let v:errmsg = ""
304-
silent! echo g:alternateExtensions_{a:extension}
305-
if (v:errmsg == "")
306-
let extSpec = g:alternateExtensions_{a:extension}
315+
if (has_key(g:alternateExtensionsDict, a:extension))
316+
let extSpec = g:alternateExtensionsDict[a:extension]
307317
endif
308318
endif
309319
if (extSpec != "")
@@ -722,6 +732,10 @@ function! <SID>FindOrCreateBuffer(fileName, doSplit, findSimilar)
722732
endif
723733
endif
724734

735+
if (g:alternateRelativeFiles == 1)
736+
let FILENAME = fnamemodify(FILENAME, ":p:.")
737+
endif
738+
725739
let splitType = a:doSplit[0]
726740
let bang = a:doSplit[1]
727741
if (bufNr == -1)

0 commit comments

Comments
 (0)
Failed to load comments.