Commit 2f7c71a1 authored by Andreas Schwab's avatar Andreas Schwab

Remove unused declarations

* src/buffer.c: Remove unused declarations.
* src/buffer.h: Likewise.
* src/charset.h: Likewise.
* src/composite.h: Likewise.
* src/dispextern.h: Likewise.
* src/dispnew.c: Likewise.
* src/font.h: Likewise.
* src/fontset.c: Likewise.
* src/fontset.h: Likewise.
* src/intervals.h: Likewise.
* src/keymap.h: Likewise.
* src/lisp.h: Likewise.
* src/syntax.c: Likewise.
* src/syntax.h: Likewise.
* src/termhooks.h: Likewise.
* src/window.h: Likewise.
* src/xsettings.h: Likewise.
* src/xterm.c: Likewise.
* src/xterm.h: Likewise.

* src/chartab.c (sub_char_table_ref): Make static.
* src/dispnew.c (line_hash_code, required_matrix_height)
(required_matrix_width): Likewise.
* src/eval.c (interactive_p, apply_lambda): Likewise.
* src/fns.c (string_make_multibyte, copy_hash_table, hash_clear):
Likewise.
* src/font.c (QCadstyle, QCregistry, font_make_spec)
(font_parse_fcname, font_encode_char, font_at): Likewise.
* src/frame.c (x_frame_get_arg): Likewise.
* src/keymap.c (get_keyelt): Likewise.
* src/lread.c (read_filtered_event): Likewise.
* src/print.c (write_string_1): Likewise.
* src/window.c (delete_window, window_height, window_width)
(foreach_window): Likewise.
* src/xrdb.c (x_get_customization_string, x_get_resource): Likewise.
* src/xterm.c (x_scroll_bar_clear, xembed_set_info)
(xembed_send_message): Likewise.

* src/eval.c (run_hook_list_with_args): Delete.
* src/font.c (font_unparse_gtkname, font_update_lface): Likewise.
* src/terminal.c (get_terminal_param): Likewise.
* src/xterm.c (x_alloc_lighter_color_for_widget): Likewise.
parent c4b607ed
2010-12-27 Andreas Schwab <schwab@linux-m68k.org>
* buffer.c: Remove unused declarations.
* buffer.h: Likewise.
* charset.h: Likewise.
* composite.h: Likewise.
* dispextern.h: Likewise.
* dispnew.c: Likewise.
* font.h: Likewise.
* fontset.c: Likewise.
* fontset.h: Likewise.
* intervals.h: Likewise.
* keymap.h: Likewise.
* lisp.h: Likewise.
* syntax.c: Likewise.
* syntax.h: Likewise.
* termhooks.h: Likewise.
* window.h: Likewise.
* xsettings.h: Likewise.
* xterm.c: Likewise.
* xterm.h: Likewise.
* chartab.c (sub_char_table_ref): Make static.
* dispnew.c (line_hash_code, required_matrix_height)
(required_matrix_width): Likewise.
* eval.c (interactive_p, apply_lambda): Likewise.
* fns.c (string_make_multibyte, copy_hash_table, hash_clear):
Likewise.
* font.c (QCadstyle, QCregistry, font_make_spec)
(font_parse_fcname, font_encode_char, font_at): Likewise.
* frame.c (x_frame_get_arg): Likewise.
* keymap.c (get_keyelt): Likewise.
* lread.c (read_filtered_event): Likewise.
* print.c (write_string_1): Likewise.
* window.c (delete_window, window_height, window_width)
(foreach_window): Likewise.
* xrdb.c (x_get_customization_string, x_get_resource): Likewise.
* xterm.c (x_scroll_bar_clear, xembed_set_info)
(xembed_send_message): Likewise.
* eval.c (run_hook_list_with_args): Delete.
* font.c (font_unparse_gtkname, font_update_lface): Likewise.
* terminal.c (get_terminal_param): Likewise.
* xterm.c (x_alloc_lighter_color_for_widget): Likewise.
* scroll.c: Fix comment.
* dispnew.c (add_window_display_history)
......
......@@ -105,7 +105,6 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS];
int last_per_buffer_idx;
EXFUN (Fset_buffer, 1);
static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,
int after, Lisp_Object arg1,
Lisp_Object arg2, Lisp_Object arg3);
......@@ -3777,8 +3776,6 @@ modify_overlay (struct buffer *buf, EMACS_INT start, EMACS_INT end)
}
Lisp_Object Fdelete_overlay (Lisp_Object overlay);
static struct Lisp_Overlay *
unchain_overlay (struct Lisp_Overlay *list, struct Lisp_Overlay *overlay)
{
......
......@@ -895,14 +895,11 @@ extern void mmap_set_vars (int);
} \
} while (0)
EXFUN (Fbuffer_list, 1);
EXFUN (Fbuffer_live_p, 1);
EXFUN (Fbuffer_name, 1);
EXFUN (Fget_file_buffer, 1);
EXFUN (Fnext_overlay_change, 1);
EXFUN (Fdelete_overlay, 1);
EXFUN (Fbuffer_local_value, 2);
EXFUN (Fgenerate_new_buffer_name, 2);
/* Functions to call before and after each text change. */
extern Lisp_Object Vbefore_change_functions;
......
......@@ -544,8 +544,6 @@ extern void map_charset_chars (void (*) (Lisp_Object, Lisp_Object),
Lisp_Object, Lisp_Object,
struct charset *, unsigned, unsigned);
EXFUN (Funify_charset, 3);
#endif /* EMACS_CHARSET_H */
/* arch-tag: 3b96db55-4961-481d-ac3e-219f46a2b3aa
......
......@@ -168,7 +168,7 @@ copy_char_table (Lisp_Object table)
return copy;
}
Lisp_Object
static Lisp_Object
sub_char_table_ref (Lisp_Object table, int c)
{
struct Lisp_Sub_Char_Table *tbl = XSUB_CHAR_TABLE (table);
......
......@@ -322,8 +322,6 @@ extern int composition_update_it (struct composition_it *,
extern EMACS_INT composition_adjust_point (EMACS_INT, EMACS_INT);
EXFUN (Fcompose_region_internal, 4);
EXFUN (Fcompose_string_internal, 5);
EXFUN (Fcomposition_get_gstring, 4);
#endif /* not EMACS_COMPOSITE_H */
......
......@@ -3231,7 +3231,6 @@ void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object);
extern Lisp_Object tip_frame;
extern Window tip_window;
EXFUN (Fx_show_tip, 6);
EXFUN (Fx_hide_tip, 0);
extern void start_hourglass (void);
extern void cancel_hourglass (void);
......@@ -3275,8 +3274,6 @@ int popup_activated (void);
/* Defined in dispnew.c */
extern int inverse_video;
extern int required_matrix_width (struct window *);
extern int required_matrix_height (struct window *);
extern Lisp_Object buffer_posn_from_coords (struct window *,
int *, int *,
struct display_pos *,
......@@ -3294,7 +3291,6 @@ 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 scroll_frame_lines (struct frame *, int, int, int, int);
extern int update_frame (struct frame *, int, int);
extern int scrolling (struct frame *);
extern void bitch_at_user (void);
......@@ -3316,7 +3312,6 @@ 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 *);
int line_hash_code (struct glyph_row *);
void set_window_update_flags (struct window *, int);
void update_single_window (struct window *, int);
void do_pending_window_change (int);
......@@ -3393,9 +3388,6 @@ enum resource_types
extern Lisp_Object x_get_arg (Display_Info *, Lisp_Object,
Lisp_Object, const char *, const char *class,
enum resource_types);
extern Lisp_Object x_frame_get_arg (struct frame *, Lisp_Object,
Lisp_Object, const char *, const char *,
enum resource_types);
extern Lisp_Object x_frame_get_and_record_arg (struct frame *, Lisp_Object,
Lisp_Object,
const char *, const char *,
......
......@@ -121,6 +121,8 @@ static unsigned line_draw_cost (struct glyph_matrix *, int);
static void update_frame_line (struct frame *, int);
static struct dim allocate_matrices_for_frame_redisplay
(Lisp_Object, int, int, int, int *);
static int required_matrix_height (struct window *);
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 *);
......@@ -167,14 +169,8 @@ 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 void set_window_cursor_after_update (struct window *);
static int row_equal_p (struct window *, struct glyph_row *,
struct glyph_row *, int);
static void adjust_frame_glyphs_for_window_redisplay (struct frame *);
static void adjust_frame_glyphs_for_frame_redisplay (struct frame *);
static void reverse_rows (struct glyph_matrix *, int, int);
static int margin_glyphs_to_reserve (struct window *, int, Lisp_Object);
static void sync_window_with_frame_matrix_rows (struct window *);
struct window *frame_row_to_window (struct window *, int);
/* Non-zero means don't pause redisplay for pending input. (This is
......@@ -1296,7 +1292,7 @@ prepare_desired_row (struct glyph_row *row)
/* Return a hash code for glyph row ROW. */
int
static int
line_hash_code (struct glyph_row *row)
{
int hash = 0;
......@@ -1882,7 +1878,7 @@ allocate_matrices_for_frame_redisplay (Lisp_Object window, int x, int y,
/* Return the required height of glyph matrices for window W. */
int
static int
required_matrix_height (struct window *w)
{
#ifdef HAVE_WINDOW_SYSTEM
......@@ -1908,7 +1904,7 @@ required_matrix_height (struct window *w)
/* Return the required width of glyph matrices for window W. */
int
static int
required_matrix_width (struct window *w)
{
#ifdef HAVE_WINDOW_SYSTEM
......
......@@ -167,6 +167,8 @@ Lisp_Object Vmacro_declaration_function;
static Lisp_Object funcall_lambda (Lisp_Object, int, Lisp_Object*);
static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN;
static int interactive_p (int);
static Lisp_Object apply_lambda (Lisp_Object, Lisp_Object, int);
void
init_eval_once (void)
......@@ -581,7 +583,7 @@ way to do this), or via (not (or executing-kbd-macro noninteractive)). */)
EXCLUDE_SUBRS_P non-zero means always return 0 if the function
called is a built-in. */
int
static int
interactive_p (int exclude_subrs_p)
{
struct backtrace *btp;
......@@ -2685,53 +2687,6 @@ run_hook_with_args (int nargs, Lisp_Object *args, enum run_hooks_condition cond)
}
}
/* Run a hook symbol ARGS[0], but use FUNLIST instead of the actual
present value of that symbol.
Call each element of FUNLIST,
passing each of them the rest of ARGS.
The caller (or its caller, etc) must gcpro all of ARGS,
except that it isn't necessary to gcpro ARGS[0]. */
Lisp_Object
run_hook_list_with_args (Lisp_Object funlist, int nargs, Lisp_Object *args)
{
Lisp_Object sym;
Lisp_Object val;
Lisp_Object globals;
struct gcpro gcpro1, gcpro2, gcpro3;
sym = args[0];
globals = Qnil;
GCPRO3 (sym, val, globals);
for (val = funlist; CONSP (val); val = XCDR (val))
{
if (EQ (XCAR (val), Qt))
{
/* t indicates this hook has a local binding;
it means to run the global binding too. */
for (globals = Fdefault_value (sym);
CONSP (globals);
globals = XCDR (globals))
{
args[0] = XCAR (globals);
/* In a global value, t should not occur. If it does, we
must ignore it to avoid an endless loop. */
if (!EQ (args[0], Qt))
Ffuncall (nargs, args);
}
}
else
{
args[0] = XCAR (val);
Ffuncall (nargs, args);
}
}
UNGCPRO;
return Qnil;
}
/* Run the hook HOOK, giving each function the two args ARG1 and ARG2. */
void
......@@ -3063,7 +3018,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS) */)
return val;
}
Lisp_Object
static Lisp_Object
apply_lambda (Lisp_Object fun, Lisp_Object args, int eval_flag)
{
Lisp_Object args_left;
......
......@@ -872,7 +872,7 @@ string_byte_to_char (Lisp_Object string, EMACS_INT byte_index)
/* Convert STRING to a multibyte string. */
Lisp_Object
static Lisp_Object
string_make_multibyte (Lisp_Object string)
{
unsigned char *buf;
......@@ -3701,7 +3701,7 @@ make_hash_table (Lisp_Object test, Lisp_Object size, Lisp_Object rehash_size,
/* Return a copy of hash table H1. Keys and values are not copied,
only the table itself is. */
Lisp_Object
static Lisp_Object
copy_hash_table (struct Lisp_Hash_Table *h1)
{
Lisp_Object table;
......@@ -3909,7 +3909,7 @@ hash_remove_from_table (struct Lisp_Hash_Table *h, Lisp_Object key)
/* Clear hash table H. */
void
static void
hash_clear (struct Lisp_Hash_Table *h)
{
if (h->count > 0)
......
......@@ -123,7 +123,8 @@ static const struct table_entry width_table[] =
{ 200, { "ultra-expanded", "ultraexpanded", "wide" }}
};
Lisp_Object QCfoundry, QCadstyle, QCregistry;
Lisp_Object QCfoundry;
static Lisp_Object QCadstyle, QCregistry;
/* Symbols representing keys of font extra info. */
Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript, QCavgwidth;
Lisp_Object QCantialias, QCfont_entity, QCfc_unknown_spec;
......@@ -164,7 +165,7 @@ static struct font_driver_list *font_driver_list;
/* Creaters of font-related Lisp object. */
Lisp_Object
static Lisp_Object
font_make_spec (void)
{
Lisp_Object font_spec;
......@@ -220,6 +221,7 @@ static int font_pixel_size (FRAME_PTR f, Lisp_Object);
static Lisp_Object font_open_entity (FRAME_PTR, Lisp_Object, int);
static Lisp_Object font_matching_entity (FRAME_PTR, Lisp_Object *,
Lisp_Object);
static unsigned font_encode_char (Lisp_Object, int);
/* Number of registered font drivers. */
static int num_font_drivers;
......@@ -1305,7 +1307,7 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
This function tries to guess which format it is. */
int
static int
font_parse_fcname (char *name, Lisp_Object font)
{
char *p, *q;
......@@ -1676,90 +1678,6 @@ font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
return (p - name);
}
/* Store GTK-style font name of FONT (font-spec or font-entity) in
NAME (NBYTES length), and return the name length. F is the frame
on which the font is displayed; it is used to calculate the point
size. */
int
font_unparse_gtkname (Lisp_Object font, struct frame *f, char *name, int nbytes)
{
char *p;
int len = 1;
Lisp_Object family, weight, slant, size;
int point_size = -1;
family = AREF (font, FONT_FAMILY_INDEX);
if (! NILP (family))
{
if (! SYMBOLP (family))
return -1;
family = SYMBOL_NAME (family);
len += SBYTES (family);
}
weight = font_style_symbolic (font, FONT_WEIGHT_INDEX, 0);
if (EQ (weight, Qnormal))
weight = Qnil;
else if (! NILP (weight))
{
weight = SYMBOL_NAME (weight);
len += SBYTES (weight);
}
slant = font_style_symbolic (font, FONT_SLANT_INDEX, 0);
if (EQ (slant, Qnormal))
slant = Qnil;
else if (! NILP (slant))
{
slant = SYMBOL_NAME (slant);
len += SBYTES (slant);
}
size = AREF (font, FONT_SIZE_INDEX);
/* Convert pixel size to point size. */
if (INTEGERP (size))
{
Lisp_Object font_dpi = AREF (font, FONT_DPI_INDEX);
int dpi = 75;
if (INTEGERP (font_dpi))
dpi = XINT (font_dpi);
else if (f)
dpi = f->resy;
point_size = PIXEL_TO_POINT (XINT (size), dpi);
len += 11;
}
else if (FLOATP (size))
{
point_size = (int) XFLOAT_DATA (size);
len += 11;
}
if (len > nbytes)
return -1;
p = name + sprintf (name, "%s", SDATA (family));
if (! NILP (weight))
{
char *q = p;
p += sprintf (p, " %s", SDATA (weight));
q[1] = toupper (q[1]);
}
if (! NILP (slant))
{
char *q = p;
p += sprintf (p, " %s", SDATA (slant));
q[1] = toupper (q[1]);
}
if (point_size > 0)
p += sprintf (p, " %d", point_size);
return (p - name);
}
/* Parse NAME (null terminated) and store information in FONT
(font-spec or font-entity). If NAME is successfully parsed, return
0. Otherwise return -1. */
......@@ -3039,7 +2957,7 @@ font_has_char (FRAME_PTR f, Lisp_Object font, int c)
/* Return the glyph ID of FONT_OBJECT for character C. */
unsigned
static unsigned
font_encode_char (Lisp_Object font_object, int c)
{
struct font *font;
......@@ -3144,50 +3062,6 @@ font_clear_prop (Lisp_Object *attrs, enum font_property_index prop)
attrs[LFACE_FONT_INDEX] = font;
}
void
font_update_lface (FRAME_PTR f, Lisp_Object *attrs)
{
Lisp_Object spec;
spec = attrs[LFACE_FONT_INDEX];
if (! FONT_SPEC_P (spec))
return;
if (! NILP (AREF (spec, FONT_FOUNDRY_INDEX)))
attrs[LFACE_FOUNDRY_INDEX] = SYMBOL_NAME (AREF (spec, FONT_FOUNDRY_INDEX));
if (! NILP (AREF (spec, FONT_FAMILY_INDEX)))
attrs[LFACE_FAMILY_INDEX] = SYMBOL_NAME (AREF (spec, FONT_FAMILY_INDEX));
if (! NILP (AREF (spec, FONT_WEIGHT_INDEX)))
attrs[LFACE_WEIGHT_INDEX] = FONT_WEIGHT_FOR_FACE (spec);
if (! NILP (AREF (spec, FONT_SLANT_INDEX)))
attrs[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (spec);
if (! NILP (AREF (spec, FONT_WIDTH_INDEX)))
attrs[LFACE_SWIDTH_INDEX] = FONT_WIDTH_FOR_FACE (spec);
if (! NILP (AREF (spec, FONT_SIZE_INDEX)))
{
int point;
if (INTEGERP (AREF (spec, FONT_SIZE_INDEX)))
{
Lisp_Object val;
int dpi = f->resy;
val = Ffont_get (spec, QCdpi);
if (! NILP (val))
dpi = XINT (val);
point = PIXEL_TO_POINT (XINT (AREF (spec, FONT_SIZE_INDEX)) * 10,
dpi);
attrs[LFACE_HEIGHT_INDEX] = make_number (point);
}
else if (FLOATP (AREF (spec, FONT_SIZE_INDEX)))
{
point = XFLOAT_DATA (AREF (spec, FONT_SIZE_INDEX)) * 10;
attrs[LFACE_HEIGHT_INDEX] = make_number (point);
}
}
}
/* Selecte a font from ENTITIES (list of font-entity vectors) that
supports C and matches best with ATTRS and PIXEL_SIZE. */
......@@ -3781,8 +3655,9 @@ font_filter_properties (Lisp_Object font,
at index POS. If C is negative, get C from the current buffer or
STRING. */
Lisp_Object
font_at (int c, EMACS_INT pos, struct face *face, struct window *w, Lisp_Object string)
static Lisp_Object
font_at (int c, EMACS_INT pos, struct face *face, struct window *w,
Lisp_Object string)
{
FRAME_PTR f;
int multibyte;
......
......@@ -742,11 +742,8 @@ EXFUN (Fmerge_font_spec, 2);
EXFUN (Ffont_get, 2);
EXFUN (Ffont_put, 3);
EXFUN (Flist_fonts, 4);
EXFUN (Ffont_family_list, 1);
EXFUN (Fclear_font_cache, 0);
EXFUN (Ffont_xlfd_name, 2);
extern Lisp_Object font_make_spec (void);
extern Lisp_Object font_make_entity (void);
extern Lisp_Object font_make_object (int, Lisp_Object, int);
......@@ -767,11 +764,9 @@ extern Lisp_Object font_get_name (Lisp_Object font_object);
extern Lisp_Object font_spec_from_name (Lisp_Object font_name);
extern Lisp_Object font_get_frame (Lisp_Object font_object);
extern int font_has_char (FRAME_PTR, Lisp_Object, int);
extern unsigned font_encode_char (Lisp_Object, int);
extern void font_clear_prop (Lisp_Object *attrs,
enum font_property_index prop);
extern void font_update_lface (FRAME_PTR f, Lisp_Object *attrs);
extern Lisp_Object font_find_for_lface (FRAME_PTR f, Lisp_Object *lface,
Lisp_Object spec, int c);
extern Lisp_Object font_open_for_lface (FRAME_PTR f, Lisp_Object entity,
......@@ -792,21 +787,15 @@ extern void font_update_sort_order (int *order);
extern void font_parse_family_registry (Lisp_Object family,
Lisp_Object registry,
Lisp_Object spec);
extern Lisp_Object font_spec_from_family_registry (Lisp_Object family,
Lisp_Object registry);
extern int font_parse_xlfd (char *name, Lisp_Object font);
extern int font_unparse_xlfd (Lisp_Object font, int pixel_size,
char *name, int bytes);
extern int font_parse_fcname (char *name, Lisp_Object font);
extern int font_unparse_fcname (Lisp_Object font, int pixel_size,
char *name, int bytes);
extern int font_unparse_gtkname (Lisp_Object, struct frame *, char *, int);
extern void register_font_driver (struct font_driver *driver, FRAME_PTR f);
extern void free_font_driver_list (FRAME_PTR f);
extern Lisp_Object font_update_drivers (FRAME_PTR f, Lisp_Object list);
extern Lisp_Object font_at (int c, EMACS_INT pos, struct face *face,
struct window *w, Lisp_Object object);
extern Lisp_Object font_range (EMACS_INT, EMACS_INT *,
struct window *, struct face *,
Lisp_Object);
......@@ -858,7 +847,7 @@ extern void syms_of_nsfont (void);
#define FONT_DEBUG
#endif
extern Lisp_Object QCfoundry, QCadstyle, QCregistry;
extern Lisp_Object QCfoundry;
extern Lisp_Object Vfont_log;
extern void font_add_log (const char *, Lisp_Object, Lisp_Object);
......
......@@ -64,8 +64,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define xassert(X) (void) 0
#endif /* not FONTSET_DEBUG */
EXFUN (Fclear_face_cache, 1);
/* FONTSET
A fontset is a collection of font related information to give
......@@ -216,8 +214,6 @@ static Lisp_Object make_fontset (Lisp_Object, Lisp_Object, Lisp_Object);
static Lisp_Object fontset_pattern_regexp (Lisp_Object);
static void accumulate_script_ranges (Lisp_Object, Lisp_Object,
Lisp_Object);
Lisp_Object find_font_encoding (Lisp_Object);
static void set_fontset_font (Lisp_Object, Lisp_Object);
#ifdef FONTSET_DEBUG
......
......@@ -33,7 +33,6 @@ extern void (*check_window_system_func) (void);
struct face;
extern void free_face_fontset (FRAME_PTR, struct face *);
extern Lisp_Object fontset_font_pattern (FRAME_PTR, struct face *, int);
extern int face_suitable_for_char_p (struct face *, int);
extern int face_for_char (FRAME_PTR, struct face *, int,
int, Lisp_Object);
......@@ -44,7 +43,6 @@ extern int fontset_from_font (Lisp_Object);
extern int fs_query_fontset (Lisp_Object, int);
EXFUN (Fquery_fontset, 2);
extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int);
extern Lisp_Object find_font_encoding (Lisp_Object);
extern Lisp_Object Qlatin;
extern Lisp_Object Vuse_default_ascent;
......@@ -56,7 +54,6 @@ extern Lisp_Object Votf_script_alist;
extern Lisp_Object fontset_name (int);
extern Lisp_Object fontset_ascii (int);
extern int fontset_height (int);
struct font;
extern int face_for_font (struct frame *, Lisp_Object, struct face *);
......
......@@ -3982,7 +3982,7 @@ x_get_arg (Display_Info *dpyinfo, Lisp_Object alist, Lisp_Object param,
return Fcdr (tem);
}
Lisp_Object
static Lisp_Object
x_frame_get_arg (struct frame *f, Lisp_Object alist, Lisp_Object param,
const char *attribute, const char *class,
enum resource_types type)
......
......@@ -283,6 +283,7 @@ extern INTERVAL update_interval (INTERVAL, EMACS_INT);
extern void set_intervals_multibyte (int);
extern INTERVAL validate_interval_range (Lisp_Object, Lisp_Object *,
Lisp_Object *, int);
extern INTERVAL interval_of (int, Lisp_Object);
/* Defined in xdisp.c */
extern int invisible_p (Lisp_Object, Lisp_Object);
......@@ -312,7 +313,6 @@ extern Lisp_Object Vtext_property_default_nonsticky;
extern Lisp_Object Qfront_sticky, Qrear_nonsticky;
EXFUN (Fget_char_property, 3);
EXFUN (Fget_char_property_and_overlay, 3);
EXFUN (Fget_text_property, 3);
EXFUN (Ftext_properties_at, 2);
EXFUN (Fnext_property_change, 3);
......@@ -321,7 +321,6 @@ EXFUN (Fadd_text_properties, 4);
EXFUN (Fset_text_properties, 4);
EXFUN (Fremove_text_properties, 4);
EXFUN (Ftext_property_any, 5);
EXFUN (Ftext_property_not_all, 5);
EXFUN (Fprevious_single_char_property_change, 4);
extern Lisp_Object copy_text_properties (Lisp_Object, Lisp_Object,
Lisp_Object, Lisp_Object,
......
......@@ -122,6 +122,7 @@ static void describe_vector (Lisp_Object, Lisp_Object, Lisp_Object,
Lisp_Object, Lisp_Object, int *,
int, int, int);
static void silly_event_symbol_error (Lisp_Object);
static Lisp_Object get_keyelt (Lisp_Object, int);
/* Keymap object support - constructors and predicates. */
......@@ -758,7 +759,7 @@ usage: (map-keymap FUNCTION KEYMAP) */)
This can GC because menu_item_eval_property calls Feval. */
Lisp_Object
static Lisp_Object
get_keyelt (Lisp_Object object, int autoload)
{
while (1)
......
......@@ -39,7 +39,6 @@ EXFUN (Fsingle_key_description, 2);
EXFUN (Fwhere_is_internal, 5);
EXFUN (Fcurrent_active_maps, 2);
extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int);
extern Lisp_Object get_keyelt (Lisp_Object, int);
extern Lisp_Object get_keymap (Lisp_Object, int, int);
EXFUN (Fset_keymap_parent, 2);
extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object,
......
This diff is collapsed.
......@@ -650,7 +650,7 @@ static void substitute_in_interval (INTERVAL, Lisp_Object);
If SECONDS is a number, we wait that many seconds for input, and
return Qnil if no input arrives within that time. */
Lisp_Object
static Lisp_Object
read_filtered_event (int no_switch_frame, int ascii_required,
int error_nonascii, int input_method, Lisp_Object seconds)
{
......
......@@ -540,11 +540,11 @@ write_string (const char *data, int size)
PRINTFINISH;
}
/* Used from outside of print.c to print a block of SIZE
single-byte chars at DATA on a specified stream PRINTCHARFUN.
/* Used to print a block of SIZE single-byte chars at DATA on a
specified stream PRINTCHARFUN.
Do not use this on the contents of a Lisp string. */
void
static void
write_string_1 (const char *data, int size, Lisp_Object printcharfun)
{
PRINTDECLARE;
......
......@@ -167,7 +167,6 @@ int syntax_prefix_flag_p (int c)
struct gl_state_s gl_state; /* Global state of syntax parser. */
INTERVAL interval_of (int, Lisp_Object);
#define INTERVALS_AT_ONCE 10 /* 1 + max-number of intervals
to scan to property-change. */
......
......@@ -299,7 +299,6 @@ struct gl_state_s
extern struct gl_state_s gl_state;
extern int parse_sexp_lookup_properties;
extern INTERVAL interval_of (int, Lisp_Object);
extern EMACS_INT scan_words (EMACS_INT, EMACS_INT);
......
......@@ -647,7 +647,6 @@ extern struct terminal *terminal_list;
/* Return true if the terminal device is not suspended. */
#define TERMINAL_ACTIVE_P(d) (((d)->type != output_termcap && (d)->type !=output_msdos_raw) || (d)->display_info.tty->input)
extern Lisp_Object get_terminal_param (struct terminal *, Lisp_Object);
extern struct terminal *get_terminal (Lisp_Object terminal, int);
extern struct terminal *create_terminal (void);
extern void delete_terminal (struct terminal *);
......
......@@ -429,16 +429,6 @@ selected frame's terminal). */)
/* Return the value of terminal parameter PARAM in terminal T. */
Lisp_Object
get_terminal_param (struct terminal *t, Lisp_Object param)
{
Lisp_Object tem = Fassq (param, t->param_alist);
if (EQ (tem, Qnil))
return tem;
return Fcdr (tem);
}
/* Set the value of terminal parameter PARAMETER in terminal D to VALUE.
Return the previous value. */
......
......@@ -78,6 +78,9 @@ static Lisp_Object next_window (Lisp_Object, Lisp_Object,
Lisp_Object, int);
static void decode_next_window_args (Lisp_Object *, Lisp_Object *,
Lisp_Object *);
static void foreach_window (struct frame *,
int (* fn) (struct window *, void *),
void *);
static int foreach_window_1 (struct window *,
int (* fn) (struct window *, void *),
void *);
......@@ -1425,6 +1428,8 @@ DEFUN ("set-window-display-table", Fset_window_display_table, Sset_window_displa
return table;
}