From f0b870d1229189ea4dee3eef813ac43973526c19 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 29 Mar 2006 23:55:06 +0000
Subject: [PATCH] *** empty log message ***
---
ChangeLog | 2 ++
lily/main.cc | 1 +
lily/ttf.cc | 7 ++++---
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 376e724993..9113bdc712 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2006-03-29 Han-Wen Nienhuys <hanwen@lilypond.org>
+ * VERSION (PACKAGE_NAME): release 2.9.0.
+
* input/regression/stem-tremolo-position.ly: new file.
* lily/stem-tremolo.cc: remove Stem_tremolo::dim_callback
diff --git a/lily/main.cc b/lily/main.cc
index 67e22fb04e..255efe5b80 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -211,6 +211,7 @@ dir_info (FILE *out)
env_var_info (out, "GS_LIB");
env_var_info (out, "GUILE_LOAD_PATH");
env_var_info (out, "PANGO_RC_FILE");
+ env_var_info (out, "PANGO_PREFIX");
env_var_info (out, "PATH");
}
}
diff --git a/lily/ttf.cc b/lily/ttf.cc
index 8fc2c148bd..bdd4eda88d 100644
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -161,9 +161,10 @@ print_trailer (void *out,
FT_Error error = FT_Get_Glyph_Name (face, i, glyph_name,
GLYPH_NAME_LEN);
if (error)
- programming_error ("print_trailer(): FT_Get_Glyph_Name() returned error");
- else
- glyph_name[0] = 0;
+ {
+ programming_error ("print_trailer(): FT_Get_Glyph_Name() returned error");
+ glyph_name[0] = 0;
+ }
}
if (!glyph_name[0])
--
2.39.5