From: Graham Percival <graham@percival-music.ca>
Date: Mon, 27 Aug 2012 09:19:39 +0000 (+0100)
Subject: Run fixcc + astyle2.02.
X-Git-Tag: release/2.17.1-1~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=84df877933ef6b3b9915e58bf0ca8bd7d92fea3d;p=lilypond.git

Run fixcc + astyle2.02.
---

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 833fe6e158..67b7bcac1f 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -120,9 +120,11 @@ Lily_parser::parse_file (string init, string name, string out_name)
      OUT_FILE (unless IN_FILE redefines output file name).  */
 
   SCM mod = lexer_->set_current_scope ();
-  do {
-    do_yyparse ();
-  } while (!lexer_->is_clean ());
+  do
+    {
+      do_yyparse ();
+    }
+  while (!lexer_->is_clean ());
 
   /*
     Don't mix cyclic pointers with weak tables.
diff --git a/lily/relocate.cc b/lily/relocate.cc
index 3b6a57b715..7408106d8b 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -212,9 +212,8 @@ setup_paths (char const *argv0_ptr)
           prefix_directory = bindir + "/" + FRAMEWORKDIR;
         }
 
-
       lilypond_datadir = prefix_directory
-                     + "/share/lilypond/" TOPLEVEL_VERSION;
+                         + "/share/lilypond/" TOPLEVEL_VERSION;
     }
 
   if (getenv ("LILYPONDPREFIX"))