comparison src/xdisp.c @ 91229:e2f99a24f1e6

(handle_auto_composed_prop): Use Fget_text_property instead of get_property_and_range.

91228:9b51a7263aec

  enum prop_handled handled = HANDLED_NORMALLY;

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

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

	{
	  pos = IT_CHARPOS (*it);
	  pos_byte = IT_BYTEPOS (*it);
	  c = FETCH_CHAR (pos_byte);
	}
      this_pos = pos;

      if (get_property_and_range (pos, Qauto_composed, &val, &start, &end,
				  it->string))
	{
	  Lisp_Object cmp_prop;
	  EMACS_INT cmp_start, cmp_end;

#ifdef USE_FONT_BACKEND

		val = Qnil;
	    }
#endif
	  if (! NILP (val))
	    {
	      EMACS_INT limit;

	      /* As Fnext_single_char_property_change is very slow, we
		 limit the search to the current line.  */
	      if (STRINGP (it->string))
		limit = SCHARS (it->string);
	      else
		limit = find_next_newline_no_quit (pos, 1);

	      if (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 < end - 1)
		    {
		      if (get_property_and_range (end - 1, Qcomposition,
						  &cmp_prop, &cmp_start,
						  &cmp_end, it->string))
			pos = cmp_start;
		      else
			pos = end - 1;
		    }
		  val = Qnil;
		}
	    }
	}

91229:e2f99a24f1e6

  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_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;
	  EMACS_INT cmp_start, cmp_end;

#ifdef USE_FONT_BACKEND

		val = Qnil;
	    }
#endif
	  if (! NILP (val))
	    {
	      Lisp_Object end;
	      EMACS_INT limit;

	      /* As Fnext_single_char_property_change is very slow, we
		 limit the search to the current line.  */
	      if (STRINGP (it->string))
		limit = SCHARS (it->string);
	      else
		limit = find_next_newline_no_quit (pos, 1);
	      end = Fnext_single_char_property_change (make_number (pos),
						       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;
		}
	    }
	}