emacs: src/xdisp.c comparison

comparison src/xdisp.c @ 39858:13bf107afa6d

(init_iterator): Be more strict with bytepos and charspos. (DOLIST, LOOP_PROPVAL): New macros. (invisible_p, invisible_ellipsis_p): Use them. (invisible_noellipsis_p): New function. (syms_of_xdisp): Use empty_string.

author	Stefan Monnier <monnier@iro.umontreal.ca>
date	Fri, 12 Oct 2001 22:15:07 +0000
parents	dae975f461fa
children	91951fb5b9e5

comparison

equal deleted inserted replaced

-:6235c0f8e52c
+:13bf107afa6d
 static int make_cursor_line_fully_visible P_ ((struct window *));
 static int try_scrolling P_ ((Lisp_Object, int, int, int, int));
 static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *));
 static int trailing_whitespace_p P_ ((int));
 static int message_log_check_duplicate P_ ((int, int, int, int));
-int invisible_p P_ ((Lisp_Object, Lisp_Object));
-int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object));
 static void push_it P_ ((struct it *));
 static void pop_it P_ ((struct it *));
 static void sync_frame_with_window_matrix_rows P_ ((struct window *));
 static void redisplay_internal P_ ((int));
 static int echo_area_display P_ ((int));
 /* Initialize IT for displaying current_buffer in window W, starting
 at character position CHARPOS.  CHARPOS < 0 means that no buffer
 position is specified which is useful when the iterator is assigned
 a position later.  BYTEPOS is the byte position corresponding to
-CHARPOS.  BYTEPOS <= 0 means compute it from CHARPOS.
+CHARPOS.  BYTEPOS < 0 means compute it from CHARPOS.
 If ROW is not null, calls to produce_glyphs with IT as parameter
 will produce glyphs in that row.
 BASE_FACE_ID is the id of a base face to use.  It must be one of
 /* Are multibyte characters enabled in current_buffer?  */
 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
 /* Non-zero if we should highlight the region.  */
 highlight_region_p
 = (!NILP (Vtransient_mark_mode)
 && !NILP (current_buffer->mark_active)
 && XMARKER (current_buffer->mark)->buffer != 0);
 /* Set IT->region_beg_charpos and IT->region_end_charpos to the
 start and end of a visible region in window IT->w.  Set both to
 	it->start_of_box_run_p = 1;
 }
 /* If a buffer position was specified, set the iterator there,
 getting overlays and face properties from that position.  */
-if (charpos > 0)
+if (charpos >= BUF_BEG (current_buffer))
 {
 it->end_charpos = ZV;
 it->face_id = -1;
 IT_CHARPOS (*it) = charpos;
 /* Compute byte position if not specified.  */
-if (bytepos <= 0)
+if (bytepos < charpos)
 	IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos);
 else
 	IT_BYTEPOS (*it) = bytepos;
 /* Compute faces etc.  */
 	  window_box (w, TEXT_AREA, &text_area_x, &text_area_y,
 		      &text_area_width, &text_area_height);
 	  /* Scroll when cursor is inside this scroll margin.  */
+	  /* Shouldn't we export this `5' for customization ?  -stef  */
 	  hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame));
 	  if ((XFASTINT (w->hscroll)
 	       && w->cursor.x < hscroll_margin)
 	      || (cursor_row->enabled_p
 return it->hpos - hpos_at_start;
 }
+#define DOLIST(var, list, code)				\
+{							\
+register Lisp_Object tail;				\
+for (tail = list; CONSP (tail); tail = XCDR (tail))	\
+{							\
+	var = XCAR (tail);				\
+	code;						\
+}							\
+}
+/* Loop through the properties in PROPVAL and call CODE for each.
+CODE can access the current element in `propelt'.  */
+#define LOOP_PROPVAL(var, propval, code)			\
+{								\
+var = (propval);						\
+code;							\
+								\
+if (CONSP (propval))					\
+{								\
+	register Lisp_Object tail;				\
+	for (tail = propval; CONSP (tail); tail = XCDR (tail))	\
+	  {							\
+	    var = XCAR (tail);					\
+	    code;						\
+	  }							\
+}								\
+return 0;							\
+}
 /* This is like a combination of memq and assq.  Return 1 if PROPVAL
 appears as an element of LIST or as the car of an element of LIST.
 If PROPVAL is a list, compare each element against LIST in that
 way, and return 1 if any element of PROPVAL is found in LIST.
 Otherwise return 0.  This function cannot quit.  */
 int
 invisible_p (propval, list)
 register Lisp_Object propval;
 Lisp_Object list;
 {
-register Lisp_Object tail, proptail;
+register Lisp_Object propelt, tem;
+LOOP_PROPVAL (propelt, propval,
-for (tail = list; CONSP (tail); tail = XCDR (tail))
+		DOLIST (tem, list,
-{
+			if (EQ (propelt, tem))
-register Lisp_Object tem;
+			  return 1;
-tem = XCAR (tail);
+			if (CONSP (tem) && EQ (propelt, XCAR (tem)))
-if (EQ (propval, tem))
+			  return 1;));
-	return 1;
-if (CONSP (tem) && EQ (propval, XCAR (tem)))
-	return 1;
-}
-if (CONSP (propval))
-{
-for (proptail = propval; CONSP (proptail); proptail = XCDR (proptail))
-	{
-	  Lisp_Object propelt;
-	  propelt = XCAR (proptail);
-	  for (tail = list; CONSP (tail); tail = XCDR (tail))
-	    {
-	      register Lisp_Object tem;
-	      tem = XCAR (tail);
-	      if (EQ (propelt, tem))
-		return 1;
-	      if (CONSP (tem) && EQ (propelt, XCAR (tem)))
-		return 1;
-	    }
-	}
-}
-return 0;
 }
 /* Return 1 if PROPVAL appears as the car of an element of LIST and
 the cdr of that element is non-nil.  If PROPVAL is a list, check
 int
 invisible_ellipsis_p (propval, list)
 register Lisp_Object propval;
 Lisp_Object list;
 {
-register Lisp_Object tail, proptail;
+register Lisp_Object propelt, tem;
+LOOP_PROPVAL (propelt, propval,
-for (tail = list; CONSP (tail); tail = XCDR (tail))
+		DOLIST (tem, list,
-{
+			if (CONSP (tem) && EQ (propelt, XCAR (tem)))
-register Lisp_Object tem;
+			  return !NILP (XCDR (tem))));
-tem = XCAR (tail);
+}
-if (CONSP (tem) && EQ (propval, XCAR (tem)))
-	return ! NILP (XCDR (tem));
+/* As above but for "completely" invisible (no ellipsis).  */
-}
+int
-if (CONSP (propval))
+invisible_noellipsis_p (propval, list)
-for (proptail = propval; CONSP (proptail); proptail = XCDR (proptail))
+register Lisp_Object propval;
-{
+Lisp_Object list;
-	Lisp_Object propelt;
+{
-	propelt = XCAR (proptail);
+register Lisp_Object propelt, tem;
-	for (tail = list; CONSP (tail); tail = XCDR (tail))
+LOOP_PROPVAL (propelt, propval,
-	  {
+		DOLIST (tem, list,
-	    register Lisp_Object tem;
+			if (EQ (propelt, tem))
-	    tem = XCAR (tail);
+			  return 1;
-	    if (CONSP (tem) && EQ (propelt, XCAR (tem)))
+			if (CONSP (tem) && EQ (propelt, XCAR (tem)))
-	      return ! NILP (XCDR (tem));
+			  return NILP (XCDR (tem))));
-	  }
-}
-return 0;
 }
 /***********************************************************************
 \(see `modify-frame-parameters').");
 Vicon_title_format
 = Vframe_title_format
 = Fcons (intern ("multiple-frames"),
 	     Fcons (build_string ("%b"),
-		    Fcons (Fcons (build_string (""),
+		    Fcons (Fcons (empty_string,
 				  Fcons (intern ("invocation-name"),
 					 Fcons (build_string ("@"),
 						Fcons (intern ("system-name"),
 							       Qnil)))),
 			   Qnil)));
 DEFVAR_LISP ("fontification-functions", &Vfontification_functions,
 "List of functions to call to fontify regions of text.\n\
 Each function is called with one argument POS.  Functions must\n\
 fontify a region starting at POS in the current buffer, and give\n\
-fontified regions the property `fontified'.\n\
+fontified regions the property `fontified'.");
-This variable automatically becomes buffer-local when set.");
 Vfontification_functions = Qnil;
 Fmake_variable_buffer_local (Qfontification_functions);
 DEFVAR_BOOL ("unibyte-display-via-language-environment",
 &unibyte_display_via_language_environment,

Mercurial > emacs

comparison src/xdisp.c @ 39858:13bf107afa6d