diff options
| author | Ludovic Courtès | 2020-08-06 18:49:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès | 2020-08-06 18:49:31 +0200 |
| commit | 47fd87d615102e20ec9b6ea648401caf91828711 (patch) | |
| tree | be73967a60521dc2f88414a8c8289d7e2f7c2d16 /src/guile/skribilo/engine/html.scm | |
| parent | 34c340fc7b3fa5c7218b4e42a37e8267c7258245 (diff) | |
| download | skribilo-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/engine/html.scm')
| -rw-r--r-- | src/guile/skribilo/engine/html.scm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm index 9055486..5120631 100644 --- a/src/guile/skribilo/engine/html.scm +++ b/src/guile/skribilo/engine/html.scm @@ -1161,14 +1161,11 @@ ;*---------------------------------------------------------------------*/ (define (&html-generic-document n title e) (define (set-output-encoding) - (cond-expand - (guile-2 - ;; Make sure the output is suitably encoded. - (and=> (engine-custom e 'charset) - (lambda (charset) - (set-port-encoding! (current-output-port) charset) - (set-port-conversion-strategy! (current-output-port) 'error)))) - (else #t))) + ;; Make sure the output is suitably encoded. + (and=> (engine-custom e 'charset) + (lambda (charset) + (set-port-encoding! (current-output-port) charset) + (set-port-conversion-strategy! (current-output-port) 'error)))) (let* ((id (markup-ident n)) (header (new markup |