[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2]
From: |
Dave Love |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2] |
Date: |
Mon, 29 Sep 2003 14:08:14 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.843.2.2 emacs/src/xdisp.c:1.843.2.3
*** emacs/src/xdisp.c:1.843.2.2 Wed Sep 17 09:52:05 2003
--- emacs/src/xdisp.c Mon Sep 29 14:08:13 2003
***************
*** 17176,17185 ****
#define BUILD_CHAR_GLYPH_STRINGS(START, END, HEAD, TAIL, HL, X, LAST_X)
\
do
\
{ \
! int c, face_id; \
XChar2b *char2b; \
\
- c = (row)->glyphs[area][START].u.ch; \
face_id = (row)->glyphs[area][START].face_id; \
\
s = (struct glyph_string *) alloca (sizeof *s); \
--- 17176,17184 ----
#define BUILD_CHAR_GLYPH_STRINGS(START, END, HEAD, TAIL, HL, X, LAST_X)
\
do
\
{ \
! int face_id; \
XChar2b *char2b; \
\
face_id = (row)->glyphs[area][START].face_id; \
\
s = (struct glyph_string *) alloca (sizeof *s); \
***************
*** 17320,17326 ****
int x;
struct glyph_row *row;
enum glyph_row_area area;
! int start, end;
enum draw_glyphs_face hl;
int overlaps_p;
{
--- 17319,17325 ----
int x;
struct glyph_row *row;
enum glyph_row_area area;
! EMACS_INT start, end;
enum draw_glyphs_face hl;
int overlaps_p;
{
***************
*** 18425,18431 ****
int line_height, shift_by_width, shifted_region_width;
struct glyph_row *row;
struct glyph *glyph;
! int frame_x, frame_y, hpos;
xassert (updated_window && updated_row);
BLOCK_INPUT;
--- 18424,18431 ----
int line_height, shift_by_width, shifted_region_width;
struct glyph_row *row;
struct glyph *glyph;
! int frame_x, frame_y;
! EMACS_INT hpos;
xassert (updated_window && updated_row);
BLOCK_INPUT;
***************
*** 18991,18997 ****
int active_cursor;
struct glyph_matrix *current_glyphs;
struct glyph_row *glyph_row;
- struct glyph *glyph;
/* This is pointless on invisible frames, and dangerous on garbaged
windows and frames; in the latter case, the frame or window may
--- 18991,18996 ----
***************
*** 19009,19015 ****
current_glyphs = w->current_matrix;
glyph_row = MATRIX_ROW (current_glyphs, vpos);
- glyph = glyph_row->glyphs[TEXT_AREA] + hpos;
/* If cursor row is not enabled, we don't really know where to
display the cursor. */
--- 19008,19013 ----
***************
*** 19281,19287 ****
static int
fast_find_position (w, charpos, hpos, vpos, x, y, stop)
struct window *w;
! int charpos;
int *hpos, *vpos, *x, *y;
Lisp_Object stop;
{
--- 19279,19285 ----
static int
fast_find_position (w, charpos, hpos, vpos, x, y, stop)
struct window *w;
! EMACS_INT charpos;
int *hpos, *vpos, *x, *y;
Lisp_Object stop;
{
***************
*** 19344,19350 ****
static int
fast_find_position (w, pos, hpos, vpos, x, y, stop)
struct window *w;
! int pos;
int *hpos, *vpos, *x, *y;
Lisp_Object stop;
{
--- 19342,19348 ----
static int
fast_find_position (w, pos, hpos, vpos, x, y, stop)
struct window *w;
! EMACS_INT pos;
int *hpos, *vpos, *x, *y;
Lisp_Object stop;
{
***************
*** 19458,19464 ****
static int
fast_find_string_pos (w, pos, object, hpos, vpos, x, y, right_p)
struct window *w;
! int pos;
Lisp_Object object;
int *hpos, *vpos, *x, *y;
int right_p;
--- 19456,19462 ----
static int
fast_find_string_pos (w, pos, object, hpos, vpos, x, y, right_p)
struct window *w;
! EMACS_INT pos;
Lisp_Object object;
int *hpos, *vpos, *x, *y;
int right_p;