APPROVE COMMIT
NOTE: This patch has been committed.
tests/ChangeLog addition:
2007-04-29 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/mule-tests.el (featurep):
Sort the results of charsets-in-region, charsets-in-string before
comparing them to the previously-determined list of character
sets. Eliminates a dependency on the algorithm
charsets-in-{region,string} uses.
XEmacs Trunk source patch:
Diff command: cvs -q diff -Nu
Files affected: tests/automated/mule-tests.el
===================================================================
RCS
cvs server: cannot find modules/ldap/configure
Index: tests/automated/mule-tests.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/mule-tests.el,v
retrieving revision 1.13
diff -u -u -r1.13 mule-tests.el
--- tests/automated/mule-tests.el 2006/11/25 22:06:34 1.13
+++ tests/automated/mule-tests.el 2007/04/29 13:10:50
@@ -446,22 +446,23 @@
;;---------------------------------------------------------------
(with-temp-buffer
(insert-file-contents (locate-data-file "HELLO"))
- ;; #### rewrite robustly, both assume that the tested implementation
- ;; uses the same algorithm as was used by the version current at time
- ;; this test was written
- (Assert (equal (charsets-in-region (point-min) (point-max))
- '(korean-ksc5601 chinese-big5-1 chinese-gb2312
- japanese-jisx0212 katakana-jisx0201 japanese-jisx0208
- vietnamese-viscii-lower thai-xtis cyrillic-iso8859-5
- hebrew-iso8859-8 greek-iso8859-7 latin-iso8859-1
- latin-iso8859-2 arabic-2-column arabic-1-column
- ethiopic ascii)))
- (Assert (equal (charsets-in-string (buffer-substring (point-min)
+ (Assert (equal
+ ;; The sort is to make the algorithm of charsets-in-region
+ ;; irrelevant.
+ (sort (charsets-in-region (point-min) (point-max))
+ 'string<)
+ '(arabic-1-column arabic-2-column ascii chinese-big5-1
+ chinese-gb2312 cyrillic-iso8859-5 ethiopic greek-iso8859-7
+ hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212
+ katakana-jisx0201 korean-ksc5601 latin-iso8859-1
+ latin-iso8859-2 thai-xtis vietnamese-viscii-lower)))
+ (Assert (equal
+ (sort (charsets-in-string (buffer-substring (point-min)
(point-max)))
- '(korean-ksc5601 chinese-big5-1 chinese-gb2312
- japanese-jisx0212 katakana-jisx0201 japanese-jisx0208
- vietnamese-viscii-lower thai-xtis cyrillic-iso8859-5
- hebrew-iso8859-8 greek-iso8859-7 latin-iso8859-1
- latin-iso8859-2 arabic-2-column arabic-1-column
- ethiopic ascii))))
+ 'string<)
+ '(arabic-1-column arabic-2-column ascii chinese-big5-1
+ chinese-gb2312 cyrillic-iso8859-5 ethiopic greek-iso8859-7
+ hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212
+ katakana-jisx0201 korean-ksc5601 latin-iso8859-1
+ latin-iso8859-2 thai-xtis vietnamese-viscii-lower))))
)
--
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches