branch: elpa/inf-clojure
commit ee38fc36193ba549c1dd6435022d285ebd4165e9
Author: Andrea Richiardi <[email protected]>
Commit: Bozhidar Batsov <[email protected]>
[Fix #96] Use inf-clojure--send-string instead of comint-proc-query
It was due.
---
CHANGELOG.md | 1 +
inf-clojure.el | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6421134..b5b34d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
* [#79](https://github.com/clojure-emacs/inf-clojure/pull/82): Eldoc error
when running boot repl.
* [#83](https://github.com/clojure-emacs/inf-clojure/pull/85): No such
namespace: complete.core in lumo REPL.
* [#93](https://github.com/clojure-emacs/inf-clojure/pull/93): Slow response
from inf-clojure (completions, arglists, ...).
+* [#101](https://github.com/clojure-emacs/inf-clojure/pull/101):
`inf-clojure-set-ns` hangs Emacs.
## 2.0.1 (2017-05-18)
diff --git a/inf-clojure.el b/inf-clojure.el
index be5bd67..0b00845 100644
--- a/inf-clojure.el
+++ b/inf-clojure.el
@@ -932,7 +932,7 @@ prefix argument PROMPT-FOR-SYMBOL, it prompts for a symbol
name."
(let ((var (if prompt-for-symbol
(car (inf-clojure-symprompt "Var doc"
(inf-clojure-symbol-at-point)))
(inf-clojure-symbol-at-point))))
- (comint-proc-query (inf-clojure-proc) (format (inf-clojure-var-doc-form)
var))))
+ (inf-clojure--send-string (inf-clojure-proc) (format
(inf-clojure-var-doc-form) var))))
(defun inf-clojure-show-var-source (prompt-for-symbol)
"Send a command to the inferior Clojure to give source for VAR.
@@ -942,7 +942,7 @@ prefix argument PROMPT-FOR-SYMBOL, it prompts for a symbol
name."
(let ((var (if prompt-for-symbol
(car (inf-clojure-symprompt "Var source"
(inf-clojure-symbol-at-point)))
(inf-clojure-symbol-at-point))))
- (comint-proc-query (inf-clojure-proc) (format
(inf-clojure-var-source-form) var))))
+ (inf-clojure--send-string (inf-clojure-proc) (format
(inf-clojure-var-source-form) var))))
;;;; Response parsing
;;;; ================
@@ -1097,7 +1097,7 @@ prefix argument PROMPT-FOR-NS, it prompts for a namespace
name."
(let ((ns (if prompt-for-ns
(car (inf-clojure-symprompt "Ns vars" (clojure-find-ns)))
(clojure-find-ns))))
- (comint-proc-query (inf-clojure-proc) (format (inf-clojure-ns-vars-form)
ns))))
+ (inf-clojure--send-string (inf-clojure-proc) (format
(inf-clojure-ns-vars-form) ns))))
(defun inf-clojure-set-ns (prompt-for-ns)
"Set the ns of the inferior Clojure process to NS.
@@ -1110,13 +1110,13 @@ PROMPT-FOR-NS, it prompts for a namespace name."
(clojure-find-ns))))
(when (or (not ns) (equal ns ""))
(user-error "No namespace selected"))
- (comint-proc-query (inf-clojure-proc) (format (inf-clojure-set-ns-form)
ns))))
+ (inf-clojure--send-string (inf-clojure-proc) (format
(inf-clojure-set-ns-form) ns))))
(defun inf-clojure-apropos (var)
"Send a form to the inferior Clojure to give apropos for VAR.
See variable `inf-clojure-apropos-form'."
(interactive (inf-clojure-symprompt "Var apropos"
(inf-clojure-symbol-at-point)))
- (comint-proc-query (inf-clojure-proc) (format (inf-clojure-apropos-form)
var)))
+ (inf-clojure--send-string (inf-clojure-proc) (format
(inf-clojure-apropos-form) var)))
(defun inf-clojure-macroexpand (&optional macro-1)
"Send a form to the inferior Clojure to give apropos for VAR.
