Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1023 emacs/src/xdisp.c:1.1024
*** emacs/src/xdisp.c:1.1023 Fri Jun 10 05:31:44 2005
--- emacs/src/xdisp.c Mon Jun 13 20:49:14 2005
***************
*** 1898,1904 ****
int *heightp;
{
struct frame *f = XFRAME (WINDOW_FRAME (w));
! int x, y, wd, h, h0, y0;
/* Compute the width of the rectangle to draw. If on a stretch
glyph, and `x-stretch-block-cursor' is nil, don't draw a
--- 1898,1904 ----
int *heightp;
{
struct frame *f = XFRAME (WINDOW_FRAME (w));
! int y, wd, h, h0, y0;
/* Compute the width of the rectangle to draw. If on a stretch
glyph, and `x-stretch-block-cursor' is nil, don't draw a
***************
*** 8252,8258 ****
format_mode_line_unwind_data (obuf)
struct buffer *obuf;
{
- int i = 0;
Lisp_Object vector;
/* Reduce consing by keeping one vector in
--- 8252,8257 ----
***************
*** 19201,19207 ****
struct it *it;
Lisp_Object prop;
{
! Lisp_Object position, val;
if (STRINGP (it->object))
position = make_number (IT_STRING_CHARPOS (*it));
--- 19200,19206 ----
struct it *it;
Lisp_Object prop;
{
! Lisp_Object position;
if (STRINGP (it->object))
position = make_number (IT_STRING_CHARPOS (*it));
***************
*** 19552,19558 ****
else
{
Lisp_Object spacing;
- int total = 0;
it->phys_ascent = it->ascent;
it->phys_descent = it->descent;
--- 19551,19556 ----
***************
*** 21574,21580 ****
/* If the re-rendering position is included in the last
re-rendering area, we should do nothing. */
! if ( window == dpyinfo->mouse_face_window
&& dpyinfo->mouse_face_beg_col <= vpos
&& vpos < dpyinfo->mouse_face_end_col
&& dpyinfo->mouse_face_beg_row == hpos )
--- 21572,21578 ----
/* If the re-rendering position is included in the last
re-rendering area, we should do nothing. */
! if ( EQ (window, dpyinfo->mouse_face_window)
&& dpyinfo->mouse_face_beg_col <= vpos
&& vpos < dpyinfo->mouse_face_end_col
&& dpyinfo->mouse_face_beg_row == hpos )
_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-diffs
