comparison src/xdisp.c @ 91235:4f6b5b90d755

(handle_auto_composed_prop): Don't get a character at the position here, and call font_at with the arg C -1. Don't check the range of the existing composition at the point.

91234:f6cea89c3bfe

  enum prop_handled handled = HANDLED_NORMALLY;

  if (FUNCTIONP (Vauto_composition_function))
    {
      Lisp_Object val = Qnil;
      EMACS_INT pos, pos_byte;
      int c;

      if (STRINGP (it->string))
	{
	  const unsigned char *s;

	  pos = IT_STRING_CHARPOS (*it);
	  pos_byte = IT_STRING_BYTEPOS (*it);
	  s = SDATA (it->string) + pos_byte;
	  if (STRING_MULTIBYTE (it->string))
	    c = STRING_CHAR (s, 0);
	  else
	    c = *s;
	}
      else
	{
	  pos = IT_CHARPOS (*it);
	  pos_byte = IT_BYTEPOS (*it);
	  c = FETCH_CHAR (pos_byte);
	}

      val = Fget_text_property (make_number (pos), Qauto_composed, it->string);
      if (! NILP (val))
	{
	  Lisp_Object cmp_prop;

	    {
	      Lisp_Object gstring = COMPOSITION_COMPONENTS (cmp_prop);
	      Lisp_Object font_object = LGSTRING_FONT (gstring);

	      if (! EQ (font_object,
			font_at (c, pos, FACE_FROM_ID (it->f, it->face_id),
				 it->w, it->string)))
		/* We must re-compute the composition for the
		   different font.  */
		val = Qnil;
	    }

						       Qauto_composed,
						       it->string,
						       make_number (limit));

	      if (XINT (end) < limit)
		{
		  /* The current point is auto-composed, but there
		     exist characters not yet composed beyond the
		     auto-composed region.  There's a possiblity that
		     the last characters in the region may be newly
		     composed.  */
		  if (pos < XINT (end) - 1)
		    {
		      if (get_property_and_range (XINT (end) - 1, Qcomposition,
						  &cmp_prop, &cmp_start,
						  &cmp_end, it->string))
			pos = cmp_start;
		      else
			pos = XINT (end) - 1;
		    }
		  val = Qnil;
		}
	    }
	}
      if (NILP (val))
	{
	  int count = SPECPDL_INDEX ();

91235:4f6b5b90d755

  enum prop_handled handled = HANDLED_NORMALLY;

  if (FUNCTIONP (Vauto_composition_function))
    {
      Lisp_Object val = Qnil;
      EMACS_INT pos;

      if (STRINGP (it->string))
	pos = IT_STRING_CHARPOS (*it);
      else
	pos = IT_CHARPOS (*it);

      val = Fget_text_property (make_number (pos), Qauto_composed, it->string);
      if (! NILP (val))
	{
	  Lisp_Object cmp_prop;

	    {
	      Lisp_Object gstring = COMPOSITION_COMPONENTS (cmp_prop);
	      Lisp_Object font_object = LGSTRING_FONT (gstring);

	      if (! EQ (font_object,
			font_at (-1, pos, FACE_FROM_ID (it->f, it->face_id),
				 it->w, it->string)))
		/* We must re-compute the composition for the
		   different font.  */
		val = Qnil;
	    }

						       Qauto_composed,
						       it->string,
						       make_number (limit));

	      if (XINT (end) < limit)
		/* The current point is auto-composed, but there exist
		   characters not yet composed beyond the
		   auto-composed region.  There's a possiblity that
		   the last characters in the region may be newly
		   composed.  */
		val = Qnil;
	    }
	}
      if (NILP (val))
	{
	  int count = SPECPDL_INDEX ();