comparison src/xdisp.c @ 62420:de870f134ee0

(handle_display_prop): Handle empty replacement. (handle_single_display_spec): Return -1 for empty replacement.

62419:0853116d727a

					position, display_replaced_p))
	  display_replaced_p = 1;
    }
  else
    {
      if (handle_single_display_spec (it, prop, object, position, 0))
	display_replaced_p = 1;
    }

  return display_replaced_p ? HANDLED_RETURN : HANDLED_NORMALLY;
}

   If PROP is a `space' or `image' specification, and in some other
   cases too, set *POSITION to the position where the `display'
   property ends.

   Value is non-zero if something was found which replaces the display
   of buffer or string text.  */

static int
handle_single_display_spec (it, spec, object, position,
			    display_replaced_before_p)
     struct it *it;

      else
	it->area = RIGHT_MARGIN_AREA;

      if (STRINGP (value))
	{
	  it->string = value;
	  it->multibyte_p = STRING_MULTIBYTE (it->string);
	  it->current.overlay_string_index = -1;
	  IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;
	  it->end_charpos = it->string_nchars = SCHARS (it->string);

62420:de870f134ee0

					position, display_replaced_p))
	  display_replaced_p = 1;
    }
  else
    {
      int ret = handle_single_display_spec (it, prop, object, position, 0);
      if (ret < 0)  /* Replaced by "", i.e. nothing. */
	return HANDLED_RECOMPUTE_PROPS;
      if (ret)
	display_replaced_p = 1;
    }

  return display_replaced_p ? HANDLED_RETURN : HANDLED_NORMALLY;
}

   If PROP is a `space' or `image' specification, and in some other
   cases too, set *POSITION to the position where the `display'
   property ends.

   Value is non-zero if something was found which replaces the display
   of buffer or string text.  Specifically, the value is -1 if that
   "something" is "nothing". */

static int
handle_single_display_spec (it, spec, object, position,
			    display_replaced_before_p)
     struct it *it;

      else
	it->area = RIGHT_MARGIN_AREA;

      if (STRINGP (value))
	{
	  if (SCHARS (value) == 0)
	    {
	      pop_it (it);
	      return -1;  /* Replaced by "", i.e. nothing.  */
	    }
	  it->string = value;
	  it->multibyte_p = STRING_MULTIBYTE (it->string);
	  it->current.overlay_string_index = -1;
	  IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;
	  it->end_charpos = it->string_nchars = SCHARS (it->string);