From: Urs Liska <ul@openlilylib.org>
Date: Tue, 19 Jan 2016 09:40:13 +0000 (+0100)
Subject: #4746: Fix is-absolute? on Windows
X-Git-Tag: release/2.19.36-1~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=60e2159ae8e7c6c6da0f2ecccc0cd05d3eaf7b55;hp=e426ea7b5af83739ab2f3a255e8cbac55b16e6ec;p=lilypond.git

#4746: Fix is-absolute? on Windows

is-absolute? only looked for "?:/" and not for "?:\" to determine
the drive letter on Windows. Therefore
#(display (is-absolute? (ly-getcwd))) erroneously returned #f on Windows.
---

diff --git a/scm/lily.scm b/scm/lily.scm
index c670eb15bf..eb487d33e9 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -507,7 +507,8 @@ messages into errors.")
             (and (eq? PLATFORM 'windows)
                  (> file-name-length 2)
                  (eq? (string-ref file-name 1) #\:)
-                 (eq? (string-ref file-name 2) #\/))))))
+                 (or (eq? (string-ref file-name 2) #\\)
+                     (eq? (string-ref file-name 2) #\/)))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; If necessary, emulate Guile V2 module_export_all! for Guile V1.8.n