comparison src/xdisp.c @ 89991:6c1af301b455

Revision: [e-mail]--gnu-2004/emacs--unicode--0--patch-48 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-581 Fix exec-shield autoconf test * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-582 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-584 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-585 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-586 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-38 Update from CVS

89990:9cdfbf04b9ea

Lisp_Object Qline_height, Qtotal;
extern Lisp_Object Qheight;
extern Lisp_Object QCwidth, QCheight, QCascent;
extern Lisp_Object Qscroll_bar;
extern Lisp_Object Qcursor;
extern Lisp_Object Qfringe;

/* Non-nil means highlight trailing whitespace.  */

Lisp_Object Vshow_trailing_whitespace;

	  && (EQ (XCAR (prop), Qleft_fringe)
	      || EQ (XCAR (prop), Qright_fringe))
	  && CONSP (XCDR (prop)))
	{
	  unsigned face_id = DEFAULT_FACE_ID;

	  /* Save current settings of IT so that we can restore them
	     when we are finished with the glyph property value.  */

	  /* `(left-fringe BITMAP FACE)'.  */

	    return 0;

#ifdef HAVE_WINDOW_SYSTEM
	  value = XCAR (XCDR (prop));
	  if (!SYMBOLP (value)
	      || (value = Fget (value, Qfringe),
		  !valid_fringe_bitmap_p (value)))
	    return 0;

	  if (CONSP (XCDR (XCDR (prop))))
	    {
	      Lisp_Object face_name = XCAR (XCDR (XCDR (prop)));

	     set_iterator_to_next will clean this up.  */
	  *position = start_pos;

	  if (EQ (XCAR (prop), Qleft_fringe))
	    {
	      it->left_user_fringe_bitmap = XINT (value);
	      it->left_user_fringe_face_id = face_id;
	    }
	  else
	    {
	      it->right_user_fringe_bitmap = XINT (value);
	      it->right_user_fringe_face_id = face_id;
	    }
#endif /* HAVE_WINDOW_SYSTEM */
	  return 1;
	}

89991:6c1af301b455

Lisp_Object Qline_height, Qtotal;
extern Lisp_Object Qheight;
extern Lisp_Object QCwidth, QCheight, QCascent;
extern Lisp_Object Qscroll_bar;
extern Lisp_Object Qcursor;

/* Non-nil means highlight trailing whitespace.  */

Lisp_Object Vshow_trailing_whitespace;

	  && (EQ (XCAR (prop), Qleft_fringe)
	      || EQ (XCAR (prop), Qright_fringe))
	  && CONSP (XCDR (prop)))
	{
	  unsigned face_id = DEFAULT_FACE_ID;
	  int fringe_bitmap;

	  /* Save current settings of IT so that we can restore them
	     when we are finished with the glyph property value.  */

	  /* `(left-fringe BITMAP FACE)'.  */

	    return 0;

#ifdef HAVE_WINDOW_SYSTEM
	  value = XCAR (XCDR (prop));
	  if (!SYMBOLP (value)
	      || !(fringe_bitmap = lookup_fringe_bitmap (value)))
	    return 0;

	  if (CONSP (XCDR (XCDR (prop))))
	    {
	      Lisp_Object face_name = XCAR (XCDR (XCDR (prop)));

	     set_iterator_to_next will clean this up.  */
	  *position = start_pos;

	  if (EQ (XCAR (prop), Qleft_fringe))
	    {
	      it->left_user_fringe_bitmap = fringe_bitmap;
	      it->left_user_fringe_face_id = face_id;
	    }
	  else
	    {
	      it->right_user_fringe_bitmap = fringe_bitmap;
	      it->right_user_fringe_face_id = face_id;
	    }
#endif /* HAVE_WINDOW_SYSTEM */
	  return 1;
	}