From: Carl Sorensen <c_sorensen@byu.edu>
Date: Sat, 2 May 2009 01:53:34 +0000 (-0600)
Subject: Fix define-markup error messages
X-Git-Tag: release/2.12.3-1~132
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e434a44b5d693cba78b5debb929a76da4c744981;p=lilypond.git

Fix define-markup error messages
(cherry picked from commit c86e7e0d4b88cb78386ea6b4828d5568ce87bdc1)
---

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))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;