Bugfix: only append DIRSEP if BASE_

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 903df5b2f8e302276c588046f7bb0cbd9616a6b7..66bedac6138df7bc678891ccd9875773b0487a2f 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -86,6 +86,8 @@
 ;; Mingw
 ;; #(Windows XP HOSTNAME build 2600 5.01 Service Pack 1 i686)
 ;;
+
+;; ugh, code dup.
 (define-public PLATFORM
   (string->symbol
    (string-downcase
@@ -95,9 +97,11 @@
   ((windows)
    (define native-getcwd getcwd)
    (define (slashify x)
-     (if (string-index x #\/)
+     (if (string-index x #\\)
         x
-        (string-regexp-substitute "\\\\" "/" x)))
+        (string-regexp-substitute
+         "//*" "/"
+         (string-regexp-substitute "\\\\" "/" x))))
    ;; FIXME: this prints a warning.
   (define-public (ly-getcwd)
      (slashify (native-getcwd))))
@@ -327,12 +331,12 @@ The syntax is the same as `define*-public'."
         (lambda () (ly:parse-file file-name))
         (lambda (x . args) (handler x file-name)))
 
-  (if #t
+  (if #f
       (dump-gc-protects)))
 
 (use-modules (scm editor))
 
-(define (running-from-gui?)
+(define-public (running-from-gui?)
   (let ((have-tty? (isatty? (current-input-port))))
     ;; If no TTY and not using safe, assume running from GUI.
     (cond
@@ -357,7 +361,7 @@ The syntax is the same as `define*-public'."
          (begin
            ;; ugh
            (ly:stderr-redirect "foo" "r")
-           (system (get-editor-command log-name 0 0))
+           (system (get-editor-command log-name 0 0 0))
            (ly:error (_ "failed files: ~S") (string-join failed))
            ;; not reached?
            (exit 1))
@@ -367,7 +371,7 @@ The syntax is the same as `define*-public'."
   (let* ((ly (string-append (ly:effective-prefix) "/ly/"))
         ;; FIXME: soft-code, localize
         (welcome-ly (string-append ly "Welcome_to_LilyPond.ly"))
-        (cmd (get-editor-command welcome-ly 0 0)))
+        (cmd (get-editor-command welcome-ly 0 0 0)))
     (ly:message (_ "Invoking `~a'...") cmd)
     (system cmd)
     (exit 1)))