diff src/fns.c @ 4966:48b63cd88a21

merge
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 14:11:36 -0600
parents e813cf16c015 6bc1f3f6cf0d
children b46c89ccbed3 44d7bde26046
line wrap: on
line diff
--- a/src/fns.c	Mon Feb 01 13:36:26 2010 -0600
+++ b/src/fns.c	Mon Feb 01 14:11:36 2010 -0600
@@ -2888,15 +2888,12 @@
   /* 2. If both numbers, compare with `='. */
   if (NUMBERP (obj1) && NUMBERP (obj2))
     {
-      Lisp_Object args[2];
-      args[0] = obj1;
-      args[1] = obj2;
-      return !NILP (Feqlsign (2, args));
+      return (0 == bytecode_arithcompare (obj1, obj2));
     }
 
   /* 3. If characters, compare case-insensitively. */
   if (CHARP (obj1) && CHARP (obj2))
-    return DOWNCASE (0, XCHAR (obj1)) == DOWNCASE (0, XCHAR (obj2));
+    return CANONCASE (0, XCHAR (obj1)) == CANONCASE (0, XCHAR (obj2));
 
   /* 4. If arrays of different types, compare their lengths, and
         then compare element-by-element. */
@@ -2909,7 +2906,7 @@
 	EMACS_INT i;
 	EMACS_INT l1 = XINT (Flength (obj1));
 	EMACS_INT l2 = XINT (Flength (obj2));
-	/* Both arrays, but of different types */
+	/* Both arrays, but of different lengths */
 	if (l1 != l2)
 	  return 0;
 	for (i = 0; i < l1; i++)