From 5c669e44f1369ba229bcda0a54e8888fb3b14d2e Mon Sep 17 00:00:00 2001
From: Carl Sorensen <c_sorensen@byu.edu>
Date: Fri, 1 May 2009 19:53:34 -0600
Subject: [PATCH] Fix define-markup error messages
---
lily/general-scheme.cc | 2 --
scm/markup.scm | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index e0a21527b0..8b5766387e 100644
--- 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 b0680ead52..ceb6a86a24 100644
--- 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))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;
--
2.39.5