From 9c85f8c16b82531fa4fc86412071782d2d0b842e Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Fri, 18 Dec 2009 00:24:16 +0100 Subject: Guile: bug in backtrace display fixed. --- elisp/geiser-debug.el | 3 ++- elisp/geiser-guile.el | 19 ++++++++++--------- elisp/geiser-repl.el | 3 ++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/elisp/geiser-debug.el b/elisp/geiser-debug.el index 7a9f915..9b31968 100644 --- a/elisp/geiser-debug.el +++ b/elisp/geiser-debug.el @@ -45,7 +45,8 @@ ;;; Displaying retorts -(geiser-impl--define-caller geiser-debug--display-error display-error (module key message) +(geiser-impl--define-caller geiser-debug--display-error + display-error (module key message) "This method takes 3 parameters (a module name, the error key, and the accompanying error message) and should display (in the current buffer) a formatted version of the error. If the diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el index 332454f..c173f4d 100644 --- a/elisp/geiser-guile.el +++ b/elisp/geiser-guile.el @@ -109,15 +109,16 @@ This function uses `geiser-guile-init-file' if it exists." "^In \\([^\n:]+\\):\n *\\([[:digit:]]+\\|\\?\\):") (defun geiser-guile--find-files () - (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))))))) + (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) (when key diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el index ca6064f..badd578 100644 --- a/elisp/geiser-repl.el +++ b/elisp/geiser-repl.el @@ -187,7 +187,8 @@ you at that point.") "Start a new Geiser REPL." (interactive (list (or (geiser-repl--only-impl-p) - (and (eq major-mode 'geiser-repl-mode) geiser-impl--implementation) + (and (eq major-mode 'geiser-repl-mode) + geiser-impl--implementation) (geiser-repl--read-impl "Start Geiser for scheme implementation: ")))) (geiser-repl--start-repl impl)) -- cgit v1.2.3