From: Erlend Aasland <erlenda@gmail.com>
Date: Thu, 26 Oct 2006 13:52:16 +0000 (+0000)
Subject: Trivial stuff
X-Git-Tag: release/2.10.0-2~79
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=44eef75fc924487b8d322d7f4c7a4d9d73d204b1;p=lilypond.git

Trivial stuff
---

diff --git a/ChangeLog b/ChangeLog
index 61b5e01db8..b6fa9a8205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-26  Erlend Aasland  <erlenda@gmail.com>
+
+	* scm/define-grobs.scm: trivial beautification
+
+	* lily/tie-performer.cc: no need to #include "pqueue.hh"
+
+	* lily/source-file.cc: put multibyte var inside #if clause
+
 2006-10-26  Joe Neeman  <joeneeman@gmail.com>
 
 	* lily/system.cc (get_paper_system): 
diff --git a/lily/source-file.cc b/lily/source-file.cc
index bb38ffdb09..310c7938d3 100644
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -277,16 +277,14 @@ Source_file::get_counts (char const *pos_str0,
 
   while (left > 0)
     {
-      wchar_t multibyte[2];
-
       /*
 	FIXME, this is apparently locale dependent.
       */
 #if HAVE_MBRTOWC
+      wchar_t multibyte[2];
       size_t thislen = mbrtowc (multibyte, line_chars, left, &state);
 #else
       size_t thislen = 1;
-      (void) multibyte;
 #endif /* !HAVE_MBRTOWC */
 
       /* Stop converting at invalid character;
diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index 28d5cb4748..df68a638b1 100644
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -10,7 +10,6 @@
 
 #include "audio-item.hh"
 #include "context.hh"
-#include "pqueue.hh"
 #include "stream-event.hh"
 #include "translator.icc"
 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index ea47bee0f0..77dc44fb4a 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1265,7 +1265,6 @@
 				mark-interface
 				self-alignment-interface))))))
 
-
     (RepeatSlash
      . (
 	(stencil . ,ly:percent-repeat-item-interface::beat-slash)
@@ -1273,6 +1272,7 @@
 	(slope . 1.7)
 	(meta . ((class . Item)
 		 (interfaces . (percent-repeat-interface))))))
+
     (RepeatTie
      . (
 	(stencil  . ,ly:tie::print)