From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 10 Apr 1997 22:42:34 +0000 (+0000)
Subject: (scmp, Fdisplay_completion_list): Fix Lisp_Object/integer confusion.
X-Git-Tag: emacs-20.1~2570
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49db96ce3dd8a81659205db1d7e287921018f765;p=emacs.git

(scmp, Fdisplay_completion_list): Fix Lisp_Object/integer confusion.
---

diff --git a/src/minibuf.c b/src/minibuf.c
index 0db5e62677a..daf533eda4f 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -926,7 +926,7 @@ scmp (s1, s2, len)
 
   if (completion_ignore_case)
     {
-      while (l && DOWNCASE (*s1++) == DOWNCASE (*s2++))
+      while (l && EQ (DOWNCASE (*s1++), DOWNCASE (*s2++)))
 	l--;
     }
   else
@@ -1623,18 +1623,18 @@ It can find the completion buffer in `standard-output'.")
 	  /* Compute the length of this element.  */
 	  if (CONSP (elt))
 	    {
-	      tem = Fcar (elt);
+	      tem = XCAR (elt);
 	      CHECK_STRING (tem, 0);
-	      length = XINT (XSTRING (tem)->size);
+	      length = XSTRING (tem)->size;
 
-	      tem = Fcar (Fcdr (elt));
+	      tem = Fcar (XCDR (elt));
 	      CHECK_STRING (tem, 0);
-	      length += XINT (XSTRING (tem)->size);
+	      length += XSTRING (tem)->size;
 	    }
 	  else
 	    {
 	      CHECK_STRING (elt, 0);
-	      length = XINT (XSTRING (elt)->size);
+	      length = XSTRING (elt)->size;
 	    }
 
 	  /* This does a bad job for narrower than usual windows.