diff options
| -rw-r--r-- | elisp/geiser-guile.el | 44 | ||||
| -rw-r--r-- | scheme/guile/geiser/xref.scm | 2 |
2 files changed, 2 insertions, 44 deletions
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el index badfcfa..9855a11 100644 --- a/elisp/geiser-guile.el +++ b/elisp/geiser-guile.el @@ -100,48 +100,6 @@ This function uses `geiser-guile-init-file' if it exists." (save-excursion (skip-syntax-backward "^-()>") (point)))) -;;; Error display -(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"))) - (if (file-name-absolute-p file) file - (or (gethash file geiser-guile--file-cache) - (puthash file - (geiser-eval--send/result - `(:eval ((:ge find-file) ,file))) - geiser-guile--file-cache))))) - -(defconst geiser-guile--file-rx - "^In \\([^\n:]+\\):\n *\\([[:digit:]]+\\|\\?\\):") - -(defun geiser-guile--find-files () - (with--geiser-implementation 'guile - (save-excursion - (while (re-search-forward geiser-guile--file-rx nil t) - (let ((file (match-string 1)) - (beg (match-beginning 1)) - (end (match-end 1)) - (line (string-to-number (or (match-string 2) "0")))) - (let ((file (geiser-guile--resolve-file file))) - (when file - (geiser-edit--make-link beg end file line 0)))))))) - -(defun geiser-guile--display-error (module key msg) - (if (eq key 'geiser-debugger) - (comint-send-string nil "bt\n") - (when key - (insert "Error: ") - (geiser--insert-with-face (format "%s" key) 'bold) - (newline 2)) - (when msg - (let ((p (point))) - (insert msg) - (goto-char p) - (geiser-guile--find-files))) - t)) - - ;;; Trying to ascertain whether a buffer is Guile Scheme: (defun geiser-guile--guess () @@ -199,7 +157,7 @@ This function uses `geiser-guile-init-file' if it exists." (find-module geiser-guile--get-module) (enter-command geiser-guile--enter-command) (find-symbol-begin geiser-guile--symbol-begin) - (display-error geiser-guile--display-error) + (display-error) (display-help) (check-buffer geiser-guile--guess)) diff --git a/scheme/guile/geiser/xref.scm b/scheme/guile/geiser/xref.scm index 18005ee..4f1b2cc 100644 --- a/scheme/guile/geiser/xref.scm +++ b/scheme/guile/geiser/xref.scm @@ -60,7 +60,7 @@ (define (procedure-xref proc . mod-name) (let ((proc-name (or (procedure-name proc) '<anonymous>)) (mod-name (if (null? mod-name) - (symbol-module name) + (symbol-module proc-name) (car mod-name)))) (make-xref proc proc-name mod-name))) |