From c5d4a2b6670a9f3ce8b357ef5f4cab72eb211102 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Sun, 1 Mar 2009 20:06:18 +0100 Subject: Refactoring the refactoring. --- elisp/geiser-debug.el | 9 ++++++++- elisp/geiser-eval.el | 10 ---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/elisp/geiser-debug.el b/elisp/geiser-debug.el index 20db436..6393e7e 100644 --- a/elisp/geiser-debug.el +++ b/elisp/geiser-debug.el @@ -25,6 +25,7 @@ ;;; Code: +(require 'geiser-repl) (require 'geiser-eval) (require 'geiser-popup) (require 'geiser-base) @@ -93,8 +94,14 @@ (insert (format "%s%s\n" (make-string offset ?\ ) description)))) (defun geiser-debug--send-region (compile start end and-go) - (let* ((ret (geiser-eval--send-region compile start end and-go)) + (let* ((str (buffer-substring-no-properties start end)) + (code `(,(if compile :comp :eval) (:scm ,str))) + (ret (geiser-eval--send/wait code)) (err (geiser-eval--retort-error ret))) + (when and-go + (switch-to-guile) + (push-mark) + (goto-char (point-max))) (if (not err) (message (format "=> %s" (geiser-eval--retort-result ret))) (geiser-debug--display-retort str ret)))) diff --git a/elisp/geiser-eval.el b/elisp/geiser-eval.el index ca0460f..09f12da 100644 --- a/elisp/geiser-eval.el +++ b/elisp/geiser-eval.el @@ -117,16 +117,6 @@ (defsubst geiser-eval--send/result (code &optional timeout buffer) (geiser-eval--retort-result (geiser-eval--send/wait code timeout buffer))) -(defun geiser-eval--send-region (compile start end and-go) - (let* ((str (buffer-substring-no-properties start end)) - (code `(,(if compile :comp :eval) (:scm ,str))) - (ret (geiser-eval--send/wait code))) - (when and-go - (switch-to-guile) - (push-mark) - (goto-char (point-max))) - ret)) - ;;; Retort parsing: -- cgit v1.2.3