comparison src/xdisp.c @ 9981:f537f1e7264a

(try_window): Don't pass window to Fget_char_property; pass its buffer. (display_text_line): Likewise.

9980:ff5d8881a3eb

      val = *display_text_line (w, pos, vpos, val.hpos, tab_offset);
      tab_offset += width;
      if (val.vpos) tab_offset = 0;
      vpos++;
      if (pos != val.bufpos)
	last_text_vpos
	  /* Next line, unless prev line ended in end of buffer with no cr */
	  = vpos - (val.vpos && (FETCH_CHAR (val.bufpos - 1) != '\n'
#ifdef USE_TEXT_PROPERTIES
				 || ! NILP (Fget_char_property (val.bufpos-1,
								Qinvisible,
								window))
#endif
				 ));
      pos = val.bufpos;
    }

  /* If last line is continued in middle of character,
     include the split character in the text considered on the frame */

#ifdef USE_TEXT_PROPERTIES
	  /* if the `invisible' property is set to t, we can skip to
	     the next property change */
	  while (pos == next_invisible && pos < end)
	    {
	      Lisp_Object position, limit, endpos, prop, ww;
	      XSETFASTINT (position, pos);
	      XSETWINDOW (ww, w);
	      prop = Fget_char_property (position, Qinvisible, ww);
	      /* This is just an estimate to give reasonable
		 performance; nothing should go wrong if it is too small.  */
	      limit = Fnext_overlay_change (position);
	      if (XFASTINT (limit) > pos + 50)
		XSETFASTINT (limit, pos + 50);
	      endpos = Fnext_single_property_change (position, Qinvisible,
						Fcurrent_buffer (), limit);
	      if (INTEGERP (endpos))
		next_invisible = XINT (endpos);
	      else
		next_invisible = end;
	      if (! NILP (prop))

9981:f537f1e7264a

      val = *display_text_line (w, pos, vpos, val.hpos, tab_offset);
      tab_offset += width;
      if (val.vpos) tab_offset = 0;
      vpos++;
      if (pos != val.bufpos)
	{
	  last_text_vpos = vpos;
	  /* Next line, unless prev line ended in end of buffer with no cr.  */
	  if (val.vpos && (FETCH_CHAR (val.bufpos - 1) != '\n'
#ifdef USE_TEXT_PROPERTIES
			   || ! NILP (Fget_char_property
				      (val.bufpos-1,
				       Qinvisible,
				       XWINDOW (window)->buffer))
#endif
			   ))
	    --last_text_vpos;
	}
      pos = val.bufpos;
    }

  /* If last line is continued in middle of character,
     include the split character in the text considered on the frame */

#ifdef USE_TEXT_PROPERTIES
	  /* if the `invisible' property is set to t, we can skip to
	     the next property change */
	  while (pos == next_invisible && pos < end)
	    {
	      Lisp_Object position, limit, endpos, prop;
	      XSETFASTINT (position, pos);
	      prop = Fget_char_property (position, Qinvisible, w->buffer);
	      /* This is just an estimate to give reasonable
		 performance; nothing should go wrong if it is too small.  */
	      limit = Fnext_overlay_change (position);
	      if (XFASTINT (limit) > pos + 50)
		XSETFASTINT (limit, pos + 50);
	      endpos = Fnext_single_property_change (position, Qinvisible,
						     Fcurrent_buffer (),
						     limit);
	      if (INTEGERP (endpos))
		next_invisible = XINT (endpos);
	      else
		next_invisible = end;
	      if (! NILP (prop))