Use *unspecified* and/or unspecified? instead of (begin)

diff --git a/scm/c++.scm b/scm/c++.scm
index 0ea05c944c8e0553ab91f60813e1fcb4e8185fba..a8b0d00c7ee74f7d466a25fe4859105fee1eb503 100644 (file)
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -70,7 +70,7 @@
   (or (symbol? x) (boolean? x)))
 
 (define-public (void? x)
-  (eq? x (begin)))
+  (unspecified? x))
 
 ;; moved list to end of lily.scm: then all type-predicates are
 ;; defined.

diff --git a/scm/define-event-classes.scm b/scm/define-event-classes.scm
index ddf45a199a034d4569fd3e1be90f89cfcb564a7e..65dbd38e4f94748c762026a436506293eb9ad6b0 100644 (file)
--- a/scm/define-event-classes.scm
+++ b/scm/define-event-classes.scm
@@ -87,7 +87,7 @@
                            (hashq-ref ancestor-lookup
                                       (cadr heritage)
                                       '())))))
-  (begin))
+  *unspecified*)
 
 ;; TODO: Allow entering more complex classes, by taking unions.
 (define-public (ly:make-event-class leaf)

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 69d3029de3c48763989077c980c2c7ce6c75f3a7..3ea1ba887d282d06190139bb2abd73c3e267dfa3 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -841,7 +841,7 @@ void return value (i.e., what most Guile functions with `unspecified'
 value return).  Use this when defining functions for executing actions
 rather than returning values, to keep Lilypond from trying to interpret
 the return value."
-  `(define-syntax-function (void? (begin)) ,@rest #f (begin)))
+  `(define-syntax-function (void? *unspecified*) ,@rest *unspecified*))
 
 (defmacro-public define-event-function rest
   "Defining macro returning event functions.