Fix define-markup error messages

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index e0a21527b0510fa66a463a68300496d7ef78a678..8b5766387e0de808afe9c81d567c5cd9dfc16844 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -88,8 +88,6 @@ LY_DEFINE (ly_error, "ly:error",
           "  The error is formatted with @code{format} and @var{rest}.")
 {
   LY_ASSERT_TYPE (scm_is_string, str, 1);
-  if (scm_is_pair(scm_car(rest)))
-    rest=scm_car(rest);
   str = scm_simple_format (SCM_BOOL_F, str, rest);
   error (ly_scm2string (str));
   return SCM_UNSPECIFIED;

diff --git a/scm/markup.scm b/scm/markup.scm
index b0680ead52868bcbdf8ec5e4ec9b512ab341917c..ceb6a86a245332109bf5b9af71f50fb54915be76 100644 (file)
--- a/scm/markup.scm
+++ b/scm/markup.scm
@@ -208,7 +208,7 @@ against SIGNATURE, reporting MAKE-NAME as the user-invoked function.
         (string-append
          make-name ": "
          (_ "Invalid argument in position ~A.  Expect: ~A, found: ~S."))
-         error-msg)
+         (car error-msg) (cadr error-msg)(caddr error-msg))
        (cons markup-function args))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;