Commit 5bf46f05 authored by Paul Eggert's avatar Paul Eggert

* dispnew.c: Make symbols static if they're not exported.

* dispextern.h (redraw_garbaged_frames, scrolling):
(increment_row_positions): Remove.
* dispnew.c (new_glyph_matrix, increment_row_positions, scrolling):
(delayed_size_change, glyph_matrix_count, glyph_pool_count):
Now static.
(redraw_garbaged_frames): Remove; unused.
parent 435f4c28
2011-04-12 Paul Eggert <eggert@cs.ucla.edu>
* dispnew.c: Make symbols static if they're not exported.
* dispextern.h (redraw_garbaged_frames, scrolling):
(increment_row_positions): Remove.
* dispnew.c (new_glyph_matrix, increment_row_positions, scrolling):
(delayed_size_change, glyph_matrix_count, glyph_pool_count):
Now static.
(redraw_garbaged_frames): Remove; unused.
* xfaces.c: Make symbols static if they're not exported.
* dispextern.h (ascii_face_of_lisp_face, free_realized_face):
Remove decls.
......
......@@ -3229,11 +3229,9 @@ extern Lisp_Object marginal_area_string (struct window *, enum window_part,
Lisp_Object *,
int *, int *, int *, int *);
extern void redraw_frame (struct frame *);
extern void redraw_garbaged_frames (void);
extern void cancel_line (int, struct frame *);
extern void init_desired_glyphs (struct frame *);
extern int update_frame (struct frame *, int, int);
extern int scrolling (struct frame *);
extern void bitch_at_user (void);
void adjust_glyphs (struct frame *);
void free_glyphs (struct frame *);
......@@ -3249,7 +3247,6 @@ void rotate_matrix (struct glyph_matrix *, int, int, int);
void increment_matrix_positions (struct glyph_matrix *,
int, int, EMACS_INT, EMACS_INT);
void blank_row (struct window *, struct glyph_row *, int);
void increment_row_positions (struct glyph_row *, EMACS_INT, EMACS_INT);
void enable_glyph_matrix_rows (struct glyph_matrix *, int, int, int);
void clear_glyph_row (struct glyph_row *);
void prepare_desired_row (struct glyph_row *);
......
......@@ -121,11 +121,12 @@ static int required_matrix_width (struct window *);
static void allocate_matrices_for_window_redisplay (struct window *);
static int realloc_glyph_pool (struct glyph_pool *, struct dim);
static void adjust_frame_glyphs (struct frame *);
struct glyph_matrix *new_glyph_matrix (struct glyph_pool *);
static struct glyph_matrix *new_glyph_matrix (struct glyph_pool *);
static void free_glyph_matrix (struct glyph_matrix *);
static void adjust_glyph_matrix (struct window *, struct glyph_matrix *,
int, int, struct dim);
static void change_frame_size_1 (struct frame *, int, int, int, int, int);
static void increment_row_positions (struct glyph_row *, EMACS_INT, EMACS_INT);
static void swap_glyph_pointers (struct glyph_row *, struct glyph_row *);
#if GLYPH_DEBUG
static int glyph_row_slice_p (struct glyph_row *, struct glyph_row *);
......@@ -163,6 +164,7 @@ static void mirror_line_dance (struct window *, int, int, int *, char *);
static int update_window_tree (struct window *, int);
static int update_window (struct window *, int);
static int update_frame_1 (struct frame *, int, int);
static int scrolling (struct frame *);
static void set_window_cursor_after_update (struct window *);
static void adjust_frame_glyphs_for_window_redisplay (struct frame *);
static void adjust_frame_glyphs_for_frame_redisplay (struct frame *);
......@@ -212,7 +214,7 @@ struct frame *last_nonminibuf_frame;
/* 1 means SIGWINCH happened when not safe. */
int delayed_size_change;
static int delayed_size_change;
/* 1 means glyph initialization has been completed at startup. */
......@@ -234,8 +236,8 @@ struct glyph space_glyph;
/* Counts of allocated structures. These counts serve to diagnose
memory leaks and double frees. */
int glyph_matrix_count;
int glyph_pool_count;
static int glyph_matrix_count;
static int glyph_pool_count;
/* If non-null, the frame whose frame matrices are manipulated. If
null, window matrices are worked on. */
......@@ -383,7 +385,7 @@ safe_bcopy (const char *from, char *to, int size)
member `pool' of the glyph matrix structure returned is set to
POOL, the structure is otherwise zeroed. */
struct glyph_matrix *
static struct glyph_matrix *
new_glyph_matrix (struct glyph_pool *pool)
{
struct glyph_matrix *result;
......@@ -1021,7 +1023,7 @@ blank_row (struct window *w, struct glyph_row *row, int y)
the used count of the text area is zero. Such rows display line
ends. */
void
static void
increment_row_positions (struct glyph_row *row,
EMACS_INT delta, EMACS_INT delta_bytes)
{
......@@ -3200,21 +3202,6 @@ DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "",
}
/* This is used when frame_garbaged is set. Call Fredraw_frame on all
visible frames marked as garbaged. */
void
redraw_garbaged_frames (void)
{
Lisp_Object tail, frame;
FOR_EACH_FRAME (tail, frame)
if (FRAME_VISIBLE_P (XFRAME (frame))
&& FRAME_GARBAGED_P (XFRAME (frame)))
Fredraw_frame (frame);
}
/***********************************************************************
Frame Update
......@@ -4818,7 +4805,7 @@ update_frame_1 (struct frame *f, int force_p, int inhibit_id_p)
/* Do line insertions/deletions on frame F for frame-based redisplay. */
int
static int
scrolling (struct frame *frame)
{
int unchanged_at_top, unchanged_at_bottom;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment