From 8eb2aafedbb2a65a69a830814da61395cf276c54 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Tue, 8 Sep 2015 23:51:21 +0200 Subject: Ensuring switch-to-geiser asks for an implementation Should fix issue #85 --- elisp/geiser-repl.el | 5 +++-- scheme/guile/geiser/evaluation.scm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el index 57398fa..7518e0b 100644 --- a/elisp/geiser-repl.el +++ b/elisp/geiser-repl.el @@ -348,7 +348,7 @@ module command as a string") (when (not geiser-repl-skip-version-check-p) (let ((v (geiser-repl--version impl (geiser-repl--binary impl))) (r (geiser-repl--min-version impl))) - (when (geiser--version< v r) + (when (and v r (geiser--version< v r)) (error "Geiser requires %s version %s but detected %s" impl r v))))) (defun geiser-repl--start-repl (impl address) @@ -784,7 +784,8 @@ If no REPL is running, execute `run-geiser' to start a fresh one." (geiser-repl--switch-to-buffer geiser-repl--last-scm-buffer))) (repl (geiser-repl--switch-to-buffer repl)) ((geiser-repl--remote-p) (geiser-connect impl)) - (t (run-geiser impl))) + (impl (run-geiser impl)) + (t (call-interactively 'run-geiser))) (geiser-repl--maybe-remember-scm-buffer buffer))) (defun switch-to-geiser-module (&optional module buffer) diff --git a/scheme/guile/geiser/evaluation.scm b/scheme/guile/geiser/evaluation.scm index f28fb28..ea4071d 100644 --- a/scheme/guile/geiser/evaluation.scm +++ b/scheme/guile/geiser/evaluation.scm @@ -52,7 +52,7 @@ (define (stringify obj) (object->string obj (lambda (o . ps) - (pretty-print o (car ps) #:max-expr-width 1000)))) + (pretty-print o (car ps) #:max-expr-width 100)))) (define (call-with-result thunk) (letrec* ((result #f) -- cgit v1.2.3