More fixes for broke stuff

This commit is contained in:
Tim Pope 2012-12-15 15:41:33 -05:00
parent 53c8e0408b
commit 0ba2be1e59

View File

@ -139,8 +139,8 @@ function! s:repl.require(lib) dict abort
if a:lib !~# '^\%(user\)\=$' && !get(self.requires, a:lib, 0) if a:lib !~# '^\%(user\)\=$' && !get(self.requires, a:lib, 0)
let reload = has_key(self.requires, a:lib) ? ' :reload' : '' let reload = has_key(self.requires, a:lib) ? ' :reload' : ''
let self.requires[a:lib] = 0 let self.requires[a:lib] = 0
call self.eval('(doto '.s:qsym(a:lib).' (require'.reload.') the-ns)', 'user') let result = self.eval('(doto '.s:qsym(a:lib).' (require'.reload.') the-ns)', 'user')
let self.requires[a:lib] = 1 let self.requires[a:lib] = !has_key(result, 'ex')
endif endif
return '' return ''
endfunction endfunction
@ -724,7 +724,7 @@ function! foreplay#findfile(path) abort
\ '(if-let [ns ((ns-aliases *ns*) '.s:qsym(path).')]' . \ '(if-let [ns ((ns-aliases *ns*) '.s:qsym(path).')]' .
\ ' (str (.replace (.replace (str (ns-name ns)) "-" "_") "." "/") ".clj")' . \ ' (str (.replace (.replace (str (ns-name ns)) "-" "_") "." "/") ".clj")' .
\ ' "'.path.'.clj")') \ ' "'.path.'.clj")')
let result = get(split(c.eval(aliascmd, foreplay#ns()), "\n"), 0, '') let result = get(split(c.eval(aliascmd, foreplay#ns()).value, "\n"), 0, '')
else else
if path !~# '/' if path !~# '/'
let path = tr(path, '.-', '/_') let path = tr(path, '.-', '/_')
@ -733,7 +733,7 @@ function! foreplay#findfile(path) abort
let path .= '.clj' let path .= '.clj'
endif endif
let result = get(split(c.eval(printf(cmd, '"'.escape(path, '"').'"'), foreplay#ns()), "\n"), 0, '') let result = get(split(c.eval(printf(cmd, '"'.escape(path, '"').'"'), foreplay#ns()).value, "\n"), 0, '')
endif endif
if result ==# '' if result ==# ''