Skip to content

Commit a99df22

Browse files
committed
lispy.el (lispy-eval-alist): No special behavior on (eq arg 3)
Basically reverts 11a1fd6
1 parent e634909 commit a99df22

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

le-clojure.el

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@
9191
(t
9292
e-str)))
9393

94-
(defun lispy-eval-clojure (e-str &optional _plain)
95-
"User facing eval."
94+
(defun lispy-eval-clojure (str)
95+
"Eval STR as a Clojure expression."
9696
(lispy--clojure-detect-ns)
9797
(if (eq lispy-clojure-eval-method 'spiral)
98-
(lispy--eval-clojure-spiral e-str)
99-
(lispy--eval-clojure-cider e-str)))
98+
(lispy--eval-clojure-spiral str)
99+
(lispy--eval-clojure-cider str)))
100100

101101
;;* Start REPL wrapper for eval
102102
(defvar lispy--clojure-hook-lambda nil

le-julia.el

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
(declare-function julia-shell-collect-command-output "ext:julia-shell")
2929

30-
(defun lispy--eval-julia (str &optional _plain)
30+
(defun lispy--eval-julia (str)
3131
"Eval STR as Julia code."
3232
(string-trim-right (julia-shell-collect-command-output str)))
3333

@@ -65,8 +65,8 @@
6565
(setcar bnd (point))
6666
(lispy--string-dwim bnd)))))
6767

68-
(defun lispy-eval-julia (&optional plain)
69-
(lispy--eval-julia (lispy-eval-julia-str) plain))
68+
(defun lispy-eval-julia ()
69+
(lispy--eval-julia (lispy-eval-julia-str)))
7070

7171
(provide 'le-julia)
7272

le-racket.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
(accept-process-output nil 0.001))
4444
(substring response 1 -2))))
4545

46-
(defun lispy-eval-racket (&optional _plain)
46+
(defun lispy-eval-racket ()
4747
(lispy--eval-racket (lispy--string-dwim)))
4848

4949
(provide 'le-racket)

lispy.el

+2-3
Original file line numberDiff line numberDiff line change
@@ -4350,7 +4350,7 @@ SYMBOL is a string."
43504350
'((python-mode
43514351
le-python lispy--eval-python lispy-eval-python-str lispy-eval-python-bnd)
43524352
(julia-mode
4353-
le-julia lispy-eval-julia nil lispy-eval-julia-str)
4353+
le-julia lispy-eval-julia lispy-eval-julia-str nil)
43544354
(clojure-mode
43554355
le-clojure lispy-eval-clojure nil nil)
43564356
(clojurescript-mode
@@ -4381,8 +4381,7 @@ When ARG is 2, insert the result as a comment."
43814381
(require (nth 0 handler))
43824382
(setq res (funcall
43834383
(nth 1 handler)
4384-
(funcall (or (nth 2 handler) #'lispy--string-dwim))
4385-
(eq arg 3))))
4384+
(funcall (or (nth 2 handler) #'lispy--string-dwim)))))
43864385
(setq res (lispy--eval-default)))
43874386
(when (member res '(nil ""))
43884387
(setq res lispy-eval-error))

0 commit comments

Comments
 (0)