xemacs-beta: src/redisplay.c comparison

comparison src/redisplay.c @ 173:8eaf7971accc r20-3b13

Import from CVS: tag r20-3b13

author	cvs
date	Mon, 13 Aug 2007 09:49:09 +0200
parents	6b37e6ddd302
children	9ad43877534d

comparison

equal deleted inserted replaced

-:a38aed19690b
+:8eaf7971accc
 if (dl->display_blocks)
 {
 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
 	{
 	  if (Dynarr_at (dl->display_blocks, elt).type == type)
-	    return (Dynarr_atp (dl->display_blocks, elt));
+	    return Dynarr_atp (dl->display_blocks, elt);
 	}
 /* There isn't an active block of the desired type, but there
 might still be allocated blocks we need to reuse. */
 if (elt < Dynarr_largest (dl->display_blocks))
 }
 static int
 tab_pix_width (struct window *w)
 {
-return (space_width (w) * tab_char_width (w));
+return space_width (w) * tab_char_width (w);
 }
 /* Given a pixel position in a window, return the pixel location of
 the next tabstop.  Tabs are calculated from the left window edge in
 terms of spaces displayed in the default face.  Formerly the space
 it so that regenerate_window will exit properly.  This is bogus.
 The main loop should get fixed so that it isn't necessary to call
 this function if we are already at EOB. */
 if (data.bi_bufpos == BI_BUF_ZV (b) && bi_start_pos == BI_BUF_ZV (b))
-return (data.bi_bufpos + 1); /* Yuck! */
+return data.bi_bufpos + 1; /* Yuck! */
 else
 return data.bi_bufpos;
 }
 /* Display the overlay arrow at the beginning of the given line. */
 dl->descent = data.new_descent;
 data.db->start_pos = dl->bounds.left_in;
 data.db->end_pos = data.pixpos;
-return (data.pixpos - dl->bounds.left_in);
+return data.pixpos - dl->bounds.left_in;
 }
 /* Add a type of glyph to a margin display block. */
 static int
 	    {
 	      dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
 	      if (point >= (dl->bufpos + dl->offset)
 		  && point <= (dl->end_bufpos + dl->offset))
-		return (!dl->clip);
+		return !dl->clip;
 	      else
 		return 1;
 	    }
 	  else
 	    return 1;
 modeline and any potential horizontal scrollbar. */
 int
 window_half_pixpos (struct window *w)
 {
-return (WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1));
+return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
 }
 /* Return the display line which is currently in the middle of the
 window W for display lines TYPE. */
 scan_buffer (b, '\n', end, 0, -lots, &shortage, 0);
 line = lots - shortage + 1;
 sprintf (window_line_number_buf, "%d", line);
-return (window_line_number_buf);
+return window_line_number_buf;
 }
 /* Given a character representing an object in a modeline
 specification, return a string (stored into the global array
 `mode_spec_bufbyte_string') with the information that object
 line_start_cache_dynarr *cache = w->line_start_cache;
 if (!Dynarr_length (cache))
 return -1;
 else
-return (Dynarr_atp (cache, 0)->start);
+return Dynarr_atp (cache, 0)->start;
 }
 /* Return the very last buffer position contained in the given
 window's cache, or -1 if the cache is empty.  Assumes that the
 cache is valid. */
 line_start_cache_dynarr *cache = w->line_start_cache;
 if (!Dynarr_length (cache))
 return -1;
 else
-return (Dynarr_atp (cache, Dynarr_length (cache) - 1)->end);
+return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
 }
 /* Return the index of the line POINT is contained within in window
 W's line start cache.  It will enlarge the cache or move the cache
 window in order to have POINT be present in the cache.  MIN_PAST is
 	  if (start_elt < 0)
 	    {
 	      w->line_cache_validation_override--;
 	      if (end)
-		return (BUF_ZV (b));
+		return BUF_ZV (b);
 	      else
-		return (BUF_BEGV (b));
+		return BUF_BEGV (b);
 	    }
 	  else
 	    {
 	      w->line_cache_validation_override--;
 	      if (end)
 	  /* We've hit the end of the bottom so that's what it is. */
 	  if (from >= BUF_ZV (b))
 	    {
 	      w->line_cache_validation_override--;
-	      return (BUF_ZV (b));
+	      return BUF_ZV (b);
 	    }
 	  update_line_start_cache (w, from, to, BUF_PT (b), 0);
 	  /* Updating the cache invalidates any current indexes. */
 	  int win_char_height;
 	  if (cur_pos <= BUF_BEGV (b))
 	    {
 	      w->line_cache_validation_override--;
-	      return (BUF_BEGV (b));
+	      return BUF_BEGV (b);
 	    }
 	  win_char_height = window_char_height (w, 0);
 	  if (!win_char_height)
 	    win_char_height = 1;
 	cur_elt = 0;		/* Hit the top */
 else
 	cur_elt -= line;
 w->line_cache_validation_override--;
-return (Dynarr_atp (w->line_start_cache, cur_elt)->start);
+return Dynarr_atp (w->line_start_cache, cur_elt)->start;
 }
 else
 {
 /* The calculated value of pixpos is correct for the bottom line
 or what we want when line is -1.  Therefore we subtract one
 display_line_dynarr *dla;
 /* This is a safety valve in case this got called with a frame in
 the middle of being deleted. */
 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
-device_check_failed = 1;
+{
+device_check_failed = 1;
+d = NULL, cache = NULL; /* Warning suppression */
+}
 else
 {
 d = XDEVICE (f->device);
 cache = &d->pixel_to_glyph_cache;
 }

Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 173:8eaf7971accc r20-3b13