summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2010-11-12 01:27:22 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2010-11-12 01:27:22 +0100
commit20394406701884324bec34d5bfe3bc9f8917a289 (patch)
tree44436ecaa3e1a321a45e58cba89156b48f62638b
parent69a6b57ba2ef38b409060264e33994a1deffc364 (diff)
downloadgeiser-20394406701884324bec34d5bfe3bc9f8917a289.tar.gz
geiser-20394406701884324bec34d5bfe3bc9f8917a289.tar.bz2
Nits
-rwxr-xr-xbin/geiser-racket.sh2
-rw-r--r--elisp/geiser-connection.el25
-rw-r--r--elisp/geiser-inf.el2
3 files changed, 14 insertions, 15 deletions
diff --git a/bin/geiser-racket.sh b/bin/geiser-racket.sh
index cbe3b9e..5fdfffe 100755
--- a/bin/geiser-racket.sh
+++ b/bin/geiser-racket.sh
@@ -16,4 +16,4 @@ exec racket -i -S "$top/racket" -l errortrace -cu "$0" ${1+"$@"}
(("-p" "--port") p "Geiser server port" (port (string->number p)))))
(printf "Geiser server running at port ~a~%"
- ((dynamic-require 'geiser/server 'start-geiser)))
+ ((dynamic-require 'geiser/server 'start-geiser) (port)))
diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index d1e7d59..c50e207 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -136,22 +136,21 @@
(let ((tq (geiser-con--connection-tq con)))
(and tq (tq-close tq))))
-(defvar geiser-con--connection-sentinel nil)
-(defun geiser-con--connection-sentinel (p s)
- (setq geiser-con--connection-sentinel
- (concat geiser-con--connection-sentinel s)))
+(defvar geiser-con--startup-prompt nil)
+(defun geiser-con--startup-prompt (p s)
+ (setq geiser-con--startup-prompt
+ (concat geiser-con--startup-prompt s))
+ nil)
(defun geiser-con--open-connection (host port prompt debug-prompt)
- (setq geiser-con--connection-sentinel "")
- (let ((proc (make-network-process :name "geiser-con"
- :host host
- :service port
- :filter 'geiser-con--connection-sentinel
- :noquery t)))
+ (setq geiser-con--startup-prompt "")
+ (let* ((name (format "geiser-con@%s:%s" host port))
+ (proc (open-network-stream name nil host port)))
+ (set-process-filter proc 'geiser-con--startup-prompt)
(with-timeout (10
(error (format "Timeout connecting to %s:%s" host port)))
- (while (not (string-match prompt geiser-con--connection-sentinel))
- (accept-process-output proc 1)))
+ (while (not (string-match prompt geiser-con--startup-prompt))
+ (accept-process-output proc 0.05)))
(geiser-con--make-connection proc prompt debug-prompt)))
@@ -193,7 +192,7 @@
(geiser-con--connection-eot c)
r
'geiser-con--process-completed-request
- t))
+ nil))
;;; Message sending interface:
diff --git a/elisp/geiser-inf.el b/elisp/geiser-inf.el
index 833850a..1e71299 100644
--- a/elisp/geiser-inf.el
+++ b/elisp/geiser-inf.el
@@ -31,7 +31,7 @@ arguments to be used when invoking the scheme binary.")
expression for this implementation's inferior scheme prompt. By default,
cmuscheme's prompt regexp will be used.")
-(geiser-impl--define-caller geiser-inf--init-server-cmd init-server-cmd ()
+(geiser-impl--define-caller geiser-inf--init-server-cmd init-server-command ()
"A variable (or thunk returning a value) giving the REPL server
initialization command for local processes. The command must return a
list of the form (server PORT).")