comparison src/minibuf.c @ 22034:430908755560

(assoc_for_completion): Use Fcompare_strings. (test_completion): In obarray, try both unibyte and multibyte strings. (read_minibuf): Convert unibyte prompt to multi if minibuffer is multi. (Fdisplay_completion_list): Convert unibyte to strings to multibyte to conform to the buffer.

22033:aa1d105f0d67

  /* If appropriate, copy enable-multibyte-characters into the minibuffer.  */
  if (inherit_input_method)
    current_buffer->enable_multibyte_characters = enable_multibyte;

  /* Run our hook, but not if it is empty.
     (run-hooks would do nothing if it is empty,
     but it's important to save time here in the usual case).  */
  if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound)
      && !NILP (Vrun_hooks))
    call1 (Vrun_hooks, Qminibuffer_setup_hook);

/* ??? MCC did redraw_screen here if switching screens.  */
  recursive_edit_1 ();

  /* If cursor is on the minibuffer line,
     show the user we have exited by putting it in column 0.  */
  if ((FRAME_CURSOR_Y (selected_frame)

    }

  /* Make minibuffer contents into a string.  */
  Fset_buffer (minibuffer);
  val = make_buffer_string (1, Z, allow_props);
#if 0  /* make_buffer_string should handle the gap.  */
  bcopy (GAP_END_ADDR, XSTRING (val)->data + GPT - BEG, Z - GPT);
#endif

  /* VAL is the string of minibuffer text.  */

  last_minibuf_string = val;

      tem = oblookup (Vminibuffer_completion_table,
		      XSTRING (txt)->data,
		      XSTRING (txt)->size,
		      STRING_BYTES (XSTRING (txt)));
      if (!SYMBOLP (tem))
	return Qnil;
      else if (!NILP (Vminibuffer_completion_predicate))
	return call1 (Vminibuffer_completion_predicate, tem);
      else
	return Qt;
    }
  else

     register Lisp_Object key;
     Lisp_Object list;
{
  register Lisp_Object tail;

  if (completion_ignore_case)
    key = Fupcase (key);

  for (tail = list; !NILP (tail); tail = Fcdr (tail))
    {
      register Lisp_Object elt, tem, thiscar;
      elt = Fcar (tail);
      if (!CONSP (elt)) continue;
      thiscar = Fcar (elt);
      if (!STRINGP (thiscar))
	continue;
      if (completion_ignore_case)
	thiscar = Fupcase (thiscar);
      tem = Fequal (thiscar, key);
      if (!NILP (tem)) return elt;
      QUIT;
    }
  return Qnil;
}

	      Fset_text_properties (startpos, endpos,
				    Qnil, Vstandard_output);
	    }

	  /* Output this element.
	     If necessary, convert it to unibyte first.  */
	  if (CONSP (elt))
	    string = Fcar (elt);
	  else
	    string = elt;
	  if (NILP (current_buffer->enable_multibyte_characters)
	      && STRING_MULTIBYTE (string))
	    string = Fstring_make_unibyte (string);
	  Fprinc (string, Qnil);

	  /* Output the annotation for this element.  */
	  if (CONSP (elt))
	    Fprinc (Fcar (Fcdr (elt)), Qnil);

22034:430908755560

  /* If appropriate, copy enable-multibyte-characters into the minibuffer.  */
  if (inherit_input_method)
    current_buffer->enable_multibyte_characters = enable_multibyte;

  if (!NILP (current_buffer->enable_multibyte_characters)
      && ! STRING_MULTIBYTE (minibuf_prompt))
    minibuf_prompt = Fstring_make_multibyte (minibuf_prompt);

  /* Run our hook, but not if it is empty.
     (run-hooks would do nothing if it is empty,
     but it's important to save time here in the usual case).  */
  if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound)
      && !NILP (Vrun_hooks))
    call1 (Vrun_hooks, Qminibuffer_setup_hook);

  recursive_edit_1 ();

  /* If cursor is on the minibuffer line,
     show the user we have exited by putting it in column 0.  */
  if ((FRAME_CURSOR_Y (selected_frame)

    }

  /* Make minibuffer contents into a string.  */
  Fset_buffer (minibuffer);
  val = make_buffer_string (1, Z, allow_props);

  /* VAL is the string of minibuffer text.  */

  last_minibuf_string = val;

      tem = oblookup (Vminibuffer_completion_table,
		      XSTRING (txt)->data,
		      XSTRING (txt)->size,
		      STRING_BYTES (XSTRING (txt)));
      if (!SYMBOLP (tem))
	{
	  if (STRING_MULTIBYTE (txt))
	    txt = Fstring_make_unibyte (txt);
	  else
	    txt = Fstring_make_multibyte (txt);

	  tem = oblookup (Vminibuffer_completion_table,
			  XSTRING (txt)->data,
			  XSTRING (txt)->size,
			  STRING_BYTES (XSTRING (txt)));
	  if (!SYMBOLP (tem))
	    return Qnil;
	}
      if (!NILP (Vminibuffer_completion_predicate))
	return call1 (Vminibuffer_completion_predicate, tem);
      else
	return Qt;
    }
  else

     register Lisp_Object key;
     Lisp_Object list;
{
  register Lisp_Object tail;

  for (tail = list; !NILP (tail); tail = Fcdr (tail))
    {
      register Lisp_Object elt, tem, thiscar;
      elt = Fcar (tail);
      if (!CONSP (elt)) continue;
      thiscar = Fcar (elt);
      if (!STRINGP (thiscar))
	continue;
      tem = Fcompare_strings (thiscar, make_number (0), Qnil,
			      key, make_number (0), Qnil,
			      completion_ignore_case ? Qt : Qnil);
      if (EQ (tem, Qt))
	return elt;
      QUIT;
    }
  return Qnil;
}

	      Fset_text_properties (startpos, endpos,
				    Qnil, Vstandard_output);
	    }

	  /* Output this element.
	     If necessary, convert it to unibyte or to multibyte first.  */
	  if (CONSP (elt))
	    string = Fcar (elt);
	  else
	    string = elt;
	  if (NILP (current_buffer->enable_multibyte_characters)
	      && STRING_MULTIBYTE (string))
	    string = Fstring_make_unibyte (string);
	  else if (!NILP (current_buffer->enable_multibyte_characters)
		   && !STRING_MULTIBYTE (string))
	    string = Fstring_make_multibyte (string);
	  Fprinc (string, Qnil);

	  /* Output the annotation for this element.  */
	  if (CONSP (elt))
	    Fprinc (Fcar (Fcdr (elt)), Qnil);