yogsototh/marginalia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't automatically try to parse a project file if the user can do it better.

Browse source
This commit is contained in:
Anthony Grimes 2011-10-11 16:10:55 -05:00
parent 51acb7f3a7
commit ffa1fbe793
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/marginalia/core.clj
View file

@ -236,7 +236,7 @@
using the found source files and a project file expected to be in its default location.
If no source files are found, complain with a usage message."
[args]
[args & [project]]
(with-command-line args
(str "Leiningen plugin for running marginalia against your project.\n\n"
"Usage: lein marg <options?> <src1> ... <src-n>\n")
@ -258,8 +258,9 @@
(println "Wrong number of arguments passed to marginalia.")
(print-help))
(binding [*docs* dir]
(let [project-clj (when (.exists (io/file "project.clj"))
(parse-project-file))
(let [project-clj (or project
(when (.exists (io/file "project.clj"))
(parse-project-file)))
choose #(or %1 %2)
marg-opts (merge-with choose
{:css (when css (.split css ";"))