comparison src/xdisp.c @ 105245:41de8bc6a7be

(get_next_display_element): Use an enum in last change.

105244:1308a0fb85e9

	 it?  */
      if (success_p && it->dpvec == NULL)
	{
	  Lisp_Object dv;
	  struct charset *unibyte = CHARSET_FROM_ID (charset_unibyte);
	  int nbsp_or_shy = 0; /* 1:NO-BREAK SPACE, 2:SOFT HYPHEN, 0:ELSE */
#define IS_NBSP (nbsp_or_shy == 1)
#define IS_SHY (nbsp_or_shy == 2)
	  int decoded = it->c;

	  if (it->dp
	      && (dv = DISP_CHAR_VECTOR (it->dp, it->c),
		  VECTORP (dv)))

	    decoded = DECODE_CHAR (unibyte, it->c);

	  if (it->c >= 0x80 && ! NILP (Vnobreak_char_display))
	    {
	      if (it->multibyte_p)
		nbsp_or_shy = it->c == 0xA0 ? 1 : it->c == 0xAD ? 2 : 0;
	      else if (unibyte_display_via_language_environment)
		nbsp_or_shy = decoded == 0xA0 ? 1 : decoded == 0xAD ? 2 : 0;
	    }

	  /* Translate control characters into `\003' or `^C' form.
	     Control characters coming from a display table entry are
	     currently not translated because we use IT->dpvec to hold

	      /* Handle non-break space in the mode where it only gets
		 highlighting.  */

	      if (EQ (Vnobreak_char_display, Qt)
		  && IS_NBSP)
		{
		  /* Merge the no-break-space face into the current face.  */
		  face_id = merge_faces (it->f, Qnobreak_space, 0,
					 it->face_id);

	      /* Handle soft hyphens in the mode where they only get
		 highlighting.  */

	      if (EQ (Vnobreak_char_display, Qt)
		  && IS_SHY)
		{
		  it->c = '-';
		  XSETINT (it->ctl_chars[0], '-');
		  ctl_len = 1;
		  goto display_control;

		 with the escape glyph.  */

	      if (nbsp_or_shy)
		{
		  XSETINT (it->ctl_chars[0], escape_glyph);
		  it->c = (IS_NBSP ? ' ' : '-');
		  XSETINT (it->ctl_chars[1], it->c);
		  ctl_len = 2;
		  goto display_control;
		}

105245:41de8bc6a7be

	 it?  */
      if (success_p && it->dpvec == NULL)
	{
	  Lisp_Object dv;
	  struct charset *unibyte = CHARSET_FROM_ID (charset_unibyte);
	  enum { char_is_other = 0, char_is_nbsp, char_is_soft_hyphen }
	       nbsp_or_shy = char_is_other;
	  int decoded = it->c;

	  if (it->dp
	      && (dv = DISP_CHAR_VECTOR (it->dp, it->c),
		  VECTORP (dv)))

	    decoded = DECODE_CHAR (unibyte, it->c);

	  if (it->c >= 0x80 && ! NILP (Vnobreak_char_display))
	    {
	      if (it->multibyte_p)
		nbsp_or_shy = (it->c == 0xA0   ? char_is_nbsp
			       : it->c == 0xAD ? char_is_soft_hyphen
			       :                 char_is_other);
	      else if (unibyte_display_via_language_environment)
		nbsp_or_shy = (decoded == 0xA0   ? char_is_nbsp
			       : decoded == 0xAD ? char_is_soft_hyphen
			       :                   char_is_other);
	    }

	  /* Translate control characters into `\003' or `^C' form.
	     Control characters coming from a display table entry are
	     currently not translated because we use IT->dpvec to hold

	      /* Handle non-break space in the mode where it only gets
		 highlighting.  */

	      if (EQ (Vnobreak_char_display, Qt)
		  && nbsp_or_shy == char_is_nbsp)
		{
		  /* Merge the no-break-space face into the current face.  */
		  face_id = merge_faces (it->f, Qnobreak_space, 0,
					 it->face_id);

	      /* Handle soft hyphens in the mode where they only get
		 highlighting.  */

	      if (EQ (Vnobreak_char_display, Qt)
		  && nbsp_or_shy == char_is_soft_hyphen)
		{
		  it->c = '-';
		  XSETINT (it->ctl_chars[0], '-');
		  ctl_len = 1;
		  goto display_control;

		 with the escape glyph.  */

	      if (nbsp_or_shy)
		{
		  XSETINT (it->ctl_chars[0], escape_glyph);
		  it->c = (nbsp_or_shy == char_is_nbsp ? ' ' : '-');
		  XSETINT (it->ctl_chars[1], it->c);
		  ctl_len = 2;
		  goto display_control;
		}