[Unison-hackers] [unison-svn] r447 - branches/2.40/src

[vouillon@seas.upenn.edu]

Author: vouillon
Date: 2010-05-20 05:08:30 -0400 (Thu, 20 May 2010)
New Revision: 447

Modified:
   branches/2.40/src/RECENTNEWS
   branches/2.40/src/mkProjectInfo.ml
   branches/2.40/src/uicommon.ml
   branches/2.40/src/unicode.ml
Log:
* One more fix to Unicode case sensitive mode


Modified: branches/2.40/src/RECENTNEWS
===================================================================
--- branches/2.40/src/RECENTNEWS	2010-05-07 14:53:11 UTC (rev 446)
+++ branches/2.40/src/RECENTNEWS	2010-05-20 09:08:30 UTC (rev 447)
@@ -1,5 +1,10 @@
 CHANGES FROM VERSION 2.40.16
 
+* One more fix to Unicode case sensitive mode
+
+-------------------------------
+CHANGES FROM VERSION 2.40.16
+
 Branch 2.40:
 * Fix to Unicode case sensitive mode (call the right function for
   comparing file names).

Modified: branches/2.40/src/mkProjectInfo.ml
===================================================================
--- branches/2.40/src/mkProjectInfo.ml	2010-05-07 14:53:11 UTC (rev 446)
+++ branches/2.40/src/mkProjectInfo.ml	2010-05-20 09:08:30 UTC (rev 447)
@@ -116,3 +116,4 @@
 
 
 
+

Modified: branches/2.40/src/uicommon.ml
===================================================================
--- branches/2.40/src/uicommon.ml	2010-05-07 14:53:11 UTC (rev 446)
+++ branches/2.40/src/uicommon.ml	2010-05-20 09:08:30 UTC (rev 447)
@@ -436,13 +436,13 @@
 
 (*FIX: remove when Unison version > 2.40 *)
 let _ =
-Remote.registerRootCmd "hasUnicodeCaseSensitive" (fun _ -> Lwt.return ())
+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 "hasUnicodeCaseSensitive")
+      (fun r -> Remote.commandAvailable r "_unicodeCaseSensitive_")
     >>= fun l ->
     Lwt.return (List.for_all (fun x -> x) l)
   end

Modified: branches/2.40/src/unicode.ml
===================================================================
--- branches/2.40/src/unicode.ml	2010-05-07 14:53:11 UTC (rev 446)
+++ branches/2.40/src/unicode.ml	2010-05-20 09:08:30 UTC (rev 447)
@@ -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' =