comparison src/xdisp.c @ 26374:e3e89fd28459

Remove conditional computation on USE_TEXT_PROPERTIES. (resize_mini_window): Fix computation of needed mini-window height.

26373:e05151bc6531

	 are invisible.  */
      if (it->selective > 0
	  && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
				it->selective))
	visible_p = 0;
#ifdef USE_TEXT_PROPERTIES
      else 
	{
	  Lisp_Object prop;

	  prop = Fget_char_property (IT_CHARPOS (*it), Qinvisible, it->window);
	  if (TEXT_PROP_MEANS_INVISIBLE (prop))
	    visible_p = 0;
	}
#endif /* USE_TEXT_PROPERTIES  */

      /* Back one more newline if the current one is invisible.  */
      if (!visible_p)
	back_to_previous_line_start (it);
    }

static int
invisible_text_between_p (it, start_charpos, end_charpos)
     struct it *it;
     int start_charpos, end_charpos;
{
#ifdef USE_TEXT_PROPERTIES
  Lisp_Object prop, limit;
  int invisible_found_p;
  
  xassert (it != NULL && start_charpos <= end_charpos);

						make_number (end_charpos));
      invisible_found_p = XFASTINT (limit) < end_charpos;
    }

  return invisible_found_p;
  
#else /* not USE_TEXT_PROPERTIES */
  return 0;
#endif /* not USE_TEXT_PROPERTIES */
}


/* Move IT by a specified number DVPOS of screen lines down.  DVPOS
   negative means move up.  DVPOS == 0 means move to the start of the

      /* Correct that max. height if it's bogus. */
      max_height = max (1, max_height);
      max_height = min (total_height, max_height);
      
      /* Find out the height of the text in the window.  */
      move_it_to (&it, ZV, -1, -1, -1, MOVE_TO_POS);
      height = ((unit - 1 + it.current_y + it.max_ascent + it.max_descent)
		/ unit);
      height = max (1, height);
      
      /* Compute a suitable window start.  */
      if (height > max_height)
	{
	  height = max_height;

26374:e3e89fd28459

	 are invisible.  */
      if (it->selective > 0
	  && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
				it->selective))
	visible_p = 0;
      else 
	{
	  Lisp_Object prop;

	  prop = Fget_char_property (IT_CHARPOS (*it), Qinvisible, it->window);
	  if (TEXT_PROP_MEANS_INVISIBLE (prop))
	    visible_p = 0;
	}

      /* Back one more newline if the current one is invisible.  */
      if (!visible_p)
	back_to_previous_line_start (it);
    }

static int
invisible_text_between_p (it, start_charpos, end_charpos)
     struct it *it;
     int start_charpos, end_charpos;
{
  Lisp_Object prop, limit;
  int invisible_found_p;
  
  xassert (it != NULL && start_charpos <= end_charpos);

						make_number (end_charpos));
      invisible_found_p = XFASTINT (limit) < end_charpos;
    }

  return invisible_found_p;
}


/* Move IT by a specified number DVPOS of screen lines down.  DVPOS
   negative means move up.  DVPOS == 0 means move to the start of the

      /* Correct that max. height if it's bogus. */
      max_height = max (1, max_height);
      max_height = min (total_height, max_height);
      
      /* Find out the height of the text in the window.  */
      last_height = 0;
      move_it_to (&it, ZV, -1, -1, -1, MOVE_TO_POS);
      if (it.max_ascent == 0 && it.max_descent == 0)
	height = it.current_y + last_height;
      else
	height = it.current_y + it.max_ascent + it.max_descent;
      height = (height + unit - 1) / unit;
      
      /* Compute a suitable window start.  */
      if (height > max_height)
	{
	  height = max_height;