[Unison-hackers] [unison-svn] r425 - in trunk/src: . system

[vouillon@seas.upenn.edu]

Author: vouillon
Date: 2010-03-26 10:49:42 -0400 (Fri, 26 Mar 2010)
New Revision: 425

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/system/system_win.ml
   trunk/src/unicode.mli
Log:
* Fix Windows compilation bug introduced in previous commit


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2010-03-26 14:24:04 UTC (rev 424)
+++ trunk/src/RECENTNEWS	2010-03-26 14:49:42 UTC (rev 425)
@@ -1,3 +1,8 @@
+CHANGES FROM VERSION 2.40.16
+
+* Fix Windows compilation bug introduced in previous commit
+
+-------------------------------
 CHANGES FROM VERSION 2.40.15
 
 * Added "BelowPath" patterns, that match a path as well as all paths below

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2010-03-26 14:24:04 UTC (rev 424)
+++ trunk/src/mkProjectInfo.ml	2010-03-26 14:49:42 UTC (rev 425)
@@ -42,7 +42,7 @@
 (* ---------------------------------------------------------------------- *)
 (* You shouldn't need to edit below. *)
 
-let revisionString = "$Rev: 424$";;
+let revisionString = "$Rev: 425$";;
 
 (* BCP (1/10): This bit was added to help with getting Unison via bazaar, but it
    was never used much and I'm not confident it's working.  I'll comment it out
@@ -104,3 +104,4 @@
 
 
 
+

Modified: trunk/src/system/system_win.ml
===================================================================
--- trunk/src/system/system_win.ml	2010-03-26 14:24:04 UTC (rev 424)
+++ trunk/src/system/system_win.ml	2010-03-26 14:49:42 UTC (rev 425)
@@ -65,7 +65,7 @@
     Unicode.to_utf_16 s
   with Unicode.Invalid ->
     raise (Sys_error
-             (Format.sprintf "The text '%' is not encoded in Unicode" s))
+             (Format.sprintf "The text '%s' is not encoded in Unicode" s))
 let path8 = Unicode.from_utf_16(*_filename*)
 let path16 f =
   try Unicode.to_utf_16(*_filename*) f with Unicode.Invalid -> encodingError f

Modified: trunk/src/unicode.mli
===================================================================
--- trunk/src/unicode.mli	2010-03-26 14:24:04 UTC (rev 424)
+++ trunk/src/unicode.mli	2010-03-26 14:49:42 UTC (rev 425)
@@ -1,6 +1,7 @@
 (* Unison file synchronizer: src/unicode.mli *)
 (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
 
+exception Invalid
 
 (* Case-insensitive comparison.  If two strings are equal according to
    Mac OS X (Darwin, actually, but the algorithm has hopefully