emacs: src/xdisp.c comparison

comparison src/xdisp.c @ 90228:fa0da9b57058

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 542-553) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 116-121) - Merge from emacs--cvs-trunk--0 - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Mon, 19 Sep 2005 10:20:33 +0000
parents	10fe5fadaf89 b695b0dc3532
children	ee12d75eb214

comparison

equal deleted inserted replaced

-:10fe5fadaf89
+:fa0da9b57058
 if (it->selective > 0)
 while (IT_CHARPOS (*it) < ZV
 	   && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
 				 (double) it->selective)) /* iftc */
 {
-	xassert (FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
+	xassert (IT_BYTEPOS (*it) == BEGV
+		 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
 	newline_found_p = forward_to_next_line_start (it, &skipped_p);
 }
 /* Position on the newline if that's what's requested.  */
 if (on_newline_p && newline_found_p)
 TRACE_MOVE ((stderr, "move_it_v: to %d\n", IT_CHARPOS (*it)));
 /* If buffer ends in ZV without a newline, move to the start of
 	 the line to satisfy the post-condition.  */
 if (IT_CHARPOS (*it) == ZV
+	  && ZV > BEGV
 	  && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n')
 	move_it_by_lines (it, 0, 0);
 }
 }
 cancel_echoing ();
 /* First flush out any partial line written with print.  */
 message_log_maybe_newline ();
 if (STRINGP (m))
-message_dolog (SDATA (m), nbytes, 1, multibyte);
+{
+char *buffer;
+USE_SAFE_ALLOCA;
+SAFE_ALLOCA (buffer, char *, nbytes);
+bcopy (SDATA (m), buffer, nbytes);
+message_dolog (buffer, nbytes, 1, multibyte);
+SAFE_FREE ();
+}
 message3_nolog (m, nbytes, multibyte);
 UNGCPRO;
 }
 	  && (MATRIX_ROW_START_CHARPOS (row) == marker_position (val)))
 	{
 	  if (FRAME_WINDOW_P (it->f)
 	      && WINDOW_LEFT_FRINGE_WIDTH (it->w) > 0)
 	    {
+#ifdef HAVE_WINDOW_SYSTEM
 	      if (val = Fget (var, Qoverlay_arrow_bitmap), SYMBOLP (val))
 		{
 		  int fringe_bitmap;
 		  if ((fringe_bitmap = lookup_fringe_bitmap (val)) != 0)
 		    return make_number (fringe_bitmap);
 		}
+#endif
 	      return make_number (-1); /* Use default arrow bitmap */
 	    }
 	  return overlay_arrow_string_or_property (var);
 	}
 }
 {
 case Lisp_String:
 {
 	/* A string: output it and check for %-constructs within it.  */
 	unsigned char c;
-	const unsigned char *this, *lisp_string;
+	int offset = 0;
 	if (!NILP (props) || risky)
 	  {
 	    Lisp_Object oprops, aelt;
 	    oprops = Ftext_properties_at (make_number (0), elt);
 		      XSETCDR (tem, Qnil);
 		  }
 	      }
 	  }
-	this = SDATA (elt);
+	offset = 0;
-	lisp_string = this;
 	if (literal)
 	  {
 	    prec = precision - n;
 	    switch (mode_line_target)
 	      }
 	    break;
 	  }
+	/* Handle the non-literal case.  */
 	while ((precision <= 0 || n < precision)
-	       && *this
+	       && SREF (elt, offset) != 0
 	       && (mode_line_target != MODE_LINE_DISPLAY
 		   || it->current_x < it->last_visible_x))
 	  {
-	    const unsigned char *last = this;
+	    int last_offset = offset;
 	    /* Advance to end of string or next format specifier.  */
-	    while ((c = *this++) != '\0' && c != '%')
+	    while ((c = SREF (elt, offset++)) != '\0' && c != '%')
 	      ;
-	    if (this - 1 != last)
+	    if (offset - 1 != last_offset)
 	      {
 		int nchars, nbytes;
 		/* Output to end of string or up to '%'.  Field width
 		   is length of string.  Don't output more than
 		   PRECISION allows us.  */
-		--this;
+		offset--;
-		prec = c_string_width (last, this - last, precision - n,
+		prec = c_string_width (SDATA (elt) + last_offset,
+				       offset - last_offset, precision - n,
 				       &nchars, &nbytes);
 		switch (mode_line_target)
 		  {
 		  case MODE_LINE_NOPROP:
 		  case MODE_LINE_TITLE:
-		    n += store_mode_line_noprop (last, 0, prec);
+		    n += store_mode_line_noprop (SDATA (elt) + last_offset, 0, prec);
 		    break;
 		  case MODE_LINE_STRING:
 		    {
-		      int bytepos = last - lisp_string;
+		      int bytepos = last_offset;
 		      int charpos = string_byte_to_char (elt, bytepos);
 		      int endpos = (precision <= 0
-				    ? string_byte_to_char (elt,
+				    ? string_byte_to_char (elt, offset)
-							   this - lisp_string)
 				    : charpos + nchars);
 		      n += store_mode_line_string (NULL,
 						   Fsubstring (elt, make_number (charpos),
 							       make_number (endpos)),
 						   0, 0, 0, Qnil);
 		    }
 		    break;
 		  case MODE_LINE_DISPLAY:
 		    {
-		      int bytepos = last - lisp_string;
+		      int bytepos = last_offset;
 		      int charpos = string_byte_to_char (elt, bytepos);
 		      n += display_string (NULL, elt, Qnil, 0, charpos,
 					   it, 0, prec, 0,
 					   STRING_MULTIBYTE (elt));
 		    }
 		    break;
 		  }
 	      }
 	    else /* c == '%' */
 	      {
-		const unsigned char *percent_position = this;
+		int percent_position = offset;
 		/* Get the specified minimum width.  Zero means
 		   don't pad.  */
 		field = 0;
-		while ((c = *this++) >= '0' && c <= '9')
+		while ((c = SREF (elt, offset++)) >= '0' && c <= '9')
 		  field = field * 10 + c - '0';
 		/* Don't pad beyond the total padding allowed.  */
 		if (field_width - n > 0 && field > field_width - n)
 		  field = field_width - n;
 		  {
 		    int multibyte;
 		    int bytepos, charpos;
 		    unsigned char *spec;
-		    bytepos = percent_position - lisp_string;
+		    bytepos = percent_position;
 		    charpos = (STRING_MULTIBYTE (elt)
 			       ? string_byte_to_char (elt, bytepos)
 			       : bytepos);
 		    spec

Mercurial > emacs

comparison src/xdisp.c @ 90228:fa0da9b57058