(LY_DEFINE): ly_kpathsea_expand_variable. New

[lilypond.git] / lily / input-smob.cc

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 02ff235935b931d698980901f5913cca64db916c..b5b5097b62c8bc096789adba27a603c26e475d45 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -85,14 +85,17 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 0, (SCM sip, SCM msg),
 {
   Input *ip = unsmob_input (sip);
   SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  SCM_ASSERT_TYPE (ly_string_p (msg), msg, SCM_ARG2, __FUNCTION__, "string");
+  SCM_ASSERT_TYPE (scm_is_string (msg), msg, SCM_ARG2, __FUNCTION__, "string");
 
   String m = ly_scm2string (msg);
   ip->message (m);
 
-  return SCM_UNDEFINED;
+  return SCM_UNSPECIFIED;
 }
 
+/*
+  TODO: rename this function. ly:input-location? vs ly:input-location
+ */
 LY_DEFINE (ly_input_location, "ly:input-location", 1, 0, 0, (SCM sip),
          "Return input location in @var{sip} as (filename line column).")
 {