diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-10-30 23:48:18 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-10-30 23:48:18 +0200 |
| commit | 35e1b306eb7df8449d05d07596c62281bcee7736 (patch) | |
| tree | 04dccdc757616c47ea4e8a65a4e690673f5b8918 | |
| parent | 1edb6056df59a119296916a0d4a14b9887e4baa5 (diff) | |
| download | geiser-guile-35e1b306eb7df8449d05d07596c62281bcee7736.tar.gz geiser-guile-35e1b306eb7df8449d05d07596c62281bcee7736.tar.bz2 | |
Guile: really support R6RS libs
| -rw-r--r-- | elisp/geiser-guile.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el index 51de947..c406d88 100644 --- a/elisp/geiser-guile.el +++ b/elisp/geiser-guile.el @@ -134,7 +134,10 @@ This function uses `geiser-guile-init-file' if it exists." (t (format "ge:%s %s" proc (geiser-guile--linearize-args args))))) (defconst geiser-guile--module-re - "(\\(?:define-module\\|library\\) +\\(([^)]+)\\)") + "(define-module +\\(([^)]+)\\)") + +(defconst geiser-guile--library-re + "(library +\\(([^)]+)\\)") (defun geiser-guile--get-module (&optional module) (cond ((null module) @@ -142,7 +145,8 @@ This function uses `geiser-guile-init-file' if it exists." (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) |