Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 5aba63d78d255a480a88ed7cf9e5f777d82901bd..bf8132477b290b464f6585b2e864da13f5e2c7ca 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -424,7 +424,7 @@ main_with_guile (void *, int, char **)
   SCM *tail = &files;
   while (char const *arg = option_parser->get_next_arg ())
     {
-      *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL);
+      *tail = scm_cons (scm_from_locale_string (arg), SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }
   
@@ -566,10 +566,8 @@ parse_argv (int argc, char **argv)
          be_verbose_global = true;
          break;
        case 's':
-         be_safe_global = true;
          init_scheme_variables
            += "(cons \'safe #t)\n";
-
          break;
        case 'p':
          make_preview = true;