From: janneke <janneke>
Date: Wed, 1 Jun 2005 07:56:41 +0000 (+0000)
Subject: (PLATFORM, slashify): Remove double slashes.
X-Git-Tag: release/2.5.32^2~89
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=078e29ddf6b5e9a0bb405b2cd29e14522467724c;p=lilypond.git

(PLATFORM, slashify): Remove double slashes.
---

diff --git a/ChangeLog b/ChangeLog
index c00a86cb2c..380c3d2ecc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-01  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* scm/lily.scm (PLATFORM, slashify): Remove double slashes.
+
 2005-06-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* input/mutopia/R.Schumann/romanze-op28-2.ly (leftb): bugfix.
diff --git a/scm/lily.scm b/scm/lily.scm
index e427012ad1..2ed241a645 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -95,9 +95,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))))