From d2d5f62786add57cec8e48782b84a8a45c0f5b78 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Thu, 4 Nov 2010 22:02:54 +0100 Subject: Implementation guessing for scripts with #! ... guile --- elisp/geiser-guile.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el index 3e1c03f..f13fab6 100644 --- a/elisp/geiser-guile.el +++ b/elisp/geiser-guile.el @@ -193,10 +193,14 @@ This function uses `geiser-guile-init-file' if it exists." ;;; Trying to ascertain whether a buffer is Guile Scheme: +(defconst geiser-guile--guess-re + (format "\\(%s\\|#! *.+\\(/\\| \\)guile\\( *\\\\\\)?\\)" + geiser-guile--module-re)) + (defun geiser-guile--guess () (save-excursion (goto-char (point-min)) - (re-search-forward geiser-guile--module-re nil t))) + (re-search-forward geiser-guile--guess-re nil t))) ;;; Compilation shell regexps -- cgit v1.2.3 From a77bf8bc32f6c795b4399699e5bdc56518d7c3ff Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Tue, 9 Nov 2010 02:38:49 +0100 Subject: Elisp buggettes and warnings --- elisp/geiser-guile.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el index f13fab6..1c39f14 100644 --- a/elisp/geiser-guile.el +++ b/elisp/geiser-guile.el @@ -139,8 +139,9 @@ This function uses `geiser-guile-init-file' if it exists." :f))) ((listp module) module) ((stringp module) - (or (ignore-errors (car (geiser-syntax--read-from-string module))) - :f)) + (condition-case nil + (car (geiser-syntax--read-from-string module)) + (error :f))) (t :f))) (defun geiser-guile--module-cmd (module fmt &optional def) @@ -251,7 +252,7 @@ it spawn a server thread." (font-lock-add-keywords nil `((,geiser-guile--path-rx 1 compilation-error-face))) - (geiser-eval--send/result + (geiser-eval--send/wait `(:scm ,(format "(set! %%load-path (cons %S %%load-path))" (expand-file-name "guile/" geiser-scheme-dir)))) (geiser-guile-update-warning-level)) -- cgit v1.2.3