* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 9fee2c5c5e35d7c8bc83da709565de9bf78b021c..dd856b5a810d78b748a851e8fde2f1374409c208 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -103,11 +103,11 @@ static Getopt_long *oparser_p_static = 0;
        follow regular localisation guidelines).
  */
 static Long_option_init options_static[] = {
-  /* print example usage:  lilypond -e "" ? */
-  {_i ("EXPR"), "evaluate", 'e',_i ("Scheme options: try -e \"(set-lily-option 'help 0)\" for more help.")},
+  {_i ("EXPR"), "evaluate", 'e',
+   _i ("set options, use -e '(ly-option-usage)' for help")},
   /* another bug in option parser: --output=foe is taken as an abbreviation
      for --output-format */
-  {_i ("EXT"), "format", 'f',  _i ("use output format EXT")},
+  {_i ("EXT"), "format", 'f', _i ("use output format EXT")},
   {0, "help", 'h',  _i ("this help")},
   {_i ("FIELD"), "header", 'H',  _i ("write header field to BASENAME.FIELD")},
   {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
@@ -263,7 +263,7 @@ setup_paths ()
     for (char **s = suffixes; *s; s++)
       {
        String p = prefix_directory[i] + to_string ('/') + String (*s);
-       global_path.add (p);
+       global_path.prepend (p);
        
 #if !KPATHSEA
        /* Urg: GNU make's $ (word) index starts at 1 */
@@ -354,7 +354,8 @@ main_prog (void *, int, char **)
   const char *arg  = oparser_p_static->get_next_arg ();
 
   /* Only exit until after running init_scheme_code, for
-     (set-lily-option 'help) */
+     (ly-option-usage) or
+     -e "(ly-set-option 'help #t)" */
   if (!arg)
     {
       usage ();