emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/inf-clojure 59868ff 218/313: Remove quotes from reload and


From: ELPA Syncer
Subject: [nongnu] elpa/inf-clojure 59868ff 218/313: Remove quotes from reload and fix argument parsing (#148)
Date: Wed, 11 Aug 2021 10:00:20 -0400 (EDT)

branch: elpa/inf-clojure
commit 59868ff0433f7631c362ce25879bd4271d350ebc
Author: Andrea Richiardi <a.richiardi.work@gmail.com>
Commit: GitHub <noreply@github.com>

    Remove quotes from reload and fix argument parsing (#148)
    
    The feature was kind of broken, this patch makes sure it actually works.
---
 inf-clojure.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/inf-clojure.el b/inf-clojure.el
index ccd25ab..a5c1a92 100644
--- a/inf-clojure.el
+++ b/inf-clojure.el
@@ -383,7 +383,7 @@ If you are using REPL types, it will pickup the most 
appropriate
     (`planck inf-clojure-load-form-planck)
     (_ inf-clojure-load-form)))
 
-(defcustom inf-clojure-reload-form "(require '\"%s\" :reload)"
+(defcustom inf-clojure-reload-form "(require '%s :reload)"
   "Format-string for building a Clojure expression to reload a file.
 Reload forces loading of all the identified libs even if they are
 already loaded.
@@ -406,7 +406,7 @@ If you are using REPL types, it will pickup the most 
appropriate
   (inf-clojure--set-repl-type proc)
   inf-clojure-reload-form)
 
-(defcustom inf-clojure-reload-all-form "(require '\"%s\" :reload-all)"
+(defcustom inf-clojure-reload-all-form "(require '%s :reload-all)"
   "Format-string for building a Clojure expression to :reload-all a file.
 Reload-all implies :reload and also forces loading of all libs
 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:
   - M-- C-u M-x `inf-clojure-reload': reloads all AND prompts."
   (interactive "P")
   (let* ((proc (inf-clojure-proc))
-         (invertp (or (equal arg "-") (equal arg '(-4))))
-         (promptp (or (equal arg '(4)) (equal arg '(-4))))
-         (ns (if promptp
+         (reload-all-p (or (equal arg '-) (equal arg '(-4))))
+         (prompt-p (or (equal arg '(4)) (equal arg '(-4))))
+         (ns (if prompt-p
                 (car (inf-clojure-symprompt "Namespace" (clojure-find-ns)))
               (clojure-find-ns)))
-         (form (if (not invertp)
+         (form (if (not reload-all-p)
                    (inf-clojure-reload-form proc)
                  (inf-clojure-reload-all-form proc))))
     (inf-clojure--send-string proc (format form ns))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]