Skip to content

Commit 59868ff

Browse files
authored
Remove quotes from reload and fix argument parsing (#148)
The feature was kind of broken, this patch makes sure it actually works.
1 parent 6913798 commit 59868ff

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

inf-clojure.el

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ If you are using REPL types, it will pickup the most appropriate
383383
(`planck inf-clojure-load-form-planck)
384384
(_ inf-clojure-load-form)))
385385

386-
(defcustom inf-clojure-reload-form "(require '\"%s\" :reload)"
386+
(defcustom inf-clojure-reload-form "(require '%s :reload)"
387387
"Format-string for building a Clojure expression to reload a file.
388388
Reload forces loading of all the identified libs even if they are
389389
already loaded.
@@ -406,7 +406,7 @@ If you are using REPL types, it will pickup the most appropriate
406406
(inf-clojure--set-repl-type proc)
407407
inf-clojure-reload-form)
408408

409-
(defcustom inf-clojure-reload-all-form "(require '\"%s\" :reload-all)"
409+
(defcustom inf-clojure-reload-all-form "(require '%s :reload-all)"
410410
"Format-string for building a Clojure expression to :reload-all a file.
411411
Reload-all implies :reload and also forces loading of all libs
412412
that the identified libs directly or indirectly load via require
@@ -768,12 +768,12 @@ The prefix argument ARG can change the behavior of the command:
768768
- M-- C-u M-x `inf-clojure-reload': reloads all AND prompts."
769769
(interactive "P")
770770
(let* ((proc (inf-clojure-proc))
771-
(invertp (or (equal arg "-") (equal arg '(-4))))
772-
(promptp (or (equal arg '(4)) (equal arg '(-4))))
773-
(ns (if promptp
771+
(reload-all-p (or (equal arg '-) (equal arg '(-4))))
772+
(prompt-p (or (equal arg '(4)) (equal arg '(-4))))
773+
(ns (if prompt-p
774774
(car (inf-clojure-symprompt "Namespace" (clojure-find-ns)))
775775
(clojure-find-ns)))
776-
(form (if (not invertp)
776+
(form (if (not reload-all-p)
777777
(inf-clojure-reload-form proc)
778778
(inf-clojure-reload-all-form proc))))
779779
(inf-clojure--send-string proc (format form ns))))

0 commit comments

Comments
 (0)