summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLudovic Courtès2009-05-25 12:52:30 +0200
committerLudovic Courtès2009-05-25 12:52:30 +0200
commitb59e35e8bfcc667ac1e2fac4772127eba0c7bed3 (patch)
tree0d4728f5667be52797c81cf3d6bce434298e693d /src
parenta8a3c031c40a95c387893a2be9606df3c50f09d6 (diff)
downloadskribilo-b59e35e8bfcc667ac1e2fac4772127eba0c7bed3.tar.gz
skribilo-b59e35e8bfcc667ac1e2fac4772127eba0c7bed3.tar.lz
skribilo-b59e35e8bfcc667ac1e2fac4772127eba0c7bed3.zip
Fix more confusion around `unspecified?'.
* src/guile/skribilo/engine.scm (engine-custom-add!): Compare OLD against `unspecified' instead of using `unspecified?'. * src/guile/skribilo/writer.scm (markup-writer-get): Likewise. (copy-markup-writer): Initialize keys to the "real" unspecified value, allowing the use of `unspecified?'.
Diffstat (limited to 'src')
-rw-r--r--src/guile/skribilo/engine.scm2
-rw-r--r--src/guile/skribilo/writer.scm16
2 files changed, 9 insertions, 9 deletions
diff --git a/src/guile/skribilo/engine.scm b/src/guile/skribilo/engine.scm
index c52f48b..51da726 100644
--- a/src/guile/skribilo/engine.scm
+++ b/src/guile/skribilo/engine.scm
@@ -344,7 +344,7 @@ otherwise the requested engine is returned."
(define (engine-custom-add! e id val)
(let ((old (engine-custom e id)))
- (if (unspecified? old)
+ (if (eq? old 'unspecified)
(engine-custom-set! e id (list val))
(engine-custom-set! e id (cons val old)))))
diff --git a/src/guile/skribilo/writer.scm b/src/guile/skribilo/writer.scm
index a57acc5..d105a05 100644
--- a/src/guile/skribilo/writer.scm
+++ b/src/guile/skribilo/writer.scm
@@ -278,7 +278,7 @@
(define (matching-writer writers)
(find (lambda (w)
(and (if class (equal? (writer-class w) class) #t)
- (or (unspecified? pred)
+ (or (eq? pred 'unspecified)
(eq? (slot-ref w 'upred) pred))))
writers))
@@ -334,13 +334,13 @@
(define* (copy-markup-writer markup old-engine ;; #:optional new-engine
- :key (predicate 'unspecified)
- (class 'unspecified)
- (options 'unspecified)
- (validate 'unspecified)
- (before 'unspecified)
- (action 'unspecified)
- (after 'unspecified)
+ :key (predicate *unspecified*)
+ (class *unspecified*)
+ (options *unspecified*)
+ (validate *unspecified*)
+ (before *unspecified*)
+ (action *unspecified*)
+ (after *unspecified*)
:rest args)
(define new-engine
;; XXX: Work around `lambda*' suckingness (see `markup-writer').