[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/dispnew.c
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/dispnew.c |
Date: |
Fri, 04 Apr 2003 01:23:49 -0500 |
Index: emacs/src/dispnew.c
diff -c emacs/src/dispnew.c:1.313 emacs/src/dispnew.c:1.314
*** emacs/src/dispnew.c:1.313 Tue Feb 4 09:03:12 2003
--- emacs/src/dispnew.c Fri Mar 21 08:49:31 2003
***************
*** 4049,4055 ****
extern Lisp_Object do_mouse_tracking;
#if GLYPH_DEBUG
struct frame *f = XFRAME (WINDOW_FRAME (w));
- extern struct frame *updating_frame;
#endif
/* Check that W's frame doesn't have glyph matrices. */
--- 4049,4054 ----
***************
*** 4339,4345 ****
first `p' in the current row. If we would start
writing glyphs there, we wouldn't erase the lbearing
of the `p'. The rest of the lbearing problem is then
! taken care of by x_draw_glyphs. */
if (overlapping_glyphs_p
&& i > 0
&& i < current_row->used[TEXT_AREA]
--- 4338,4344 ----
first `p' in the current row. If we would start
writing glyphs there, we wouldn't erase the lbearing
of the `p'. The rest of the lbearing problem is then
! taken care of by draw_glyphs. */
if (overlapping_glyphs_p
&& i > 0
&& i < current_row->used[TEXT_AREA]
***************
*** 5725,5733 ****
the string returned. */
Lisp_Object
! mode_line_string (w, x, y, mode_line_p, charpos)
struct window *w;
! int x, y, mode_line_p;
int *charpos;
{
struct glyph_row *row;
--- 5724,5733 ----
the string returned. */
Lisp_Object
! mode_line_string (w, x, y, part, charpos)
struct window *w;
! int x, y;
! enum window_part part;
int *charpos;
{
struct glyph_row *row;
***************
*** 5736,5742 ****
int x0;
Lisp_Object string = Qnil;
! if (mode_line_p)
row = MATRIX_MODE_LINE_ROW (w->current_matrix);
else
row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
--- 5736,5742 ----
int x0;
Lisp_Object string = Qnil;
! if (part == ON_MODE_LINE)
row = MATRIX_MODE_LINE_ROW (w->current_matrix);
else
row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
***************
*** 5772,5791 ****
the string returned. */
Lisp_Object
! marginal_area_string (w, x, y, area, charpos)
struct window *w;
int x, y;
! int area;
int *charpos;
{
struct glyph_row *row = w->current_matrix->rows;
struct glyph *glyph, *end;
int x0, i, wy = y;
Lisp_Object string = Qnil;
! if (area == 6)
area = LEFT_MARGIN_AREA;
! else if (area == 7)
area = RIGHT_MARGIN_AREA;
else
abort ();
--- 5772,5792 ----
the string returned. */
Lisp_Object
! marginal_area_string (w, x, y, part, charpos)
struct window *w;
int x, y;
! enum window_part part;
int *charpos;
{
struct glyph_row *row = w->current_matrix->rows;
struct glyph *glyph, *end;
int x0, i, wy = y;
+ int area;
Lisp_Object string = Qnil;
! if (part == ON_LEFT_MARGIN)
area = LEFT_MARGIN_AREA;
! else if (part == ON_RIGHT_MARGIN)
area = RIGHT_MARGIN_AREA;
else
abort ();
- [Emacs-diffs] Changes to emacs/src/dispnew.c,
Miles Bader <=