diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2015-05-20 13:50:49 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2015-05-20 13:50:49 -0400 |
| commit | 7ea9d17bad72cf2829c75d8d241fafa70b2c9b94 (patch) | |
| tree | 170320af7177fe9e033d376d3b70e45a8dccb942 /src/settings.sml | |
| parent | 2721267f40e35a3a2acfa8ee332bda454823ef83 (diff) | |
| parent | 5c118b9e9a58e0ae09ddd74bea2a9823badb9ba5 (diff) | |
Merge branch 'upstream' into dfsg_clean20150520+dfsg
Diffstat (limited to 'src/settings.sml')
| -rw-r--r-- | src/settings.sml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings.sml b/src/settings.sml index b61759c1..cd2de8a9 100644 --- a/src/settings.sml +++ b/src/settings.sml @@ -876,7 +876,7 @@ fun setFilePath path = filePath := path fun addFile {Uri, LoadFromFilename} = let - val path = OS.Path.mkAbsolute {relativeTo = !filePath, path = LoadFromFilename} + val path = OS.Path.concat (!filePath, LoadFromFilename) in case SM.find (!files, Uri) of SOME (path', _) => |