Skip to content

Commit 4429bfc

Browse files
committed
workaround for hy-1.0a3
1 parent df81486 commit 4429bfc

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

hy-jedhy.el

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"Text identifying successful startup of jedhy.")
6363

6464
(defconst hy-jedhy--reset-namespace-code
65-
"(setv --JEDHY (jedhy.api.API :locals- (locals) :globals- (globals) :macros- --macros--))"
65+
"(setv --JEDHY (jedhy.api.API :locals- (locals) :globals- (globals) :macros- __macros__))"
6666
"Text to send to make Jedhy's namespace current.")
6767

6868
;;; Startup
@@ -149,13 +149,13 @@ Not bound atm as this is temporary, run via M-x or bind yourself."
149149

150150
(defun hy-jedhy--format-output-tuple (output)
151151
"Format OUTPUT given as a tuple."
152-
(unless (s-equals? "()" output)
152+
(unless (s-equals? "(,)" output)
153153
(->> output
154154
(s-replace-all '(("'" . "")
155-
(",)" . "") ; one element list case
156-
("(" . "")
157-
(")" . "")))
158-
(s-split ", ")))) ; comma is a valid token so can't replace it
155+
("(, \"" . "") ; one element list case
156+
("\")" . "")))
157+
(s-split "\" \"")
158+
))) ; comma is a valid token so can't replace it
159159

160160
(defun hy-jedhy--format-describe-output (output)
161161
"Converts escaped newlines to true newlines."

0 commit comments

Comments
 (0)