From 6a890c20d685e1862c2af0fb8b69c116c5e3f857 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 1 Aug 2020 16:58:33 +0200 Subject: Adjust autoload lists. In preparation for Guile 3 support, adjust #:autoload clauses to include list all the necessary bindings, or replace them with #:use-module. --- src/guile/skribilo/utils/compat.scm | 2 +- src/guile/skribilo/utils/images.in | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/guile/skribilo/utils') diff --git a/src/guile/skribilo/utils/compat.scm b/src/guile/skribilo/utils/compat.scm index a1d5b74..81f2570 100644 --- a/src/guile/skribilo/utils/compat.scm +++ b/src/guile/skribilo/utils/compat.scm @@ -32,7 +32,7 @@ #:autoload (srfi srfi-13) (string-rindex) #:use-module (srfi srfi-34) #:use-module (ice-9 optargs) - #:autoload (skribilo ast) (ast? document? document-lookup-node) + #:use-module (skribilo ast) #:autoload (skribilo condition) (file-search-error? &file-search-error) #:autoload (skribilo reader) (make-reader) #:autoload (skribilo resolve) (*document-being-resolved*) diff --git a/src/guile/skribilo/utils/images.in b/src/guile/skribilo/utils/images.in index 672e8b5..9dc5999 100644 --- a/src/guile/skribilo/utils/images.in +++ b/src/guile/skribilo/utils/images.in @@ -1,6 +1,6 @@ ;;; images.scm -- Images handling utilities. ;;; -;;; Copyright 2005, 2006, 2007, 2008 Ludovic Courtès +;;; Copyright 2005, 2006, 2007, 2008, 2020 Ludovic Courtès ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI ;;; ;;; @@ -24,14 +24,12 @@ *fig-convert-program* *generic-convert-program*) #:autoload (skribilo utils files) (file-suffix file-prefix) - #:autoload (skribilo parameters) (*image-path* *verbose*) + #:use-module (skribilo parameters) #:autoload (skribilo condition) (&file-search-error) #:autoload (srfi srfi-34) (raise) #:use-module (srfi srfi-35) #:use-module (srfi srfi-39)) -;;; Author: Erick Gallesio, Ludovic Courtès -;;; ;;; Commentary: ;;; ;;; This module provides convenience functions to handle image files, notably -- cgit v1.2.3