Commit d5a3eaaf authored by Andreas Schwab's avatar Andreas Schwab

Convert old-style definitions

* editfns.c (transpose_markers): Convert old-style definition.
* emacs.c (abort, shut_down_emacs, fixup_locale)
(synchronize_system_time_locale)
(synchronize_system_messages_locale, syms_of_emacs): Likewise.
* floatfns.c (extract_float, matherr, init_floatfns)
(syms_of_floatfns): Likewise.
* fns.c (make_hash_table): Likewise.
* ftfont.c (ftfont_get_otf, ftfont_otf_features)
(ftfont_otf_capability, ftfont_get_glyph_id, ftfont_get_metrics)
(ftfont_drive_otf, ftfont_shape_by_flt, ftfont_shape)
(ftfont_variation_glyphs): Likewise.
* gtkutil.c (xg_create_widget, xg_modify_menubar_widgets): Likewise.
* keymap.c (describe_map_tree, describe_map, describe_vector): Likewise.
* lread.c (read_filtered_event): Likewise.
* minibuf.c (read_minibuf_noninteractive, read_minibuf): Likewise.
* process.c (wait_reading_process_output): Likewise.
* scroll.c (do_line_insertion_deletion_costs): Likewise.
* search.c (search_buffer, boyer_moore): Likewise.
* syntax.c (scan_sexps_forward): Likewise.
* xdisp.c (try_scrolling): Likewise.
* xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Likewise.
* xfns.c (x_default_scroll_bar_color_parameter): Likewise.
* xselect.c (x_get_window_property, receive_incremental_selection)
(x_get_window_property_as_lisp_data, lisp_data_to_selection_data):
Likewise.
* xterm.c (x_draw_relief_rect, x_draw_box_rect): Likewise.
parent ded80a25
2010-07-12 Andreas Schwab <schwab@linux-m68k.org>
* editfns.c (transpose_markers): Convert old-style definition.
* emacs.c (abort, shut_down_emacs, fixup_locale)
(synchronize_system_time_locale)
(synchronize_system_messages_locale, syms_of_emacs): Likewise.
* floatfns.c (extract_float, matherr, init_floatfns)
(syms_of_floatfns): Likewise.
* fns.c (make_hash_table): Likewise.
* ftfont.c (ftfont_get_otf, ftfont_otf_features)
(ftfont_otf_capability, ftfont_get_glyph_id, ftfont_get_metrics)
(ftfont_drive_otf, ftfont_shape_by_flt, ftfont_shape)
(ftfont_variation_glyphs): Likewise.
* gtkutil.c (xg_create_widget, xg_modify_menubar_widgets): Likewise.
* keymap.c (describe_map_tree, describe_map, describe_vector): Likewise.
* lread.c (read_filtered_event): Likewise.
* minibuf.c (read_minibuf_noninteractive, read_minibuf): Likewise.
* process.c (wait_reading_process_output): Likewise.
* scroll.c (do_line_insertion_deletion_costs): Likewise.
* search.c (search_buffer, boyer_moore): Likewise.
* syntax.c (scan_sexps_forward): Likewise.
* xdisp.c (try_scrolling): Likewise.
* xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Likewise.
* xfns.c (x_default_scroll_bar_color_parameter): Likewise.
* xselect.c (x_get_window_property, receive_incremental_selection)
(x_get_window_property_as_lisp_data, lisp_data_to_selection_data):
Likewise.
* xterm.c (x_draw_relief_rect, x_draw_box_rect): Likewise.
2010-07-12 Dan Nicolaescu <dann@ics.uci.edu>
* callproc.c (child_setup): Remove subprocesses conditional.
......
......@@ -4169,10 +4169,9 @@ Case is ignored if `case-fold-search' is non-nil in the current buffer. */)
It's the caller's job to ensure that START1 <= END1 <= START2 <= END2. */
static void
transpose_markers (start1, end1, start2, end2,
start1_byte, end1_byte, start2_byte, end2_byte)
register int start1, end1, start2, end2;
register int start1_byte, end1_byte, start2_byte, end2_byte;
transpose_markers (int start1, int end1, int start2, int end2,
int start1_byte, int end1_byte,
int start2_byte, int end2_byte)
{
register int amt1, amt1_byte, amt2, amt2_byte, diff, diff_byte, mpos;
register struct Lisp_Marker *marker;
......
......@@ -425,7 +425,7 @@ memory_warning_signal (sig)
#if ! defined (DOS_NT) && ! defined (NO_ABORT)
void
abort ()
abort (void)
{
kill (getpid (), SIGABRT);
/* This shouldn't be executed, but it prevents a warning. */
......@@ -2101,9 +2101,7 @@ all of which are called before Emacs is actually killed. */)
and Fkill_emacs. */
void
shut_down_emacs (sig, no_x, stuff)
int sig, no_x;
Lisp_Object stuff;
shut_down_emacs (int sig, int no_x, Lisp_Object stuff)
{
/* Prevent running of hooks from now on. */
Vrun_hooks = Qnil;
......@@ -2285,7 +2283,7 @@ You must run Emacs in batch mode in order to dump it. */)
#if HAVE_SETLOCALE
/* Recover from setlocale (LC_ALL, ""). */
void
fixup_locale ()
fixup_locale (void)
{
/* The Emacs Lisp reader needs LC_NUMERIC to be "C",
so that numbers are read and printed properly for Emacs Lisp. */
......@@ -2308,7 +2306,7 @@ synchronize_locale (int category, Lisp_Object *plocale, Lisp_Object desired_loca
/* Set system time locale to match Vsystem_time_locale, if possible. */
void
synchronize_system_time_locale ()
synchronize_system_time_locale (void)
{
synchronize_locale (LC_TIME, &Vprevious_system_time_locale,
Vsystem_time_locale);
......@@ -2317,7 +2315,7 @@ synchronize_system_time_locale ()
/* Set system messages locale to match Vsystem_messages_locale, if
possible. */
void
synchronize_system_messages_locale ()
synchronize_system_messages_locale (void)
{
#ifdef LC_MESSAGES
synchronize_locale (LC_MESSAGES, &Vprevious_system_messages_locale,
......@@ -2443,7 +2441,7 @@ from the parent process and its tty file descriptors. */)
}
void
syms_of_emacs ()
syms_of_emacs (void)
{
Qfile_name_handler_alist = intern_c_string ("file-name-handler-alist");
staticpro (&Qfile_name_handler_alist);
......
......@@ -192,8 +192,7 @@ static char *float_error_fn_name;
/* Extract a Lisp number as a `double', or signal an error. */
double
extract_float (num)
Lisp_Object num;
extract_float (Lisp_Object num)
{
CHECK_NUMBER_OR_FLOAT (num);
......@@ -985,8 +984,7 @@ float_error (signo)
#ifdef HAVE_MATHERR
int
matherr (x)
struct exception *x;
matherr (struct exception *x)
{
Lisp_Object args;
if (! in_float)
......@@ -1014,7 +1012,7 @@ matherr (x)
#endif /* HAVE_MATHERR */
void
init_floatfns ()
init_floatfns (void)
{
#ifdef FLOAT_CATCH_SIGILL
signal (SIGILL, float_error);
......@@ -1023,7 +1021,7 @@ init_floatfns ()
}
void
syms_of_floatfns ()
syms_of_floatfns (void)
{
defsubr (&Sacos);
defsubr (&Sasin);
......
......@@ -3757,10 +3757,9 @@ hashfn_user_defined (struct Lisp_Hash_Table *h, Lisp_Object key)
one of the symbols `key', `value', `key-or-value', or `key-and-value'. */
Lisp_Object
make_hash_table (test, size, rehash_size, rehash_threshold, weak,
user_test, user_hash)
Lisp_Object test, size, rehash_size, rehash_threshold, weak;
Lisp_Object user_test, user_hash;
make_hash_table (Lisp_Object test, Lisp_Object size, Lisp_Object rehash_size,
Lisp_Object rehash_threshold, Lisp_Object weak,
Lisp_Object user_test, Lisp_Object user_hash)
{
struct Lisp_Hash_Table *h;
Lisp_Object table;
......
......@@ -457,8 +457,7 @@ ftfont_get_fc_charset (Lisp_Object entity)
#ifdef HAVE_LIBOTF
static OTF *
ftfont_get_otf (ftfont_info)
struct ftfont_info *ftfont_info;
ftfont_get_otf (struct ftfont_info *ftfont_info)
{
OTF *otf;
......@@ -1475,8 +1474,7 @@ ftfont_anchor_point (struct font *font, unsigned int code, int index, int *x, in
#ifdef HAVE_LIBOTF
static Lisp_Object
ftfont_otf_features (gsub_gpos)
OTF_GSUB_GPOS *gsub_gpos;
ftfont_otf_features (OTF_GSUB_GPOS *gsub_gpos)
{
Lisp_Object scripts, langsyses, features, sym;
int i, j, k, l;
......@@ -1520,8 +1518,7 @@ ftfont_otf_features (gsub_gpos)
static Lisp_Object
ftfont_otf_capability (font)
struct font *font;
ftfont_otf_capability (struct font *font)
{
struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
OTF *otf = ftfont_get_otf (ftfont_info);
......@@ -1559,10 +1556,8 @@ struct MFLTFontFT
};
static int
ftfont_get_glyph_id (font, gstring, from, to)
MFLTFont *font;
MFLTGlyphString *gstring;
int from, to;
ftfont_get_glyph_id (MFLTFont *font, MFLTGlyphString *gstring,
int from, int to)
{
struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font;
FT_Face ft_face = flt_font_ft->ft_face;
......@@ -1586,10 +1581,8 @@ ftfont_get_glyph_id (font, gstring, from, to)
#define ROUND(x) (((x)+32) & -64)
static int
ftfont_get_metrics (font, gstring, from, to)
MFLTFont *font;
MFLTGlyphString *gstring;
int from, to;
ftfont_get_metrics (MFLTFont *font, MFLTGlyphString *gstring,
int from, int to)
{
struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font;
FT_Face ft_face = flt_font_ft->ft_face;
......@@ -2086,13 +2079,9 @@ ftfont_try_otf (MFLTFont *font, MFLTOtfSpec *spec,
#else /* not M17N_FLT_USE_NEW_FEATURE */
static int
ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
MFLTFont *font;
MFLTOtfSpec *spec;
MFLTGlyphString *in;
int from, to;
MFLTGlyphString *out;
MFLTGlyphAdjustment *adjustment;
ftfont_drive_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in,
int from, int to,
MFLTGlyphString *out, MFLTGlyphAdjustment *adjustment)
{
struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font;
FT_Face ft_face = flt_font_ft->ft_face;
......@@ -2347,12 +2336,8 @@ static int m17n_flt_initialized;
extern Lisp_Object QCfamily;
static Lisp_Object
ftfont_shape_by_flt (lgstring, font, ft_face, otf, matrix)
Lisp_Object lgstring;
struct font *font;
FT_Face ft_face;
OTF *otf;
FT_Matrix *matrix;
ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font,
FT_Face ft_face, OTF *otf, FT_Matrix *matrix)
{
EMACS_UINT len = LGSTRING_GLYPH_LEN (lgstring);
EMACS_UINT i;
......@@ -2518,8 +2503,7 @@ ftfont_shape_by_flt (lgstring, font, ft_face, otf, matrix)
}
Lisp_Object
ftfont_shape (lgstring)
Lisp_Object lgstring;
ftfont_shape (Lisp_Object lgstring)
{
struct font *font;
struct ftfont_info *ftfont_info;
......@@ -2539,10 +2523,7 @@ ftfont_shape (lgstring)
#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
static int
ftfont_variation_glyphs (font, c, variations)
struct font *font;
int c;
unsigned variations[256];
ftfont_variation_glyphs (struct font *font, int c, unsigned variations[256])
{
struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
OTF *otf = ftfont_get_otf (ftfont_info);
......
......@@ -2175,15 +2175,9 @@ create_menus (widget_value *data,
Returns the widget created. */
GtkWidget *
xg_create_widget (type, name, f, val,
select_cb, deactivate_cb, highlight_cb)
char *type;
char *name;
FRAME_PTR f;
widget_value *val;
GCallback select_cb;
GCallback deactivate_cb;
GCallback highlight_cb;
xg_create_widget (char *type, char *name, FRAME_PTR f, widget_value *val,
GCallback select_cb, GCallback deactivate_cb,
GCallback highlight_cb)
{
GtkWidget *w = 0;
int menu_bar_p = strcmp (type, "menubar") == 0;
......@@ -2743,15 +2737,10 @@ xg_update_submenu (GtkWidget *submenu,
HIGHLIGHT_CB is the callback to call when entering/leaving menu items. */
void
xg_modify_menubar_widgets (menubar, f, val, deep_p,
select_cb, deactivate_cb, highlight_cb)
GtkWidget *menubar;
FRAME_PTR f;
widget_value *val;
int deep_p;
GCallback select_cb;
GCallback deactivate_cb;
GCallback highlight_cb;
xg_modify_menubar_widgets (GtkWidget *menubar, FRAME_PTR f, widget_value *val,
int deep_p,
GCallback select_cb, GCallback deactivate_cb,
GCallback highlight_cb)
{
xg_menu_cb_data *cl_data;
GList *list = gtk_container_get_children (GTK_CONTAINER (menubar));
......
......@@ -3140,15 +3140,9 @@ You type Translation\n\
don't omit it; instead, mention it but say it is shadowed. */
void
describe_map_tree (startmap, partial, shadow, prefix, title, nomenu, transl,
always_title, mention_shadow)
Lisp_Object startmap, shadow, prefix;
int partial;
char *title;
int nomenu;
int transl;
int always_title;
int mention_shadow;
describe_map_tree (Lisp_Object startmap, int partial, Lisp_Object shadow,
Lisp_Object prefix, char *title, int nomenu, int transl,
int always_title, int mention_shadow)
{
Lisp_Object maps, orig_maps, seen, sub_shadows;
struct gcpro gcpro1, gcpro2, gcpro3;
......@@ -3355,16 +3349,10 @@ describe_map_compare (const void *aa, const void *bb)
PARTIAL, SHADOW, NOMENU are as in `describe_map_tree' above. */
static void
describe_map (map, prefix, elt_describer, partial, shadow,
seen, nomenu, mention_shadow)
register Lisp_Object map;
Lisp_Object prefix;
void (*elt_describer) (Lisp_Object, Lisp_Object);
int partial;
Lisp_Object shadow;
Lisp_Object *seen;
int nomenu;
int mention_shadow;
describe_map (Lisp_Object map, Lisp_Object prefix,
void (*elt_describer) (Lisp_Object, Lisp_Object),
int partial, Lisp_Object shadow,
Lisp_Object *seen, int nomenu, int mention_shadow)
{
Lisp_Object tail, definition, event;
Lisp_Object tem;
......@@ -3603,20 +3591,11 @@ DESCRIBER is the output function used; nil means use `princ'. */)
ARGS is simply passed as the second argument to ELT_DESCRIBER. */
static void
describe_vector (vector, prefix, args, elt_describer,
partial, shadow, entire_map,
indices, char_table_depth, keymap_p,
mention_shadow)
register Lisp_Object vector;
Lisp_Object prefix, args;
void (*elt_describer) (Lisp_Object, Lisp_Object);
int partial;
Lisp_Object shadow;
Lisp_Object entire_map;
int *indices;
int char_table_depth;
int keymap_p;
int mention_shadow;
describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args,
void (*elt_describer) (Lisp_Object, Lisp_Object),
int partial, Lisp_Object shadow, Lisp_Object entire_map,
int *indices, int char_table_depth, int keymap_p,
int mention_shadow)
{
Lisp_Object definition;
Lisp_Object tem2;
......
......@@ -661,10 +661,8 @@ static void substitute_in_interval (INTERVAL, Lisp_Object);
return Qnil if no input arrives within that time. */
Lisp_Object
read_filtered_event (no_switch_frame, ascii_required, error_nonascii,
input_method, seconds)
int no_switch_frame, ascii_required, error_nonascii, input_method;
Lisp_Object seconds;
read_filtered_event (int no_switch_frame, int ascii_required,
int error_nonascii, int input_method, Lisp_Object seconds)
{
Lisp_Object val, delayed_switch_frame;
EMACS_TIME end_time;
......
......@@ -278,19 +278,12 @@ string_to_object (Lisp_Object val, Lisp_Object defalt)
from read_minibuf to do the job if noninteractive. */
static Lisp_Object
read_minibuf_noninteractive (map, initial, prompt, backup_n, expflag,
histvar, histpos, defalt, allow_props,
inherit_input_method)
Lisp_Object map;
Lisp_Object initial;
Lisp_Object prompt;
Lisp_Object backup_n;
int expflag;
Lisp_Object histvar;
Lisp_Object histpos;
Lisp_Object defalt;
int allow_props;
int inherit_input_method;
read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
Lisp_Object prompt, Lisp_Object backup_n,
int expflag,
Lisp_Object histvar, Lisp_Object histpos,
Lisp_Object defalt,
int allow_props, int inherit_input_method)
{
int size, len;
char *line, *s;
......@@ -434,18 +427,10 @@ If the current buffer is not a minibuffer, return its entire contents. */)
current input method. */
static Lisp_Object
read_minibuf (map, initial, prompt, backup_n, expflag,
histvar, histpos, defalt, allow_props, inherit_input_method)
Lisp_Object map;
Lisp_Object initial;
Lisp_Object prompt;
Lisp_Object backup_n;
int expflag;
Lisp_Object histvar;
Lisp_Object histpos;
Lisp_Object defalt;
int allow_props;
int inherit_input_method;
read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
Lisp_Object backup_n, int expflag,
Lisp_Object histvar, Lisp_Object histpos, Lisp_Object defalt,
int allow_props, int inherit_input_method)
{
Lisp_Object val;
int count = SPECPDL_INDEX ();
......
......@@ -4492,12 +4492,10 @@ select_wrapper (int n, fd_set *rfd, fd_set *wfd, fd_set *xfd, struct timeval *tm
Otherwise, return true if we received input from any process. */
int
wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
wait_for_cell, wait_proc, just_wait_proc)
int time_limit, microsecs, read_kbd, do_display;
Lisp_Object wait_for_cell;
struct Lisp_Process *wait_proc;
int just_wait_proc;
wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
int do_display,
Lisp_Object wait_for_cell,
struct Lisp_Process *wait_proc, int just_wait_proc)
{
register int channel, nfds;
SELECT_TYPE Available;
......
......@@ -992,15 +992,11 @@ ins_del_costs (FRAME_PTR frame,
*/
void
do_line_insertion_deletion_costs (frame,
ins_line_string, multi_ins_string,
del_line_string, multi_del_string,
setup_string, cleanup_string, coefficient)
FRAME_PTR frame;
char *ins_line_string, *multi_ins_string;
char *del_line_string, *multi_del_string;
char *setup_string, *cleanup_string;
int coefficient;
do_line_insertion_deletion_costs (FRAME_PTR frame,
char *ins_line_string, char *multi_ins_string,
char *del_line_string, char *multi_del_string,
char *setup_string, char *cleanup_string,
int coefficient)
{
if (FRAME_INSERT_COST (frame) != 0)
{
......
......@@ -1110,18 +1110,9 @@ while (0)
static struct re_registers search_regs_1;
static EMACS_INT
search_buffer (string, pos, pos_byte, lim, lim_byte, n,
RE, trt, inverse_trt, posix)
Lisp_Object string;
EMACS_INT pos;
EMACS_INT pos_byte;
EMACS_INT lim;
EMACS_INT lim_byte;
int n;
int RE;
Lisp_Object trt;
Lisp_Object inverse_trt;
int posix;
search_buffer (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte,
EMACS_INT lim, EMACS_INT lim_byte, int n,
int RE, Lisp_Object trt, Lisp_Object inverse_trt, int posix)
{
int len = SCHARS (string);
int len_byte = SBYTES (string);
......@@ -1668,16 +1659,10 @@ simple_search (int n, unsigned char *pat, int len, int len_byte, Lisp_Object trt
If that criterion is not satisfied, do not call this function. */
static EMACS_INT
boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt,
pos, pos_byte, lim, lim_byte, char_base)
int n;
unsigned char *base_pat;
int len, len_byte;
Lisp_Object trt;
Lisp_Object inverse_trt;
EMACS_INT pos, pos_byte;
EMACS_INT lim, lim_byte;
int char_base;
boyer_moore (int n, unsigned char *base_pat, int len, int len_byte,
Lisp_Object trt, Lisp_Object inverse_trt,
EMACS_INT pos, EMACS_INT pos_byte,
EMACS_INT lim, EMACS_INT lim_byte, int char_base)
{
int direction = ((n > 0) ? 1 : -1);
register int dirlen;
......
......@@ -2861,14 +2861,10 @@ This includes chars with "quote" or "prefix" syntax (' or p). */)
after the beginning of a string, or after the end of a string. */
static void
scan_sexps_forward (stateptr, from, from_byte, end, targetdepth,
stopbefore, oldstate, commentstop)
struct lisp_parse_state *stateptr;
register EMACS_INT from;
EMACS_INT from_byte, end;
int targetdepth, stopbefore;
Lisp_Object oldstate;
int commentstop;
scan_sexps_forward (struct lisp_parse_state *stateptr,
EMACS_INT from, EMACS_INT from_byte, EMACS_INT end,
int targetdepth, int stopbefore,
Lisp_Object oldstate, int commentstop)
{
struct lisp_parse_state state;
......
......@@ -13082,13 +13082,9 @@ enum
};
static int
try_scrolling (window, just_this_one_p, scroll_conservatively,
scroll_step, temp_scroll_step, last_line_misfit)
Lisp_Object window;
int just_this_one_p;
EMACS_INT scroll_conservatively, scroll_step;
int temp_scroll_step;
int last_line_misfit;
try_scrolling (Lisp_Object window, int just_this_one_p,
EMACS_INT scroll_conservatively, EMACS_INT scroll_step,
int temp_scroll_step, int last_line_misfit)
{
struct window *w = XWINDOW (window);
struct frame *f = XFRAME (w->frame);
......
......@@ -6074,15 +6074,10 @@ compute_char_face (struct frame *f, int ch, Lisp_Object prop)
The face returned is suitable for displaying ASCII characters. */
int
face_at_buffer_position (w, pos, region_beg, region_end,
endptr, limit, mouse, base_face_id)
struct window *w;
EMACS_INT pos;
EMACS_INT region_beg, region_end;
EMACS_INT *endptr;
EMACS_INT limit;
int mouse;
int base_face_id;
face_at_buffer_position (struct window *w, EMACS_INT pos,
EMACS_INT region_beg, EMACS_INT region_end,
EMACS_INT *endptr, EMACS_INT limit,
int mouse, int base_face_id)
{
struct frame *f = XFRAME (w->frame);
Lisp_Object attrs[LFACE_VECTOR_SIZE];
......@@ -6182,15 +6177,10 @@ face_at_buffer_position (w, pos, region_beg, region_end,
simply disregards the `face' properties of all overlays. */
int
face_for_overlay_string (w, pos, region_beg, region_end,
endptr, limit, mouse, overlay)
struct window *w;
EMACS_INT pos;
EMACS_INT region_beg, region_end;
EMACS_INT *endptr;
EMACS_INT limit;
int mouse;
Lisp_Object overlay;
face_for_overlay_string (struct window *w, EMACS_INT pos,
EMACS_INT region_beg, EMACS_INT region_end,
EMACS_INT *endptr, EMACS_INT limit,
int mouse, Lisp_Object overlay)
{
struct frame *f = XFRAME (w->frame);
Lisp_Object attrs[LFACE_VECTOR_SIZE];
......@@ -6275,15 +6265,11 @@ face_for_overlay_string (w, pos, region_beg, region_end,
for displaying ASCII characters. */
int
face_at_string_position (w, string, pos, bufpos, region_beg,
region_end, endptr, base_face_id, mouse_p)
struct window *w;
Lisp_Object string;
EMACS_INT pos, bufpos;
EMACS_INT region_beg, region_end;
EMACS_INT *endptr;
enum face_id base_face_id;
int mouse_p;
face_at_string_position (struct window *w, Lisp_Object string,
EMACS_INT pos, EMACS_INT bufpos,
EMACS_INT region_beg, EMACS_INT region_end,
EMACS_INT *endptr, enum face_id base_face_id,
int mouse_p)
{
Lisp_Object prop, position, end, limit;
struct frame *f = XFRAME (WINDOW_FRAME (w));
......
......@@ -1762,14 +1762,10 @@ x_set_scroll_bar_default_width (struct frame *f)
named NAME. If that is not found either, use the value DEFLT. */
static Lisp_Object
x_default_scroll_bar_color_parameter (f, alist, prop, xprop, xclass,
foreground_p)
struct frame *f;
Lisp_Object alist;
Lisp_Object prop;
char *xprop;
char *xclass;
int foreground_p;
x_default_scroll_bar_color_parameter (struct frame *f,
Lisp_Object alist, Lisp_Object prop,
char *xprop, char *xclass,
int foreground_p)
{
struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
Lisp_Object tem;
......
......@@ -1453,18 +1453,10 @@ x_get_foreign_selection (Lisp_Object selection_symbol, Lisp_Object target_type,
/* Use xfree, not XFree, to free the data obtained with this function. */
static void
x_get_window_property (display, window, property, data_ret, bytes_ret,
actual_type_ret, actual_format_ret, actual_size_ret,
delete_p)
Display *display;
Window window;
Atom property;
unsigned char **data_ret;
int *bytes_ret;
Atom *actual_type_ret;
int *actual_format_ret;
unsigned long *actual_size_ret;
int delete_p;
x_get_window_property (Display *display, Window window, Atom property,
unsigned char **data_ret, int *bytes_ret,
Atom *actual_type_ret, int *actual_format_ret,
unsigned long *actual_size_ret, int delete_p)
{
int total_size;
unsigned long bytes_remaining;
......@@ -1572,19 +1564,12 @@ x_get_window_property (display, window, property, data_ret, bytes_ret,
/* Use xfree, not XFree, to free the data obtained with this function. */
static void