master 871db806e6: Remove obsolete uses of obsolete functions

[Mattias Engdegård]

branch: master
commit 871db806e686236d76e8ddbf3b11dc4bbdc0b91e
Author: Mattias Engdegård <mattiase@acm.org>
Commit: Mattias Engdegård <mattiase@acm.org>

    Remove obsolete uses of obsolete functions
    
    * src/minibuf.c (minibuf_conform_representation): Remove.
    (Ftry_completion): Don't call it.
    (Ftest_completion): Don't use the obsolete Fstring_make_unibyte or
    Fstring_make_multibyte; they don't serve any useful purpose here.
    We don't try to equate unibyte and multibyte raw bytes in symbol
    lookups elsewhere and there is no reason to do it here.
---
 src/minibuf.c | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/minibuf.c b/src/minibuf.c
index 0fba334b22..bedc564480 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1545,18 +1545,6 @@ function, instead of the usual behavior.  */)
   return unbind_to (count, result);
 }
 
-static Lisp_Object
-minibuf_conform_representation (Lisp_Object string, Lisp_Object basis)
-{
-  if (STRING_MULTIBYTE (string) == STRING_MULTIBYTE (basis))
-    return string;
-
-  if (STRING_MULTIBYTE (string))
-    return Fstring_make_unibyte (string);
-  else
-    return Fstring_make_multibyte (string);
-}
-
 static bool
 match_regexps (Lisp_Object string, Lisp_Object regexps,
               bool ignore_case)
@@ -1817,7 +1805,7 @@ or from one of the possible completions.  */)
      don't change the case of what the user typed.  */
   if (completion_ignore_case && bestmatchsize == SCHARS (string)
       && SCHARS (bestmatch) > bestmatchsize)
-    return minibuf_conform_representation (string, bestmatch);
+    return string;
 
   /* Return t if the supplied string is an exact match (counting case);
      it does not require any change to be made.  */
@@ -2090,19 +2078,6 @@ the values STRING, PREDICATE and `lambda'.  */)
                      SSDATA (string),
                      SCHARS (string),
                      SBYTES (string));
-      if (!SYMBOLP (tem))
-       {
-         if (STRING_MULTIBYTE (string))
-           string = Fstring_make_unibyte (string);
-         else
-           string = Fstring_make_multibyte (string);
-
-         tem = oblookup (collection,
-                         SSDATA (string),
-                         SCHARS (string),
-                         SBYTES (string));
-       }
-
       if (completion_ignore_case && !SYMBOLP (tem))
        {
          for (i = ASIZE (collection) - 1; i >= 0; i--)