Support init-opts in Clj

-e is an init-opt, so is permitted to be run with other init-opts.  This
way a user can specify -e or -i flags to be run before the nrepl starts,
e.g. to load a dev tool.

Author: SevereOverfl0w

autoload/jack_in.vim

@@ -67,17 +67,17 @@ endfunction
 function! jack_in#clj_cmd(...)
   let l:clj_string = 'clj'
   let l:deps_map = '{:deps {nrepl {:mvn/version "0.7.0"} '
-  let l:cider_opts = "-m nrepl.cmdline --middleware '["
+  let l:cider_opts = '-e "(require ''nrepl.cmdline) (nrepl.cmdline/-main \"--middleware\" \"['
 
   for [dep, inj] in items(g:jack_in_injections)
     let l:deps_map .= dep . ' {:mvn/version "' . inj['version'] . '"} '
     let l:cider_opts .= ' '.inj['middleware']
   endfor
 
   let l:deps_map .= '}}'
-  let l:cider_opts .= "]'"
+  let l:cider_opts .= ']\")"'
 
-  return l:clj_string . ' ' . join(a:000, ' ') . ' -Sdeps ''' . l:deps_map . ''' ' . l:cider_opts . ' '
+  return l:clj_string . ' -Sdeps ''' . l:deps_map . ''' ' . join(a:000, ' ') . ' ' . l:cider_opts . ' '
 endfunction
 
 function! jack_in#clj(is_bg, ...)