*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 376e724993abc91150558c0fd22d2052cade7762..9113bdc712bfe76677f6f341a6a3ded9943241eb 100644 (file)
--- 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 67e22fb04e8d33d714899303fa444111a1043ba0..255efe5b80a1be719be38f239e91462b79878ff7 100644 (file)
--- 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 8fc2c148bd70124ccf2414451ddacbb06cab6fbd..bdd4eda88da361726a2e4ec990018f0b5111ca0a 100644 (file)
--- 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])