From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 26 Jan 2006 16:22:38 +0000 (+0000)
Subject: * flower/string-convert.cc: remove publib.h
X-Git-Tag: release/2.7.29~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f5c678d37918cc47be3970ddea55335e075ffc2c;p=lilypond.git

* flower/string-convert.cc: remove publib.h

* scm/define-markup-commands.scm (verbatim-file): new markup
command \verbatim-file
---

diff --git a/ChangeLog b/ChangeLog
index 784a214849..cc1e4e602b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* flower/string-convert.cc: remove publib.h
+
 	* scm/define-markup-commands.scm (verbatim-file): new markup
 	command \verbatim-file
 
diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 7f36355fa8..140c77632d 100644
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -6,7 +6,6 @@
 
 #include "string-convert.hh"
 
-#include <publib.h>
 #include <cstring>
 #include <cstdio>
 using namespace std;
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 10c68a27af..a914e69888 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -756,7 +756,7 @@ any sort of property supported by @internalsref{font-interface} and
   (interpret-markup
    layout props
    (if  (ly:get-option 'safe)
-	"Cannot read file in Safe mode"
+	"verbatim-file disabled in safe mode"
 	(let*
 	    ((str (ly:gulp-file name))
 	     (lines (string-split str #\nl)))