More linting.

git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-103

7 files changed, 32 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c99340..671bd0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,26 @@
 # arch-tag: automatic-ChangeLog--skribilo@sv.gnu.org--2006/skribilo--devo--1.2
 #
 
+2007-06-06 13:18:03 GMT	Ludovic Court`es <ludovic.courtes@laas.fr>	patch-103
+
+    Summary:
+      More linting.
+    Revision:
+      skribilo--devo--1.2--patch-103
+
+
+    modified files:
+     ChangeLog src/guile/skribilo/package/scribe.scm
+     src/guile/skribilo/utils/compat.scm
+     src/guile/skribilo/utils/images.scm
+     src/guile/skribilo/utils/keywords.scm
+     src/guile/skribilo/utils/strings.scm
+     src/guile/skribilo/utils/syntax.scm
+
+    new patches:
+     lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-62
+
+
 2007-06-06 13:17:02 GMT	Ludovic Court`es <ludovic.courtes@laas.fr>	patch-102
 
     Summary:
diff --git a/src/guile/skribilo/package/scribe.scm b/src/guile/skribilo/package/scribe.scm
index 5ab3069..40a8d29 100644
--- a/src/guile/skribilo/package/scribe.scm
+++ b/src/guile/skribilo/package/scribe.scm
@@ -215,9 +215,9 @@
 ;*---------------------------------------------------------------------*/
 ;*    prgm ...                                                         */
 ;*---------------------------------------------------------------------*/
-(define (prgm :key lnum lnumwidth language bg frame (width 1.)
-		     colors (monospace #t)
-		     :rest opts)
+(define* (prgm :key lnum lnumwidth language bg frame (width 1.)
+                    colors (monospace #t)
+               :rest opts)
    (let* ((w (cond
 		((real? width) (* width 100.))
 		((number? width) width)
diff --git a/src/guile/skribilo/utils/compat.scm b/src/guile/skribilo/utils/compat.scm
index 2113e95..3f13c42 100644
--- a/src/guile/skribilo/utils/compat.scm
+++ b/src/guile/skribilo/utils/compat.scm
@@ -28,7 +28,6 @@
   :use-module (srfi srfi-1)
   :autoload   (srfi srfi-13)       (string-rindex)
   :use-module (srfi srfi-34)
-  :use-module (srfi srfi-35)
   :use-module (ice-9 optargs)
   :autoload   (skribilo ast)       (ast? document? document-lookup-node)
   :autoload   (skribilo condition) (file-search-error? &file-search-error)
@@ -262,7 +261,9 @@
 	(else #f)))))
 
 (define-public (directory->list str)
-  (map basename (glob (string-append str "/*") (string-append "/.*"))))
+  ;; FIXME: Guile doesn't provide wrappers for `glob(3)'.
+  ;;(map basename (glob (string-append str "/*") "/.*"))
+  '())
 
 (define-macro (printf . args)   `(format #t ,@args))
 (export-syntax printf)
diff --git a/src/guile/skribilo/utils/images.scm b/src/guile/skribilo/utils/images.scm
index 24405d6..6dcbda0 100644
--- a/src/guile/skribilo/utils/images.scm
+++ b/src/guile/skribilo/utils/images.scm
@@ -21,7 +21,7 @@
 
 (define-module (skribilo utils images)
   :export (convert-image
-	   *fig-convert-program* *bitmap-convert-program*)
+	   *fig-convert-program* *generic-convert-program*)
 
   :autoload (skribilo utils files) (file-suffix file-prefix)
   :autoload (skribilo parameters)  (*image-path* *verbose*)
diff --git a/src/guile/skribilo/utils/keywords.scm b/src/guile/skribilo/utils/keywords.scm
index 1bcd5dc..0808f77 100644
--- a/src/guile/skribilo/utils/keywords.scm
+++ b/src/guile/skribilo/utils/keywords.scm
@@ -39,10 +39,10 @@
      ((null? opt*)
       (reverse! res))
      ((not (pair? opt*))
-      (skribe-error 'the-body "Illegal body" opt*))
+      (error "illegal body" opt*))
      ((keyword? (car opt*))
       (if (null? (cdr opt*))
-          (skribe-error 'the-body "Illegal option" (car opt*))
+          (error "illegal option" (car opt*))
           (loop (cddr opt*) res)))
      (else
       (loop (cdr opt*) (cons (car opt*) res))))))
@@ -58,11 +58,11 @@
      ((null? opt*)
       (reverse! res))
      ((not (pair? opt*))
-      (skribe-error 'the-options "Illegal options" opt*))
+      (error "illegal options" opt*))
      ((keyword? (car opt*))
       (cond
        ((null? (cdr opt*))
-        (skribe-error 'the-options "Illegal option" (car opt*)))
+        (error "illegal option" (car opt*)))
        ((memq (car opt*) out)
         (loop (cdr opt*) res))
        (else
diff --git a/src/guile/skribilo/utils/strings.scm b/src/guile/skribilo/utils/strings.scm
index 379464d..756cc8e 100644
--- a/src/guile/skribilo/utils/strings.scm
+++ b/src/guile/skribilo/utils/strings.scm
@@ -22,7 +22,6 @@
   :export (strip-ref-base string-canonicalize
 	   make-string-replace)
   :autoload   (skribilo parameters) (*ref-base*)
-  :use-module (skribilo lib)
   :use-module (srfi srfi-13))
 
 
diff --git a/src/guile/skribilo/utils/syntax.scm b/src/guile/skribilo/utils/syntax.scm
index 6a99771..adf4297 100644
--- a/src/guile/skribilo/utils/syntax.scm
+++ b/src/guile/skribilo/utils/syntax.scm
@@ -90,7 +90,7 @@
   (gettext msg %skribilo-text-domain))
 
 (define (N_ msg msgplural n)
-  (ngettext msg msg plural n %skribilo-text-domain))
+  (ngettext msg msgplural n %skribilo-text-domain))
 
 
 ;;; arch-tag: 9a0e0638-64f0-480a-ab19-49e8bfcbcd9b