From 47fd87d615102e20ec9b6ea648401caf91828711 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Aug 2020 18:49:31 +0200 Subject: Remove 'cond-expand' clauses for Guile 1.8. This is a followup to d183aa487d99baea3746f79759c17cf36c55dfbf. * src/guile/skribilo/debug.scm (with-debug): Remove 'cond-expand' and keep only 'guile-2' version. * src/guile/skribilo/engine/html.scm (&html-generic-document)[set-output-encoding]: Likewise. * src/guile/skribilo/engine/info.scm (document): Likewise. * src/guile/skribilo/engine/latex.scm (document): Likewise. * src/guile/skribilo/engine/lout.scm (document): Likewise. * src/guile/skribilo/evaluator.scm (%evaluate): Likewise. * src/guile/skribilo/location.scm : Likewise. * src/guile/skribilo/module.scm (maybe-set-module-name!): Likewise. * src/guile/skribilo/package/base.scm : Likewise. * src/guile/skribilo/utils/syntax.scm (unless, when): Remove. (set-correct-file-encoding!, default-to-utf-8): Keep only 'guile-2' variant. * tests/location.test : Likewise. * tests/readers/rss-2.test : Likewise. --- src/guile/skribilo/evaluator.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'src/guile/skribilo/evaluator.scm') diff --git a/src/guile/skribilo/evaluator.scm b/src/guile/skribilo/evaluator.scm index 02babfd..870f4f0 100644 --- a/src/guile/skribilo/evaluator.scm +++ b/src/guile/skribilo/evaluator.scm @@ -58,21 +58,7 @@ ;; Evaluate EXPR in the current module. EXPR is an arbitrary S-expression ;; that may contain calls to the markup functions defined in a markup ;; package such as `(skribilo package base)', e.g., `(bold "hello")'. - (cond-expand - (guile-2 (eval expr module)) - (else - (let ((opts (debug-options))) - (dynamic-wind - (lambda () - ;; Force use of the debugging evaluator so that we can track source - ;; location. - (debug-enable 'debug) - (debug-enable 'backtrace)) - (lambda () - (eval expr module)) - (lambda () - ;; Restore previous evaluator options. - (debug-options opts))))))) + (eval expr module)) ;;; -- cgit v1.2.3