From 7d47c7ec4c0ec001f7c23121a0aa23aaa53a5da2 Mon Sep 17 00:00:00 2001 From: Dave Ray Date: Tue, 12 Feb 2013 19:53:22 -0800 Subject: [PATCH] Qualify clojure.core symbols I was having problems with the raw use of list in the :Doc command as well as require in :Require. Fully qualifying them fixes the issue. --- plugin/foreplay.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/foreplay.vim b/plugin/foreplay.vim index 4e1036a..0d74e6e 100644 --- a/plugin/foreplay.vim +++ b/plugin/foreplay.vim @@ -815,7 +815,7 @@ augroup END " :Require {{{1 function! s:Require(bang, ns) - let cmd = ('(require '.s:qsym(a:ns ==# '' ? foreplay#ns() : a:ns).' :reload'.(a:bang ? '-all' : '').')') + let cmd = ('(clojure.core/require '.s:qsym(a:ns ==# '' ? foreplay#ns() : a:ns).' :reload'.(a:bang ? '-all' : '').')') echo cmd try call foreplay#session_eval(cmd) @@ -1007,7 +1007,7 @@ endfunction function! s:Lookup(ns, macro, arg) abort " doc is in clojure.core in older Clojure versions try - call foreplay#session_eval("(require '".a:ns.") (clojure.core/eval (list (if (ns-resolve 'clojure.core '".a:macro.") 'clojure.core/".a:macro." '".a:ns.'/'.a:macro.") '".a:arg.'))') + call foreplay#session_eval("(clojure.core/require '".a:ns.") (clojure.core/eval (clojure.core/list (if (ns-resolve 'clojure.core '".a:macro.") 'clojure.core/".a:macro." '".a:ns.'/'.a:macro.") '".a:arg.'))') catch /^Clojure:/ catch /.*/ echohl ErrorMSG