From 238b526cf28148db254a47c08e7ec7474edbcecc Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Sat, 12 Apr 2014 20:38:33 -0400
Subject: [PATCH] Use user ns to avoid qualification

---
 autoload/fireplace/nrepl.vim | 10 +++++-----
 plugin/fireplace.vim         |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/autoload/fireplace/nrepl.vim b/autoload/fireplace/nrepl.vim
index 15adc51..614037b 100644
--- a/autoload/fireplace/nrepl.vim
+++ b/autoload/fireplace/nrepl.vim
@@ -156,11 +156,11 @@ function! s:nrepl_eval(expr, ...) dict abort
 endfunction
 
 function! s:extract_last_stacktrace(nrepl) abort
-  let format_st = '(clojure.core/symbol (clojure.core/str "\n\b" (clojure.core/apply clojure.core/str (clojure.core/interleave (clojure.core/repeat "\n") (clojure.core/map clojure.core/str (.getStackTrace *e)))) "\n\b\n"))'
-  let stacktrace = split(get(split(a:nrepl.process({'op': 'eval', 'code': '['.format_st.' *3 *2 *1]', 'session': a:nrepl.session}).value[0], "\n\b\n"), 1, ""), "\n")
-  call a:nrepl.message({'op': 'eval', 'code': '(*1 1)', 'session': a:nrepl.session})
-  call a:nrepl.message({'op': 'eval', 'code': '(*2 2)', 'session': a:nrepl.session})
-  call a:nrepl.message({'op': 'eval', 'code': '(*3 3)', 'session': a:nrepl.session})
+  let format_st = '(symbol (str "\n\b" (apply str (interleave (repeat "\n") (map str (.getStackTrace *e)))) "\n\b\n"))'
+  let stacktrace = split(get(split(a:nrepl.process({'op': 'eval', 'code': '['.format_st.' *3 *2 *1]', 'ns': 'user', 'session': a:nrepl.session}).value[0], "\n\b\n"), 1, ""), "\n")
+  call a:nrepl.message({'op': 'eval', 'code': '(*1 1)', 'ns': 'user', 'session': a:nrepl.session})
+  call a:nrepl.message({'op': 'eval', 'code': '(*2 2)', 'ns': 'user', 'session': a:nrepl.session})
+  call a:nrepl.message({'op': 'eval', 'code': '(*3 3)', 'ns': 'user', 'session': a:nrepl.session})
   return stacktrace
 endfunction
 
diff --git a/plugin/fireplace.vim b/plugin/fireplace.vim
index 8c58d37..04a5df6 100644
--- a/plugin/fireplace.vim
+++ b/plugin/fireplace.vim
@@ -1070,13 +1070,13 @@ function! s:Require(bang, echo, ns) abort
   if expand('%:e') ==# 'cljs'
     let cmd = '(load-file '.s:str(tr(a:ns ==# '' ? fireplace#ns() : a:ns, '-.', '_/').'.cljs').')'
   else
-    let cmd = ('(clojure.core/require '.s:qsym(a:ns ==# '' ? fireplace#ns() : a:ns).' :reload'.(a:bang ? '-all' : '').')')
+    let cmd = ('(require '.s:qsym(a:ns ==# '' ? fireplace#ns() : a:ns).' :reload'.(a:bang ? '-all' : '').')')
   endif
   if a:echo
     echo cmd
   endif
   try
-    call fireplace#session_eval(cmd)
+    call fireplace#session_eval(cmd, {'ns': fireplace#client().user_ns()})
     return ''
   catch /^Clojure:.*/
     return ''
@@ -1349,7 +1349,7 @@ function! fireplace#capture_test_run(expr) abort
         \ .    ' ((.getRawRoot #''clojure.test/report) m)))]'
         \ . ' ' . a:expr . ')'
   let qflist = []
-  let response = s:eval(expr, {'session': 0})
+  let response = s:eval(expr, {'session': 0, 'ns': fireplace#client().user_ns()})
   if !has_key(response, 'out')
     return s:output_response(response)
   endif