diff --git a/README.markdown b/README.markdown index 98f700c..e62498c 100644 --- a/README.markdown +++ b/README.markdown @@ -13,8 +13,8 @@ First, set up [cider-nrepl][]. (If you skip this step, fireplace.vim will make do with eval, which mostly works.) Next, fireplace.vim doesn't provide indenting or syntax highlighting, so you'll want [a set of Clojure runtime files](https://github.com/guns/vim-clojure-static) if you're on a version of -Vim earlier than 7.4. You might also want [classpath.vim][] to run code when -no REPL is available. +Vim earlier than 7.4. You might also want [leiningen.vim][] for assorted +static project support. If you don't have a preferred installation method, I recommend installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and @@ -41,7 +41,7 @@ one automatically. ClojureScript support is just as seamless with The only external dependency is that you have either a Vim with Python support compiled in, or `python` in your path. -Oh, and if you don't have an nREPL connection, installing [classpath.vim][] +Oh, and if you don't have an nREPL connection, installing [leiningen.vim][] lets it fall back to using `java clojure.main` for some of the basics, using a class path based on your Leiningen or Maven config. It's a bit slow, but a two-second delay is vastly preferable to being forced out of my flow for a @@ -50,6 +50,7 @@ single command, in my book. [cider-nrepl]: https://github.com/clojure-emacs/cider-nrepl [Piggieback]: https://github.com/cemerick/piggieback [classpath.vim]: https://github.com/tpope/vim-classpath +[leiningen.vim]: https://github.com/tpope/vim-leiningen ### Not quite a REPL @@ -110,10 +111,7 @@ Because why not? It works in the quasi-REPL too. > Why does it take so long for Vim to startup? -See the [classpath.vim FAQ][]. You can uninstall classpath.vim if you only -care about nREPL support. - -[classpath.vim FAQ]: https://github.com/tpope/vim-classpath#FAQ +That's either [classpath.vim][] or [leiningen.vim][]. ## Self-Promotion diff --git a/doc/fireplace.txt b/doc/fireplace.txt index 9214ffb..b964317 100644 --- a/doc/fireplace.txt +++ b/doc/fireplace.txt @@ -23,8 +23,8 @@ you can connect by hand. REPL server. The REPL is used for the commands below. If no REPL is found for the current -buffer and classpath.vim is installed, java (or $JAVA_CMD) is invoked -directly, which can be quite slow depending on your setup. +buffer and 'path' contains at least one jar file, java (or $JAVA_CMD) is +invoked directly, which can be quite slow depending on your setup. The only adapter shipped with fireplace.vim is for nREPL. You need either |if_pyth| or the python command in your PATH. @@ -45,13 +45,6 @@ properly, and that not all operations are supported. :Piggieback! Terminate the most recently created piggieback session. -LEININGEN *fireplace-leiningen* - -In addition to automatic repl connection, Clojure buffers in a Leiningen -project will automatically have their 'makeprg' set to lein and 'efm' set to -"%+G,fireplace". This combination enables `:make test` to run `lein test` and -parse the stacktraces in the results. - DOCUMENTATION *fireplace-documentation* *fireplace-:Doc*