[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/geiser-guile 9889d29 196/284: Merge branch 'guile-meta' in
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa/geiser-guile 9889d29 196/284: Merge branch 'guile-meta' into meta-reconnection |
Date: |
Sun, 1 Aug 2021 18:29:43 -0400 (EDT) |
branch: elpa/geiser-guile
commit 9889d2900b01e9fe400e79efbd6935ad7e7d4bdf
Merge: 7082042 bc80639
Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
Commit: Jose Antonio Ortega Ruiz <jao@gnu.org>
Merge branch 'guile-meta' into meta-reconnection
---
elisp/geiser-guile.el | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index d58821b..3979688 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -113,28 +113,33 @@ This function uses `geiser-guile-init-file' if it exists."
;;; Evaluation support:
+(defsubst geiser-guile--linearize-args (args)
+ (mapconcat 'identity args " "))
(defun geiser-guile--geiser-procedure (proc &rest args)
(case proc
- ((eval compile) (format "((@ (geiser emacs) ge:compile) '%s '%s)"
- (mapconcat 'identity (cdr args) " ")
- (or (car args) "#f")))
- ((load-file compile-file)
- (format "((@ (geiser emacs) ge:%s) %s)" proc (car args)))
- ((no-values) "((@ (guile) values))")
- (t (format "(apply (@ (geiser emacs) ge:%s) (list %s))"
- proc (mapconcat 'identity args "")))))
+ ((eval compile) (format ",geiser-eval %s %s%s"
+ (or (car args) "#f")
+ (geiser-guile--linearize-args (cdr args))
+ (if (cddr args) "" " ()")))
+ ((load-file compile-file) (format ",geiser-load-file %s" (car args)))
+ ((no-values) ",geiser-no-values")
+ (t (format "ge:%s (%s)" proc (geiser-guile--linearize-args args)))))
(defconst geiser-guile--module-re
"(define-module +\\(([^)]+)\\)")
+(defconst geiser-guile--library-re
+ "(library +\\(([^)]+)\\)")
+
(defun geiser-guile--get-module (&optional module)
(cond ((null module)
(save-excursion
(ignore-errors
(while (not (zerop (geiser-syntax--nesting-level)))
(backward-up-list)))
- (if (re-search-backward geiser-guile--module-re nil t)
+ (if (or (re-search-backward geiser-guile--module-re nil t)
+ (looking-at geiser-guile--library-re))
(geiser-guile--get-module (match-string-no-properties 1))
:f)))
((listp module) module)
@@ -174,7 +179,7 @@ This function uses `geiser-guile-init-file' if it exists."
(if geiser-guile-debug-show-bt-p "bt" "fr"))))
(compilation-forget-errors)
(goto-char (point-max))
- (comint-send-string nil "((@ (geiser emacs) ge:newline))\n")
+ (comint-send-string nil ",geiser-newline\n")
(comint-send-string nil ",error-message\n")
(comint-send-string nil bt-cmd)
(when geiser-guile-show-debug-help-p
@@ -252,8 +257,9 @@ it spawn a server thread."
`((,geiser-guile--path-rx 1
compilation-error-face)))
(geiser-eval--send/wait
- `(:scm ,(format "(set! %%load-path (cons %S %%load-path))"
- (expand-file-name "guile/" geiser-scheme-dir))))
+ (format "(set! %%load-path (cons %S %%load-path))"
+ (expand-file-name "guile/" geiser-scheme-dir)))
+ (geiser-eval--send/wait ",use (geiser emacs)")
(geiser-guile-update-warning-level))
- [nongnu] elpa/geiser-guile 67e9ff2 220/284: Guile: 'format' added to the warning list, (continued)
- [nongnu] elpa/geiser-guile 67e9ff2 220/284: Guile: 'format' added to the warning list, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 5ed0541 243/284: Possible fix for scanning problem, Philip Kaludercic, 2021/08/01
- [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 <=
- [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, 2021/08/01
- [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