[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/geiser-guile 52e8e12 212/284: Guile: fix for connect-to-gu
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa/geiser-guile 52e8e12 212/284: Guile: fix for connect-to-guile problems |
Date: |
Sun, 1 Aug 2021 18:29:47 -0400 (EDT) |
branch: elpa/geiser-guile
commit 52e8e125f1443d85cf3b836f5f935e833dc363e6
Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
Commit: Jose Antonio Ortega Ruiz <jao@gnu.org>
Guile: fix for connect-to-guile problems
Was a real bug, after all, and quite reproducible. Sending an ,use
metacommand was not returning a prompt, and we were waiting for ever
to start (or almost). Now, connect-to-guile is not only right, but
spiffy again.
---
elisp/geiser-guile.el | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index 6e14e88..e4473d8 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -235,7 +235,8 @@ This function uses `geiser-guile-init-file' if it exists."
(defvar geiser-guile--file-cache (make-hash-table :test 'equal))
(defun geiser-guile--resolve-file (file)
- (when (and (stringp file) (not (string-equal file "unknown file")))
+ (when (and (stringp file)
+ (not (member file '("socket" "stdin" "unknown file"))))
(if (file-name-absolute-p file) file
(or (gethash file geiser-guile--file-cache)
(puthash file
@@ -265,12 +266,13 @@ it spawn a server thread."
(interactive)
(geiser-connect 'guile))
-(defun geiser-guile--load-path-string ()
+(defun geiser-guile--set-load-path ()
(let* ((path (expand-file-name "guile/" geiser-scheme-dir))
(witness "geiser/emacs.scm")
- (code `(if (not (%search-load-path ,witness))
- (set! %load-path (cons ,path %load-path)))))
- (geiser-eval--scheme-str code)))
+ (code `(begin (if (not (%search-load-path ,witness))
+ (set! %load-path (cons ,path %load-path)))
+ 'done)))
+ (geiser-eval--send/wait code)))
(defun geiser-guile--startup (remote)
(set (make-local-variable 'compilation-error-regexp-alist)
@@ -281,12 +283,8 @@ it spawn a server thread."
`((,geiser-guile--path-rx 1
compilation-error-face)))
(let ((geiser-log-verbose-p t))
- (when remote
- (geiser-log--info
- "Guile: initialising load path... %s"
- (geiser-repl--send-silent (geiser-guile--load-path-string))))
- (geiser-log--info "Guile: using (geiser emacs)... %s"
- (geiser-repl--send-silent ",use (geiser emacs)"))
+ (when remote (geiser-guile--set-load-path))
+ (geiser-eval--send/wait ",use (geiser emacs)\n'done")
(geiser-guile-update-warning-level)))
- [nongnu] elpa/geiser-guile afa28c8 253/284: Support for guile-2.2, (continued)
- [nongnu] elpa/geiser-guile afa28c8 253/284: Support for guile-2.2, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 60c7b01 260/284: A note on dir-locals and load-path variables, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile b523072 269/284: Use cl-lib instead of cl, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 93ef710 281/284: fix: auto-activate guile implementation, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 12a6a2e 089/284: Well, i said that it was better, not that it was perfect., Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 2fd5d5b 166/284: Guile: configurable warning level, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 57e3009 191/284: Guile: better meta-command args handling, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile d2d5f62 192/284: Implementation guessing for scripts with #! ... guile, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 9889d29 196/284: Merge branch 'guile-meta' into meta-reconnection, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile b5f0316 211/284: Guile: logging initialisation process, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 52e8e12 212/284: Guile: fix for connect-to-guile problems,
Philip Kaludercic <=
- [nongnu] elpa/geiser-guile 4732e10 214/284: Bug fix: don't intern symbols read by scheme reader, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 1421a71 225/284: Guile: find module when cursor is before define-module (#33497), Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 6c9efbc 233/284: Guile: Fix subr argument name retrieval for Guile >= 2.0.9., Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 3bf45a4 249/284: Clean up indentation rules, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 9d0d38a 237/284: Guile: augmenting %load-compiled-path too, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile a1078b9 254/284: Fixing guile 2.2 compatibility, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile ef3fb34 264/284: Really fix #252, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 8bf1a8b 268/284: Fix indentation, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile ba4c1a9 276/284: adjustments to scheme load path, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 700ac98 282/284: Use new implementation extension declarator., Philip Kaludercic, 2021/08/01