From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Sun, 29 Aug 2004 13:58:05 +0000 (+0000)
Subject: (LY_DEFINE): ly:context-grob-definition takes two arguments.
X-Git-Tag: release/2.3.13~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5762e8bb079db16dd31166fa0c4b2a85464b0b8b;p=lilypond.git

(LY_DEFINE): ly:context-grob-definition takes two arguments.
---

diff --git a/ChangeLog b/ChangeLog
index 3637da19fa..d919a2cef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-29  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+
+	* lily/context-scheme.cc (LY_DEFINE): ly:context-grob-definition
+	takes two arguments.
+
 2004-08-29  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* input/regression/slur-stem-broken.ly: remove.
@@ -42,6 +47,7 @@
 	* lily/slur-quanting.cc (get_bezier): new functionality, blow up
 	slur depending on extents of note heads.
 	
+>>>>>>> 1.2519
 2004-08-28  Graham Percival  <gperlist@shaw.ca>
 
 	* Documentation/user/tutorial.itely: minor editing.
diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc
index 4288516f7a..fb83375e06 100644
--- a/lily/context-scheme.cc
+++ b/lily/context-scheme.cc
@@ -34,7 +34,7 @@ LY_DEFINE (ly_context_name, "ly:context-name",
 }
 
 LY_DEFINE (ly_context_grob_definition, "ly:context-grob-definition",
-	   1, 0, 0, (SCM context, SCM name),
+	   2, 0, 0, (SCM context, SCM name),
 	   "Return the definition of @var{name} (a symbol) within @var{context} "
 	   "as an alist")
 {