Mercurial > hg > xemacs-beta
diff src/text.c @ 4962:e813cf16c015
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 01 Feb 2010 05:29:05 -0600 |
| parents | 304aebb79cd3 6ef8256a020a |
| children | 0d4c9d0f6a8d |
line wrap: on
line diff
--- a/src/text.c Sun Jan 31 21:11:44 2010 -0600 +++ b/src/text.c Mon Feb 01 05:29:05 2010 -0600 @@ -1422,15 +1422,15 @@ { while (*s1 && *s2) { - if (DOWNCASE (0, itext_ichar (s1)) != - DOWNCASE (0, itext_ichar (s2))) + if (CANONCASE (0, itext_ichar (s1)) != + CANONCASE (0, itext_ichar (s2))) break; INC_IBYTEPTR (s1); INC_IBYTEPTR (s2); } - return (DOWNCASE (0, itext_ichar (s1)) - - DOWNCASE (0, itext_ichar (s2))); + return (CANONCASE (0, itext_ichar (s1)) - + CANONCASE (0, itext_ichar (s2))); } /* The only difference between these next two and @@ -1481,8 +1481,8 @@ while (len_from_s1 > 0) { const Ibyte *old_s1 = s1; - int diff = (DOWNCASE (0, itext_ichar (s1)) - - DOWNCASE (0, itext_ichar (s2))); + int diff = (CANONCASE (0, itext_ichar (s1)) - + CANONCASE (0, itext_ichar (s2))); if (diff != 0) return diff; if (!*s1) @@ -1604,8 +1604,8 @@ { const Ibyte *old_s1 = s1; const Ibyte *old_s2 = s2; - int diff = (DOWNCASE (0, itext_ichar (s1)) - - DOWNCASE (0, itext_ichar (s2))); + int diff = (CANONCASE (0, itext_ichar (s1)) - + CANONCASE (0, itext_ichar (s2))); if (diff != 0) return diff; INC_IBYTEPTR (s1); @@ -1631,8 +1631,8 @@ { const Ibyte *old_s1 = s1; const Ibyte *old_s2 = s2; - int diff = (DOWNCASE (0, itext_ichar (s1)) - - DOWNCASE (0, itext_ichar (s2))); + int diff = (CANONCASE (0, itext_ichar (s1)) - + CANONCASE (0, itext_ichar (s2))); if (diff != 0) return diff; INC_IBYTEPTR (s1); @@ -1647,7 +1647,7 @@ } int -lisp_strcasecmp (Lisp_Object s1, Lisp_Object s2) +lisp_strcasecmp_ascii (Lisp_Object s1, Lisp_Object s2) { Ibyte *cm = strcasecmp_charmap; Ibyte *p1 = XSTRING_DATA (s1);