[Emacs-diffs] trunk r117848: Fix the string-collation tests on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117848
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2014-09-09 17:50:32 +0300
message:
  Fix the string-collation tests on MS-Windows.
  
   tests/automated/fns-tests.el (fns-tests-collate-sort): Bind
   w32-collate-ignore-punctuation to t when sorting according to
   UTS#10 rules.  Reported by Fabrice Popineau <address@hidden>.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/fns-tests.el    fnstests.el-20140515083159-ls2r7gfl9o74ajzm-1

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-09-07 08:24:44 +0000
+++ b/test/ChangeLog    2014-09-09 14:50:32 +0000
@@ -1,3 +1,9 @@
+2014-09-09  Eli Zaretskii  <address@hidden>
+
+       * automated/fns-tests.el (fns-tests-collate-sort): Bind
+       w32-collate-ignore-punctuation to t when sorting according to
+       UTS#10 rules.
+
 2014-09-07  Michael Albinus  <address@hidden>
 
        * automated/fns-tests.el (fns-tests--collate-enabled-p): New function.

=== modified file 'test/automated/fns-tests.el'
--- a/test/automated/fns-tests.el       2014-09-07 08:24:44 +0000
+++ b/test/automated/fns-tests.el       2014-09-09 14:50:32 +0000
@@ -169,8 +169,9 @@
    (equal
     (sort '("11" "12" "1 1" "1 2" "1.1" "1.2")
          (lambda (a b)
-           (string-collate-lessp
-            a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8"))))
+           (let ((w32-collate-ignore-punctuation t))
+             (string-collate-lessp
+              a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8")))))
     '("11" "1 1" "1.1" "12" "1 2" "1.2")))
 
   ;; Diacritics are different letters for POSIX, they sort lexicographical.
@@ -184,6 +185,7 @@
    (equal
     (sort '("Ævar" "Agustín" "Adrian" "Eli")
          (lambda (a b)
-           (string-collate-lessp
-            a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8"))))
+           (let ((w32-collate-ignore-punctuation t))
+             (string-collate-lessp
+              a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8")))))
     '("Adrian" "Ævar" "Agustín" "Eli"))))