comparison src/xdisp.c @ 63061:ac2e43626d90

(Qno_break_space): New variable. (syms_of_xdisp): Initialize it. (get_next_display_element): Add no-break space and soft hypen codes for iso8859-2 and iso8859-5. Don't add `\' for them. Use `no-break-space' face for no-break spaces.

63060:1fd49ae230dd

Lisp_Object Qtrailing_whitespace;

/* Name and number of the face used to highlight escape glyphs.  */

Lisp_Object Qescape_glyph;

/* The symbol `image' which is the car of the lists used to represent
   images in Lisp.  */

Lisp_Object Qimage;

		   || (it->multibyte_p
		       ? ((it->c >= 127
			   && it->len == 1)
			  || !CHAR_PRINTABLE_P (it->c)
			  || (!NILP (Vshow_nonbreak_escape)
			      && (it->c == 0x8ad || it->c == 0x8a0
				  || it->c == 0xf2d || it->c == 0xf20)))
		       : (it->c >= 127
			  && (!unibyte_display_via_language_environment
			      || it->c == unibyte_char_to_multibyte (it->c)))))
	    {
	      /* IT->c is a control character which must be displayed

		  /* Merge the escape-glyph face into the current face.  */
		  face_id = merge_faces (it->f, Qescape_glyph, 0,
					 it->face_id);
		}

	      if (it->c == 0x8a0 || it->c == 0x8ad
		  || it->c == 0xf20 || it->c == 0xf2d)
		{
		  XSETINT (it->ctl_chars[0], escape_glyph);
		  g = it->c;
		  XSETINT (it->ctl_chars[1], g);
		  ctl_len = 2;
		  goto display_control;
		}

	      {
		unsigned char str[MAX_MULTIBYTE_LENGTH];

  staticpro (&Qfontification_functions);
  Qtrailing_whitespace = intern ("trailing-whitespace");
  staticpro (&Qtrailing_whitespace);
  Qescape_glyph = intern ("escape-glyph");
  staticpro (&Qescape_glyph);
  Qimage = intern ("image");
  staticpro (&Qimage);
  QCmap = intern (":map");
  staticpro (&QCmap);
  QCpointer = intern (":pointer");

63061:ac2e43626d90

Lisp_Object Qtrailing_whitespace;

/* Name and number of the face used to highlight escape glyphs.  */

Lisp_Object Qescape_glyph;

/* Name and number of the face used to highlight non-breaking spaces.  */

Lisp_Object Qno_break_space;

/* The symbol `image' which is the car of the lists used to represent
   images in Lisp.  */

Lisp_Object Qimage;

		   || (it->multibyte_p
		       ? ((it->c >= 127
			   && it->len == 1)
			  || !CHAR_PRINTABLE_P (it->c)
			  || (!NILP (Vshow_nonbreak_escape)
			      && (it->c == 0x8a0 || it->c == 0x8ad
				  || it->c == 0x920 || it->c == 0x92d
				  || it->c == 0xe20 || it->c == 0xe2d
				  || it->c == 0xf20 || it->c == 0xf2d)))
		       : (it->c >= 127
			  && (!unibyte_display_via_language_environment
			      || it->c == unibyte_char_to_multibyte (it->c)))))
	    {
	      /* IT->c is a control character which must be displayed

		  /* Merge the escape-glyph face into the current face.  */
		  face_id = merge_faces (it->f, Qescape_glyph, 0,
					 it->face_id);
		}

	      if (it->c == 0x8a0 || it->c == 0x920
		  || it->c == 0xe20 || it->c == 0xf20)
		{
		  /* Merge the no-break-space face into the current face.  */
		  face_id = merge_faces (it->f, Qno_break_space, 0,
					 it->face_id);

		  g = it->c;
		  XSETINT (it->ctl_chars[0], g);
		  ctl_len = 1;
		  goto display_control;
		}

	      if (it->c == 0x8ad || it->c == 0x92d
		  || it->c == 0xe2d || it->c == 0xf2d)
		{
		  g = it->c;
		  XSETINT (it->ctl_chars[0], g);
		  ctl_len = 1;
		  goto display_control;
		}

	      {
		unsigned char str[MAX_MULTIBYTE_LENGTH];

  staticpro (&Qfontification_functions);
  Qtrailing_whitespace = intern ("trailing-whitespace");
  staticpro (&Qtrailing_whitespace);
  Qescape_glyph = intern ("escape-glyph");
  staticpro (&Qescape_glyph);
  Qno_break_space = intern ("no-break-space");
  staticpro (&Qno_break_space);
  Qimage = intern ("image");
  staticpro (&Qimage);
  QCmap = intern (":map");
  staticpro (&QCmap);
  QCpointer = intern (":pointer");