[Unison-hackers] [unison-svn] r448 - trunk/src
vouillon@seas.upenn.edu
vouillon at seas.upenn.edu
Thu May 20 05:09:24 EDT 2010
Author: vouillon
Date: 2010-05-20 05:09:24 -0400 (Thu, 20 May 2010)
New Revision: 448
Modified:
trunk/src/RECENTNEWS
trunk/src/mkProjectInfo.ml
trunk/src/uicommon.ml
trunk/src/unicode.ml
Log:
* One more fix to Unicode case sensitive mode
Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS 2010-05-20 09:08:30 UTC (rev 447)
+++ trunk/src/RECENTNEWS 2010-05-20 09:09:24 UTC (rev 448)
@@ -1,5 +1,10 @@
CHANGES FROM VERSION 2.40.16
+* One more fix to Unicode case sensitive mode
+
+-------------------------------
+CHANGES FROM VERSION 2.40.16
+
Lines added in profile files by unison always start at a new line
-------------------------------
Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml 2010-05-20 09:08:30 UTC (rev 447)
+++ trunk/src/mkProjectInfo.ml 2010-05-20 09:09:24 UTC (rev 448)
@@ -117,3 +117,4 @@
+
Modified: trunk/src/uicommon.ml
===================================================================
--- trunk/src/uicommon.ml 2010-05-20 09:08:30 UTC (rev 447)
+++ trunk/src/uicommon.ml 2010-05-20 09:09:24 UTC (rev 448)
@@ -435,13 +435,15 @@
(* ---- *)
(*FIX: remove when Unison version > 2.40 *)
-let _ = Remote.registerRootCmd "unicodeCaseSensitive" (fun _ -> Lwt.return ())
+let _ =
+Remote.registerRootCmd "_unicodeCaseSensitive_" (fun _ -> Lwt.return ())
let supportUnicodeCaseSensitive () =
if Uutil.myMajorVersion > "2.40" (* The test is correct until 2.99... *) then
Lwt.return true
else begin
Globals.allRootsMap
- (fun r -> Remote.commandAvailable r "unicodeCaseSensitive") >>= fun l ->
+ (fun r -> Remote.commandAvailable r "_unicodeCaseSensitive_")
+ >>= fun l ->
Lwt.return (List.for_all (fun x -> x) l)
end
Modified: trunk/src/unicode.ml
===================================================================
--- trunk/src/unicode.ml 2010-05-20 09:08:30 UTC (rev 447)
+++ trunk/src/unicode.ml 2010-05-20 09:09:24 UTC (rev 448)
@@ -1067,7 +1067,7 @@
let v = compare c c' in
if v <> 0 then v else compare_cs_rec s s' (i + 1) l
end else
- compare s s'
+ compare (decompose s) (decompose s')
end
let case_sensitive_compare s s' =
More information about the Unison-hackers
mailing list