aboutsummaryrefslogtreecommitdiff
path: root/src/guile/skribilo/module.scm
diff options
context:
space:
mode:
authorLudovic Courtès2020-08-06 18:49:31 +0200
committerLudovic Courtès2020-08-06 18:49:31 +0200
commit47fd87d615102e20ec9b6ea648401caf91828711 (patch)
treebe73967a60521dc2f88414a8c8289d7e2f7c2d16 /src/guile/skribilo/module.scm
parent34c340fc7b3fa5c7218b4e42a37e8267c7258245 (diff)
downloadskribilo-47fd87d615102e20ec9b6ea648401caf91828711.tar.gz
skribilo-47fd87d615102e20ec9b6ea648401caf91828711.tar.lz
skribilo-47fd87d615102e20ec9b6ea648401caf91828711.zip
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 <top level>: Likewise. * src/guile/skribilo/module.scm (maybe-set-module-name!): Likewise. * src/guile/skribilo/package/base.scm <top level>: 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 <top level>: Likewise. * tests/readers/rss-2.test <top level>: Likewise.
Diffstat (limited to 'src/guile/skribilo/module.scm')
-rw-r--r--src/guile/skribilo/module.scm5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/guile/skribilo/module.scm b/src/guile/skribilo/module.scm
index e7fa2c5..f651305 100644
--- a/src/guile/skribilo/module.scm
+++ b/src/guile/skribilo/module.scm
@@ -1,7 +1,7 @@
;;; module.scm -- Execution environment for Skribilo documents.
;;; -*- coding: iso-8859-1 -*-
;;;
-;;; Copyright 2005, 2006, 2007, 2009 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright 2005, 2006, 2007, 2009, 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;;
;;; This file is part of Skribilo.
@@ -109,8 +109,7 @@
;;
;; Consequently, on Guile 2.x, we just let Guile choose a module name and
;; do the right thing.
- (cond-expand ((not guile-2) set-module-name!)
- (else (lambda (m n) #t))))
+ (lambda (m n) #t))
(define (make-skribe-user-module)
"Return a new module that imports all the necessary bindings required for