Mercurial > emacs
changeset 109099:e16f43875a48
Remove P_ and __P macros.
* lwlib/lwlib-Xaw.h: Remove P_ and __P macros.
* lwlib/lwlib-Xlw.h:
* lwlib/lwlib-Xm.h:
* lwlib/lwlib-int.h:
* lwlib/lwlib-utils.h:
* lwlib/lwlib.h: Likewise.
* src/buffer.h: Remove P_ and __P macros.
* src/category.h:
* src/ccl.h:
* src/character.h:
* src/charset.h:
* src/cm.h:
* src/coding.h:
* src/composite.h:
* src/dispextern.h:
* src/disptab.h:
* src/font.h:
* src/fontset.h:
* src/frame.h:
* src/gtkutil.h:
* src/indent.h:
* src/intervals.h:
* src/keyboard.h:
* src/keymap.h:
* src/lisp.h:
* src/macros.h:
* src/md5.h:
* src/menu.h:
* src/msdos.h:
* src/nsterm.h:
* src/puresize.h:
* src/region-cache.h:
* src/syntax.h:
* src/syssignal.h:
* src/systime.h:
* src/termhooks.h:
* src/w32term.h:
* src/widget.h:
* src/window.h:
* src/xgselect.h:
* src/xsettings.h:
* src/xterm.h: Likewise.
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Fri, 02 Jul 2010 11:26:33 +0200 |
| parents | a17732ef349e |
| children | 2bc9a0c04c87 6b53237eedca |
| files | lwlib/ChangeLog lwlib/lwlib-Xaw.h lwlib/lwlib-Xlw.h lwlib/lwlib-Xm.h lwlib/lwlib-int.h lwlib/lwlib-utils.h lwlib/lwlib.h src/ChangeLog src/atimer.h src/buffer.h src/category.h src/ccl.h src/character.h src/charset.h src/cm.h src/coding.h src/composite.h src/dispextern.h src/disptab.h src/font.h src/fontset.h src/frame.h src/gtkutil.h src/indent.h src/intervals.h src/keyboard.h src/keymap.h src/lisp.h src/macros.h src/md5.h src/menu.h src/msdos.h src/nsterm.h src/puresize.h src/region-cache.h src/syntax.h src/syssignal.h src/systime.h src/termhooks.h src/w32term.h src/widget.h src/window.h src/xgselect.h src/xsettings.h src/xterm.h |
| diffstat | 45 files changed, 1669 insertions(+), 1619 deletions(-) [+] |
line wrap: on
line diff
--- a/lwlib/ChangeLog Fri Jul 02 01:11:24 2010 -0700 +++ b/lwlib/ChangeLog Fri Jul 02 11:26:33 2010 +0200 @@ -1,3 +1,13 @@ +2010-07-02 Jan Djärv <jan.h.d@swipnet.se> + + Remove P_ and __P macros. + * lwlib-Xaw.h: Remove P_ and __P macros. + * lwlib-Xlw.h: + * lwlib-Xm.h: + * lwlib-int.h: + * lwlib-utils.h: + * lwlib.h: Likewise. + 2010-05-15 Glenn Morris <rgm@gnu.org> * Makefile.in (mostlyclean): Remove references to non-existent files.
--- a/lwlib/lwlib-Xaw.h Fri Jul 02 01:11:24 2010 -0700 +++ b/lwlib/lwlib-Xaw.h Fri Jul 02 11:26:33 2010 +0200 @@ -6,25 +6,25 @@ extern widget_creation_entry xaw_creation_table []; Widget -xaw_create_dialog __P ((widget_instance*)); +xaw_create_dialog (widget_instance*); Boolean -lw_xaw_widget_p __P ((Widget)); +lw_xaw_widget_p (Widget); void -xaw_update_one_widget __P ((widget_instance *, Widget, widget_value *, Boolean)); +xaw_update_one_widget (widget_instance *, Widget, widget_value *, Boolean); void -xaw_update_one_value __P ((widget_instance *, Widget, widget_value *)); +xaw_update_one_value (widget_instance *, Widget, widget_value *); void -xaw_destroy_instance __P ((widget_instance *)); +xaw_destroy_instance (widget_instance *); void -xaw_popup_menu __P ((Widget, XEvent *)); +xaw_popup_menu (Widget, XEvent *); void -xaw_pop_instance __P ((widget_instance *, Boolean)); +xaw_pop_instance (widget_instance *, Boolean); #endif /* LWLIB_XAW_H */
--- a/lwlib/lwlib-Xlw.h Fri Jul 02 01:11:24 2010 -0700 +++ b/lwlib/lwlib-Xlw.h Fri Jul 02 11:26:33 2010 +0200 @@ -7,24 +7,24 @@ extern widget_creation_function xlw_create_dialog; Boolean -lw_lucid_widget_p __P ((Widget widget)); +lw_lucid_widget_p (Widget widget); void -xlw_update_one_widget __P ((widget_instance* instance, Widget widget, - widget_value* val, Boolean deep_p)); +xlw_update_one_widget (widget_instance* instance, Widget widget, + widget_value* val, Boolean deep_p); void -xlw_update_one_value __P ((widget_instance* instance, Widget widget, - widget_value* val)); +xlw_update_one_value (widget_instance* instance, Widget widget, + widget_value* val); void -xlw_destroy_instance __P ((widget_instance* instance)); +xlw_destroy_instance (widget_instance* instance); void -xlw_pop_instance __P ((widget_instance* instance, Boolean up)); +xlw_pop_instance (widget_instance* instance, Boolean up); void -xlw_popup_menu __P ((Widget widget, XEvent * event)); +xlw_popup_menu (Widget widget, XEvent * event); #endif /* LWLIB_XLW_H */
--- a/lwlib/lwlib-Xm.h Fri Jul 02 01:11:24 2010 -0700 +++ b/lwlib/lwlib-Xm.h Fri Jul 02 11:26:33 2010 +0200 @@ -26,36 +26,36 @@ extern widget_creation_entry xm_creation_table []; Widget -xm_create_dialog __P ((widget_instance* instance)); +xm_create_dialog (widget_instance* instance); Boolean -lw_motif_widget_p __P ((Widget widget)); +lw_motif_widget_p (Widget widget); void -xm_update_one_widget __P ((widget_instance* instance, Widget widget, - widget_value* val, Boolean deep_p)); +xm_update_one_widget (widget_instance* instance, Widget widget, + widget_value* val, Boolean deep_p); void -xm_update_one_value __P ((widget_instance* instance, Widget widget, - widget_value* val)); +xm_update_one_value (widget_instance* instance, Widget widget, + widget_value* val); void -xm_destroy_instance __P ((widget_instance* instance)); +xm_destroy_instance (widget_instance* instance); void -xm_set_keyboard_focus __P ((Widget parent, Widget w)); +xm_set_keyboard_focus (Widget parent, Widget w); void -xm_popup_menu __P ((Widget widget, XEvent *event)); +xm_popup_menu (Widget widget, XEvent *event); void -xm_pop_instance __P ((widget_instance* instance, Boolean up)); +xm_pop_instance (widget_instance* instance, Boolean up); void -xm_set_main_areas __P ((Widget parent, Widget menubar, Widget work_area)); +xm_set_main_areas (Widget parent, Widget menubar, Widget work_area); void -xm_manage_resizing __P ((Widget w, Boolean flag)); +xm_manage_resizing (Widget w, Boolean flag); #endif /* LWLIB_XM_H */
--- a/lwlib/lwlib-int.h Fri Jul 02 01:11:24 2010 -0700 +++ b/lwlib/lwlib-int.h Fri Jul 02 11:26:33 2010 +0200 @@ -26,7 +26,7 @@ #include "lwlib.h" -extern char *safe_strdup __P ((const char *)); +extern char *safe_strdup (const char *); struct widget_xft_data; @@ -70,14 +70,14 @@ /* update all other instances of a widget. Can be used in a callback when a widget has been used by the user */ void -lw_internal_update_other_instances __P ((Widget, XtPointer, XtPointer)); +lw_internal_update_other_instances (Widget, XtPointer, XtPointer); /* get the widget_value for a widget in a given instance */ widget_value* -lw_get_widget_value_for_widget __P ((widget_instance *, Widget)); +lw_get_widget_value_for_widget (widget_instance *, Widget); -widget_info *lw_get_widget_info __P ((LWLIB_ID)); -widget_instance * lw_get_widget_instance __P ((Widget)); +widget_info *lw_get_widget_info (LWLIB_ID); +widget_instance * lw_get_widget_instance (Widget); #endif /* LWLIB_INTERNAL_H */
--- a/lwlib/lwlib-utils.h Fri Jul 02 01:11:24 2010 -0700 +++ b/lwlib/lwlib-utils.h Fri Jul 02 11:26:33 2010 +0200 @@ -1,21 +1,21 @@ #ifndef _LWLIB_UTILS_H_ #define _LWLIB_UTILS_H_ -void XtNoClearRefreshWidget __P ((Widget)); +void XtNoClearRefreshWidget (Widget); -typedef void (*XtApplyToWidgetsProc) __P ((Widget, XtPointer)); -typedef void* (*XtApplyUntilToWidgetsProc) __P ((Widget, XtPointer)); +typedef void (*XtApplyToWidgetsProc) (Widget, XtPointer); +typedef void* (*XtApplyUntilToWidgetsProc) (Widget, XtPointer); -void XtApplyToWidgets __P ((Widget, XtApplyToWidgetsProc, XtPointer)); -void *XtApplyUntilToWidgets __P ((Widget, XtApplyUntilToWidgetsProc, XtPointer)); +void XtApplyToWidgets (Widget, XtApplyToWidgetsProc, XtPointer); +void *XtApplyUntilToWidgets (Widget, XtApplyUntilToWidgetsProc, XtPointer); -Widget *XtCompositeChildren __P ((Widget, unsigned int *)); +Widget *XtCompositeChildren (Widget, unsigned int *); /* returns True is the widget is being destroyed, False otherwise */ Boolean -XtWidgetBeingDestroyedP __P ((Widget widget)); +XtWidgetBeingDestroyedP (Widget widget); -void XtSafelyDestroyWidget __P ((Widget)); +void XtSafelyDestroyWidget (Widget); #endif /* _LWLIB_UTILS_H_ */
--- a/lwlib/lwlib.h Fri Jul 02 01:11:24 2010 -0700 +++ b/lwlib/lwlib.h Fri Jul 02 11:26:33 2010 +0200 @@ -130,66 +130,66 @@ } widget_value; -typedef void (*lw_callback) __P ((Widget w, LWLIB_ID id, void* data)); +typedef void (*lw_callback) (Widget w, LWLIB_ID id, void* data); -void lw_register_widget __P ((char* type, char* name, LWLIB_ID id, - widget_value* val, lw_callback pre_activate_cb, - lw_callback selection_cb, - lw_callback post_activate_cb, - lw_callback highlight_cb)); -Widget lw_get_widget __P ((LWLIB_ID id, Widget parent, Boolean pop_up_p)); -Widget lw_make_widget __P ((LWLIB_ID id, Widget parent, Boolean pop_up_p)); -Widget lw_create_widget __P ((char* type, char* name, LWLIB_ID id, - widget_value* val, Widget parent, Boolean pop_up_p, - lw_callback pre_activate_cb, - lw_callback selection_cb, - lw_callback post_activate_cb, - lw_callback highlight_cb)); -LWLIB_ID lw_get_widget_id __P ((Widget w)); -int lw_modify_all_widgets __P ((LWLIB_ID id, widget_value* val, Boolean deep_p)); -void lw_destroy_widget __P ((Widget w)); -void lw_destroy_all_widgets __P ((LWLIB_ID id)); -void lw_destroy_everything __P ((void)); -void lw_destroy_all_pop_ups __P ((void)); -Widget lw_raise_all_pop_up_widgets __P ((void)); -widget_value* lw_get_all_values __P ((LWLIB_ID id)); -Boolean lw_get_some_values __P ((LWLIB_ID id, widget_value* val)); -void lw_pop_up_all_widgets __P ((LWLIB_ID id)); -void lw_pop_down_all_widgets __P ((LWLIB_ID id)); +void lw_register_widget (char* type, char* name, LWLIB_ID id, + widget_value* val, lw_callback pre_activate_cb, + lw_callback selection_cb, + lw_callback post_activate_cb, + lw_callback highlight_cb); +Widget lw_get_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); +Widget lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); +Widget lw_create_widget (char* type, char* name, LWLIB_ID id, + widget_value* val, Widget parent, Boolean pop_up_p, + lw_callback pre_activate_cb, + lw_callback selection_cb, + lw_callback post_activate_cb, + lw_callback highlight_cb); +LWLIB_ID lw_get_widget_id (Widget w); +int lw_modify_all_widgets (LWLIB_ID id, widget_value* val, Boolean deep_p); +void lw_destroy_widget (Widget w); +void lw_destroy_all_widgets (LWLIB_ID id); +void lw_destroy_everything (void); +void lw_destroy_all_pop_ups (void); +Widget lw_raise_all_pop_up_widgets (void); +widget_value* lw_get_all_values (LWLIB_ID id); +Boolean lw_get_some_values (LWLIB_ID id, widget_value* val); +void lw_pop_up_all_widgets (LWLIB_ID id); +void lw_pop_down_all_widgets (LWLIB_ID id); widget_value *malloc_widget_value (); -void free_widget_value __P ((widget_value *)); -void lw_popup_menu __P ((Widget, XEvent *)); +void free_widget_value (widget_value *); +void lw_popup_menu (Widget, XEvent *); /* Toolkit independent way of focusing on a Widget at the Xt level. */ -void lw_set_keyboard_focus __P ((Widget parent, Widget w)); +void lw_set_keyboard_focus (Widget parent, Widget w); /* Silly Energize hack to invert the "sheet" button */ -void lw_show_busy __P ((Widget w, Boolean busy)); +void lw_show_busy (Widget w, Boolean busy); /* Silly hack to assist with Lucid/Athena geometry management. */ -void lw_refigure_widget __P ((Widget w, Boolean doit)); +void lw_refigure_widget (Widget w, Boolean doit); /* Toolkit independent way of determining if an event occurred on a menubar. */ -Boolean lw_window_is_in_menubar __P ((Window win, Widget menubar_widget)); +Boolean lw_window_is_in_menubar (Window win, Widget menubar_widget); /* Manage resizing: TRUE permits resizing widget w; FALSE disallows it. */ -void lw_allow_resizing __P ((Widget w, Boolean flag)); +void lw_allow_resizing (Widget w, Boolean flag); /* Set up the main window. */ -void lw_set_main_areas __P ((Widget parent, - Widget menubar, - Widget work_area)); +void lw_set_main_areas (Widget parent, + Widget menubar, + Widget work_area); /* Value is non-zero if LABEL is a menu separator. If it is, *TYPE is set to an appropriate enumerator of type enum menu_separator. MOTIF_P non-zero means map separator types not supported by Motif to similar ones that are supported. */ -int lw_separator_p __P ((char *label, enum menu_separator *type, - int motif_p)); +int lw_separator_p (char *label, enum menu_separator *type, + int motif_p); -void lwlib_bcopy __P ((char*, char*, int)); +void lwlib_bcopy (char*, char*, int); #endif /* LWLIB_H */
--- a/src/ChangeLog Fri Jul 02 01:11:24 2010 -0700 +++ b/src/ChangeLog Fri Jul 02 11:26:33 2010 +0200 @@ -1,3 +1,43 @@ +2010-07-02 Jan Djärv <jan.h.d@swipnet.se> + + Remove P_ and __P macros. + * buffer.h: Remove P_ and __P macros. + * category.h: + * ccl.h: + * character.h: + * charset.h: + * cm.h: + * coding.h: + * composite.h: + * dispextern.h: + * disptab.h: + * font.h: + * fontset.h: + * frame.h: + * gtkutil.h: + * indent.h: + * intervals.h: + * keyboard.h: + * keymap.h: + * lisp.h: + * macros.h: + * md5.h: + * menu.h: + * msdos.h: + * nsterm.h: + * puresize.h: + * region-cache.h: + * syntax.h: + * syssignal.h: + * systime.h: + * termhooks.h: + * w32term.h: + * widget.h: + * window.h: + * xgselect.h: + * xsettings.h: + * xterm.h: Likewise. + 2010-07-02 Dan Nicolaescu <dann@ics.uci.edu> * lisp.h: Document that USE_LISP_UNION_TYPE is now enabled using autoconf.
--- a/src/atimer.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/atimer.h Fri Jul 02 11:26:33 2010 +0200 @@ -49,7 +49,7 @@ /* Type of timer callback functions. */ -typedef void (* atimer_callback) P_ ((struct atimer *timer)); +typedef void (* atimer_callback) (struct atimer *timer); /* Structure describing an asynchronous timer. */ @@ -77,15 +77,15 @@ /* Function prototypes. */ -struct atimer *start_atimer P_ ((enum atimer_type, EMACS_TIME, - atimer_callback, void *)); -void cancel_atimer P_ ((struct atimer *)); -void do_pending_atimers P_ ((void)); -void init_atimer P_ ((void)); -void turn_on_atimers P_ ((int)); -void stop_other_atimers P_ ((struct atimer *)); -void run_all_atimers P_ ((void)); -Lisp_Object unwind_stop_other_atimers P_ ((Lisp_Object)); +struct atimer *start_atimer (enum atimer_type, EMACS_TIME, + atimer_callback, void *); +void cancel_atimer (struct atimer *); +void do_pending_atimers (void); +void init_atimer (void); +void turn_on_atimers (int); +void stop_other_atimers (struct atimer *); +void run_all_atimers (void); +Lisp_Object unwind_stop_other_atimers (Lisp_Object); #endif /* EMACS_ATIMER_H */
--- a/src/buffer.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/buffer.h Fri Jul 02 11:26:33 2010 +0200 @@ -225,12 +225,12 @@ #define BUF_TEMP_SET_PT(buffer, position) \ (temp_set_point ((buffer), (position))) -extern void set_point P_ ((EMACS_INT)); -extern INLINE void temp_set_point P_ ((struct buffer *, EMACS_INT)); -extern void set_point_both P_ ((EMACS_INT, EMACS_INT)); -extern INLINE void temp_set_point_both P_ ((struct buffer *, - EMACS_INT, EMACS_INT)); -extern void enlarge_buffer_text P_ ((struct buffer *, EMACS_INT)); +extern void set_point (EMACS_INT); +extern INLINE void temp_set_point (struct buffer *, EMACS_INT); +extern void set_point_both (EMACS_INT, EMACS_INT); +extern INLINE void temp_set_point_both (struct buffer *, + EMACS_INT, EMACS_INT); +extern void enlarge_buffer_text (struct buffer *, EMACS_INT); /* Macros for setting the BEGV, ZV or PT of a given buffer. @@ -857,23 +857,23 @@ extern struct buffer buffer_local_symbols; -extern void delete_all_overlays P_ ((struct buffer *)); -extern void reset_buffer P_ ((struct buffer *)); -extern void evaporate_overlays P_ ((EMACS_INT)); -extern int overlays_at P_ ((EMACS_INT pos, int extend, Lisp_Object **vec_ptr, - int *len_ptr, EMACS_INT *next_ptr, - EMACS_INT *prev_ptr, int change_req)); -extern int sort_overlays P_ ((Lisp_Object *, int, struct window *)); -extern void recenter_overlay_lists P_ ((struct buffer *, EMACS_INT)); -extern int overlay_strings P_ ((EMACS_INT, struct window *, unsigned char **)); -extern void validate_region P_ ((Lisp_Object *, Lisp_Object *)); -extern void set_buffer_internal P_ ((struct buffer *)); -extern void set_buffer_internal_1 P_ ((struct buffer *)); -extern void set_buffer_temp P_ ((struct buffer *)); -extern void record_buffer P_ ((Lisp_Object)); -extern void buffer_slot_type_mismatch P_ ((Lisp_Object, int)) NO_RETURN; -extern void fix_overlays_before P_ ((struct buffer *, EMACS_INT, EMACS_INT)); -extern void mmap_set_vars P_ ((int)); +extern void delete_all_overlays (struct buffer *); +extern void reset_buffer (struct buffer *); +extern void evaporate_overlays (EMACS_INT); +extern int overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr, + int *len_ptr, EMACS_INT *next_ptr, + EMACS_INT *prev_ptr, int change_req); +extern int sort_overlays (Lisp_Object *, int, struct window *); +extern void recenter_overlay_lists (struct buffer *, EMACS_INT); +extern int overlay_strings (EMACS_INT, struct window *, unsigned char **); +extern void validate_region (Lisp_Object *, Lisp_Object *); +extern void set_buffer_internal (struct buffer *); +extern void set_buffer_internal_1 (struct buffer *); +extern void set_buffer_temp (struct buffer *); +extern void record_buffer (Lisp_Object); +extern void buffer_slot_type_mismatch (Lisp_Object, int) NO_RETURN; +extern void fix_overlays_before (struct buffer *, EMACS_INT, EMACS_INT); +extern void mmap_set_vars (int); /* Get overlays at POSN into array OVERLAYS with NOVERLAYS elements. If NEXTP is non-NULL, return next overlay there.
--- a/src/category.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/category.h Fri Jul 02 11:26:33 2010 +0200 @@ -113,8 +113,8 @@ (!(SINGLE_BYTE_CHAR_P (c1) && SINGLE_BYTE_CHAR_P (c2)) \ && word_boundary_p (c1, c2)) -extern int word_boundary_p P_ ((int, int)); -extern void set_category_set P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); +extern int word_boundary_p (int, int); +extern void set_category_set (Lisp_Object, Lisp_Object, Lisp_Object); /* arch-tag: 309dfe83-c3e2-4d22-8e81-faae5aece0ff (do not change this comment) */
--- a/src/ccl.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/ccl.h Fri Jul 02 11:26:33 2010 +0200 @@ -97,13 +97,13 @@ /* Setup fields of the structure pointed by CCL appropriately for the execution of ccl program CCL_PROG (symbol or vector). */ -extern int setup_ccl_program P_ ((struct ccl_program *, Lisp_Object)); +extern int setup_ccl_program (struct ccl_program *, Lisp_Object); /* Check if CCL is updated or not. If not, re-setup members of CCL. */ -extern int check_ccl_update P_ ((struct ccl_program *)); +extern int check_ccl_update (struct ccl_program *); -extern void ccl_driver P_ ((struct ccl_program *, int *, int *, int, int, - Lisp_Object)); +extern void ccl_driver (struct ccl_program *, int *, int *, int, int, + Lisp_Object); /* Vector of CCL program names vs corresponding program data. */ extern Lisp_Object Vccl_program_table;
--- a/src/character.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/character.h Fri Jul 02 11:26:33 2010 +0200 @@ -596,24 +596,24 @@ : 0) -extern int char_resolve_modifier_mask P_ ((int)); -extern int char_string P_ ((unsigned, unsigned char *)); -extern int string_char P_ ((const unsigned char *, - const unsigned char **, int *)); +extern int char_resolve_modifier_mask (int); +extern int char_string (unsigned, unsigned char *); +extern int string_char (const unsigned char *, + const unsigned char **, int *); -extern int translate_char P_ ((Lisp_Object, int c)); -extern int char_printable_p P_ ((int c)); -extern void parse_str_as_multibyte P_ ((const unsigned char *, int, int *, - int *)); -extern int parse_str_to_multibyte P_ ((unsigned char *, int)); -extern int str_as_multibyte P_ ((unsigned char *, int, int, int *)); -extern int str_to_multibyte P_ ((unsigned char *, int, int)); -extern int str_as_unibyte P_ ((unsigned char *, int)); -extern EMACS_INT str_to_unibyte P_ ((const unsigned char *, unsigned char *, - EMACS_INT, int)); -extern int strwidth P_ ((unsigned char *, int)); -extern int c_string_width P_ ((const unsigned char *, int, int, int *, int *)); -extern int lisp_string_width P_ ((Lisp_Object, int, int *, int *)); +extern int translate_char (Lisp_Object, int c); +extern int char_printable_p (int c); +extern void parse_str_as_multibyte (const unsigned char *, int, int *, + int *); +extern int parse_str_to_multibyte (unsigned char *, int); +extern int str_as_multibyte (unsigned char *, int, int, int *); +extern int str_to_multibyte (unsigned char *, int, int); +extern int str_as_unibyte (unsigned char *, int); +extern EMACS_INT str_to_unibyte (const unsigned char *, unsigned char *, + EMACS_INT, int); +extern int strwidth (unsigned char *, int); +extern int c_string_width (const unsigned char *, int, int, int *, int *); +extern int lisp_string_width (Lisp_Object, int, int *, int *); extern Lisp_Object Vprintable_chars; @@ -624,7 +624,7 @@ extern Lisp_Object Vchar_unify_table; extern Lisp_Object Vunicode_category_table; -extern Lisp_Object string_escape_byte8 P_ ((Lisp_Object)); +extern Lisp_Object string_escape_byte8 (Lisp_Object); /* Return a translation table of id number ID. */ #define GET_TRANSLATION_TABLE(id) \
--- a/src/charset.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/charset.h Fri Jul 02 11:26:33 2010 +0200 @@ -534,17 +534,17 @@ extern int charset_unibyte; -extern struct charset *char_charset P_ ((int, Lisp_Object, unsigned *)); -extern Lisp_Object charset_attributes P_ ((int)); +extern struct charset *char_charset (int, Lisp_Object, unsigned *); +extern Lisp_Object charset_attributes (int); -extern int maybe_unify_char P_ ((int, Lisp_Object)); -extern int decode_char P_ ((struct charset *, unsigned)); -extern unsigned encode_char P_ ((struct charset *, int)); -extern int string_xstring_p P_ ((Lisp_Object)); +extern int maybe_unify_char (int, Lisp_Object); +extern int decode_char (struct charset *, unsigned); +extern unsigned encode_char (struct charset *, int); +extern int string_xstring_p (Lisp_Object); -extern void map_charset_chars P_ ((void (*) (Lisp_Object, Lisp_Object), - Lisp_Object, Lisp_Object, - struct charset *, unsigned, unsigned)); +extern void map_charset_chars (void (*) (Lisp_Object, Lisp_Object), + Lisp_Object, Lisp_Object, + struct charset *, unsigned, unsigned); EXFUN (Funify_charset, 3);
--- a/src/cm.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/cm.h Fri Jul 02 11:26:33 2010 +0200 @@ -163,12 +163,12 @@ #define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str, affcnt, putc)) extern struct tty_display_info *current_tty; -extern void cmcheckmagic P_ ((struct tty_display_info *)); -extern int cmputc P_ ((int)); -extern void cmcostinit P_ ((struct tty_display_info *)); -extern void cmgoto P_ ((struct tty_display_info *, int, int)); -extern void Wcm_clear P_ ((struct tty_display_info *)); -extern int Wcm_init P_ ((struct tty_display_info *)); +extern void cmcheckmagic (struct tty_display_info *); +extern int cmputc (int); +extern void cmcostinit (struct tty_display_info *); +extern void cmgoto (struct tty_display_info *, int, int); +extern void Wcm_clear (struct tty_display_info *); +extern int Wcm_init (struct tty_display_info *); /* arch-tag: acc1535a-7136-49d6-b22d-9bc85702251b (do not change this comment) */
--- a/src/coding.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/coding.h Fri Jul 02 11:26:33 2010 +0200 @@ -499,10 +499,10 @@ int default_char; - int (*detector) P_ ((struct coding_system *, - struct coding_detection_info *)); - void (*decoder) P_ ((struct coding_system *)); - int (*encoder) P_ ((struct coding_system *)); + int (*detector) (struct coding_system *, + struct coding_detection_info *); + void (*decoder) (struct coding_system *); + int (*encoder) (struct coding_system *); }; /* Meanings of bits in the member `common_flags' of the structure @@ -691,33 +691,33 @@ #define ENCODE_UTF_8(str) code_convert_string_norecord (str, Qutf_8, 1) /* Extern declarations. */ -extern Lisp_Object code_conversion_save P_ ((int, int)); -extern int decoding_buffer_size P_ ((struct coding_system *, int)); -extern int encoding_buffer_size P_ ((struct coding_system *, int)); -extern void setup_coding_system P_ ((Lisp_Object, struct coding_system *)); -extern Lisp_Object coding_charset_list P_ ((struct coding_system *)); -extern Lisp_Object coding_system_charset_list P_ ((Lisp_Object)); -extern void detect_coding P_ ((struct coding_system *)); -extern Lisp_Object code_convert_region P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, - int, int)); -extern Lisp_Object code_convert_string P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, int, int, int)); -extern Lisp_Object code_convert_string_norecord P_ ((Lisp_Object, Lisp_Object, - int)); -extern Lisp_Object raw_text_coding_system P_ ((Lisp_Object)); -extern Lisp_Object coding_inherit_eol_type P_ ((Lisp_Object, Lisp_Object)); +extern Lisp_Object code_conversion_save (int, int); +extern int decoding_buffer_size (struct coding_system *, int); +extern int encoding_buffer_size (struct coding_system *, int); +extern void setup_coding_system (Lisp_Object, struct coding_system *); +extern Lisp_Object coding_charset_list (struct coding_system *); +extern Lisp_Object coding_system_charset_list (Lisp_Object); +extern void detect_coding (struct coding_system *); +extern Lisp_Object code_convert_region (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, + int, int); +extern Lisp_Object code_convert_string (Lisp_Object, Lisp_Object, + Lisp_Object, int, int, int); +extern Lisp_Object code_convert_string_norecord (Lisp_Object, Lisp_Object, + int); +extern Lisp_Object raw_text_coding_system (Lisp_Object); +extern Lisp_Object coding_inherit_eol_type (Lisp_Object, Lisp_Object); -extern int decode_coding_gap P_ ((struct coding_system *, - EMACS_INT, EMACS_INT)); -extern int encode_coding_gap P_ ((struct coding_system *, - EMACS_INT, EMACS_INT)); -extern void decode_coding_object P_ ((struct coding_system *, - Lisp_Object, EMACS_INT, EMACS_INT, - EMACS_INT, EMACS_INT, Lisp_Object)); -extern void encode_coding_object P_ ((struct coding_system *, - Lisp_Object, EMACS_INT, EMACS_INT, - EMACS_INT, EMACS_INT, Lisp_Object)); +extern int decode_coding_gap (struct coding_system *, + EMACS_INT, EMACS_INT); +extern int encode_coding_gap (struct coding_system *, + EMACS_INT, EMACS_INT); +extern void decode_coding_object (struct coding_system *, + Lisp_Object, EMACS_INT, EMACS_INT, + EMACS_INT, EMACS_INT, Lisp_Object); +extern void encode_coding_object (struct coding_system *, + Lisp_Object, EMACS_INT, EMACS_INT, + EMACS_INT, EMACS_INT, Lisp_Object); /* Macros for backward compatibility. */ @@ -753,7 +753,7 @@ } while (0) -extern Lisp_Object preferred_coding_system P_ (()); +extern Lisp_Object preferred_coding_system (); extern Lisp_Object Qutf_8, Qutf_8_emacs; @@ -780,7 +780,7 @@ extern Lisp_Object Qstart_process, Qopen_network_stream; extern Lisp_Object Qwrite_region; -extern char *emacs_strerror P_ ((int)); +extern char *emacs_strerror (int); /* Coding-system for reading files and receiving data from process. */ extern Lisp_Object Vcoding_system_for_read; @@ -823,7 +823,7 @@ extern Lisp_Object Qcoding_system_error; extern char emacs_mule_bytes[256]; -extern int emacs_mule_string_char P_ ((unsigned char *)); +extern int emacs_mule_string_char (unsigned char *); #endif /* EMACS_CODING_H */
--- a/src/composite.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/composite.h Fri Jul 02 11:26:33 2010 +0200 @@ -212,16 +212,16 @@ extern Lisp_Object Qauto_composition_function; extern Lisp_Object Vcomposition_function_table; -extern int get_composition_id P_ ((int, int, int, Lisp_Object, Lisp_Object)); -extern int find_composition P_ ((int, int, EMACS_INT *, EMACS_INT *, Lisp_Object *, - Lisp_Object)); -extern void update_compositions P_ ((EMACS_INT, EMACS_INT, int)); -extern void make_composition_value_copy P_ ((Lisp_Object)); -extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object, - Lisp_Object)); -extern void syms_of_composite P_ ((void)); -extern void compose_text P_ ((int, int, Lisp_Object, Lisp_Object, - Lisp_Object)); +extern int get_composition_id (int, int, int, Lisp_Object, Lisp_Object); +extern int find_composition (int, int, EMACS_INT *, EMACS_INT *, Lisp_Object *, + Lisp_Object); +extern void update_compositions (EMACS_INT, EMACS_INT, int); +extern void make_composition_value_copy (Lisp_Object); +extern void compose_region (int, int, Lisp_Object, Lisp_Object, + Lisp_Object); +extern void syms_of_composite (void); +extern void compose_text (int, int, Lisp_Object, Lisp_Object, + Lisp_Object); /* Macros for lispy glyph-string. This is completely different from struct glyph_string. */ @@ -303,23 +303,23 @@ struct face; struct font_metrics; -extern Lisp_Object composition_gstring_put_cache P_ ((Lisp_Object, int)); -extern Lisp_Object composition_gstring_from_id P_ ((int)); -extern int composition_gstring_p P_ ((Lisp_Object)); -extern int composition_gstring_width P_ ((Lisp_Object, int, int, - struct font_metrics *)); +extern Lisp_Object composition_gstring_put_cache (Lisp_Object, int); +extern Lisp_Object composition_gstring_from_id (int); +extern int composition_gstring_p (Lisp_Object); +extern int composition_gstring_width (Lisp_Object, int, int, + struct font_metrics *); -extern void composition_compute_stop_pos P_ ((struct composition_it *, - EMACS_INT, EMACS_INT, EMACS_INT, - Lisp_Object)); -extern int composition_reseat_it P_ ((struct composition_it *, - EMACS_INT, EMACS_INT, EMACS_INT, - struct window *, struct face *, - Lisp_Object)); -extern int composition_update_it P_ ((struct composition_it *, - EMACS_INT, EMACS_INT, Lisp_Object)); +extern void composition_compute_stop_pos (struct composition_it *, + EMACS_INT, EMACS_INT, EMACS_INT, + Lisp_Object); +extern int composition_reseat_it (struct composition_it *, + EMACS_INT, EMACS_INT, EMACS_INT, + struct window *, struct face *, + Lisp_Object); +extern int composition_update_it (struct composition_it *, + EMACS_INT, EMACS_INT, Lisp_Object); -extern int composition_adjust_point P_ ((EMACS_INT, EMACS_INT)); +extern int composition_adjust_point (EMACS_INT, EMACS_INT); EXFUN (Fcompose_region_internal, 4); EXFUN (Fcompose_string_internal, 5);
--- a/src/dispextern.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/dispextern.h Fri Jul 02 11:26:33 2010 +0200 @@ -642,7 +642,7 @@ This aborts if any pointer is found twice. */ #if GLYPH_DEBUG -void check_matrix_pointer_lossage P_ ((struct glyph_matrix *)); +void check_matrix_pointer_lossage (struct glyph_matrix *); #define CHECK_MATRIX(MATRIX) check_matrix_pointer_lossage ((MATRIX)) #else #define CHECK_MATRIX(MATRIX) (void) 0 @@ -914,7 +914,7 @@ we don't try to access rows that are out of bounds. */ #if GLYPH_DEBUG -struct glyph_row *matrix_row P_ ((struct glyph_matrix *, int)); +struct glyph_row *matrix_row (struct glyph_matrix *, int); #define MATRIX_ROW(MATRIX, ROW) matrix_row ((MATRIX), (ROW)) #else #define MATRIX_ROW(MATRIX, ROW) ((MATRIX)->rows + (ROW)) @@ -2478,7 +2478,7 @@ /* Handlers for setting frame parameters. */ -typedef void (*frame_parm_handler) P_ ((struct frame *, Lisp_Object, Lisp_Object)); +typedef void (*frame_parm_handler) (struct frame *, Lisp_Object, Lisp_Object); /* Structure holding system-dependent interface functions needed @@ -2491,110 +2491,110 @@ /* Produce glyphs/get display metrics for the display element IT is loaded with. */ - void (*produce_glyphs) P_ ((struct it *it)); + void (*produce_glyphs) (struct it *it); /* Write or insert LEN glyphs from STRING at the nominal output position. */ - void (*write_glyphs) P_ ((struct glyph *string, int len)); - void (*insert_glyphs) P_ ((struct glyph *start, int len)); + void (*write_glyphs) (struct glyph *string, int len); + void (*insert_glyphs) (struct glyph *start, int len); /* Clear from nominal output position to X. X < 0 means clear to right end of display. */ - void (*clear_end_of_line) P_ ((int x)); + void (*clear_end_of_line) (int x); /* Function to call to scroll the display as described by RUN on window W. */ - void (*scroll_run_hook) P_ ((struct window *w, struct run *run)); + void (*scroll_run_hook) (struct window *w, struct run *run); /* Function to call after a line in a display has been completely updated. Used to draw truncation marks and alike. DESIRED_ROW is the desired row which has been updated. */ - void (*after_update_window_line_hook) P_ ((struct glyph_row *desired_row)); + void (*after_update_window_line_hook) (struct glyph_row *desired_row); /* Function to call before beginning to update window W in window-based redisplay. */ - void (*update_window_begin_hook) P_ ((struct window *w)); + void (*update_window_begin_hook) (struct window *w); /* Function to call after window W has been updated in window-based redisplay. CURSOR_ON_P non-zero means switch cursor on. MOUSE_FACE_OVERWRITTEN_P non-zero means that some lines in W that contained glyphs in mouse-face were overwritten, so we have to update the mouse highlight. */ - void (*update_window_end_hook) P_ ((struct window *w, int cursor_on_p, - int mouse_face_overwritten_p)); + void (*update_window_end_hook) (struct window *w, int cursor_on_p, + int mouse_face_overwritten_p); /* Move cursor to row/column position VPOS/HPOS, pixel coordinates Y/X. HPOS/VPOS are window-relative row and column numbers and X/Y are window-relative pixel positions. */ - void (*cursor_to) P_ ((int vpos, int hpos, int y, int x)); + void (*cursor_to) (int vpos, int hpos, int y, int x); /* Flush the display of frame F. For X, this is XFlush. */ - void (*flush_display) P_ ((struct frame *f)); + void (*flush_display) (struct frame *f); /* Flush the display of frame F if non-NULL. This is called during redisplay, and should be NULL on systems which flushes automatically before reading input. */ - void (*flush_display_optional) P_ ((struct frame *f)); + void (*flush_display_optional) (struct frame *f); /* Clear the mouse hightlight in window W, if there is any. */ - void (*clear_window_mouse_face) P_ ((struct window *w)); + void (*clear_window_mouse_face) (struct window *w); /* Set *LEFT and *RIGHT to the left and right overhang of GLYPH on frame F. */ - void (*get_glyph_overhangs) P_ ((struct glyph *glyph, struct frame *f, - int *left, int *right)); + void (*get_glyph_overhangs) (struct glyph *glyph, struct frame *f, + int *left, int *right); /* Fix the display of AREA of ROW in window W for overlapping rows. This function is called from redraw_overlapping_rows after desired rows have been made current. */ - void (*fix_overlapping_area) P_ ((struct window *w, struct glyph_row *row, - enum glyph_row_area area, int)); + void (*fix_overlapping_area) (struct window *w, struct glyph_row *row, + enum glyph_row_area area, int); #ifdef HAVE_WINDOW_SYSTEM /* Draw a fringe bitmap in window W of row ROW using parameters P. */ - void (*draw_fringe_bitmap) P_ ((struct window *w, struct glyph_row *row, - struct draw_fringe_bitmap_params *p)); + void (*draw_fringe_bitmap) (struct window *w, struct glyph_row *row, + struct draw_fringe_bitmap_params *p); /* Define and destroy fringe bitmap no. WHICH. */ - void (*define_fringe_bitmap) P_ ((int which, unsigned short *bits, - int h, int wd)); - void (*destroy_fringe_bitmap) P_ ((int which)); + void (*define_fringe_bitmap) (int which, unsigned short *bits, + int h, int wd); + void (*destroy_fringe_bitmap) (int which); /* Compute left and right overhang of glyph string S. A NULL pointer if platform does not support this. */ - void (*compute_glyph_string_overhangs) P_ ((struct glyph_string *s)); + void (*compute_glyph_string_overhangs) (struct glyph_string *s); /* Draw a glyph string S. */ - void (*draw_glyph_string) P_ ((struct glyph_string *s)); + void (*draw_glyph_string) (struct glyph_string *s); /* Define cursor CURSOR on frame F. */ - void (*define_frame_cursor) P_ ((struct frame *f, Cursor cursor)); + void (*define_frame_cursor) (struct frame *f, Cursor cursor); /* Clear the area at (X,Y,WIDTH,HEIGHT) of frame F. */ - void (*clear_frame_area) P_ ((struct frame *f, int x, int y, - int width, int height)); + void (*clear_frame_area) (struct frame *f, int x, int y, + int width, int height); /* Draw specified cursor CURSOR_TYPE of width CURSOR_WIDTH at row GLYPH_ROW on window W if ON_P is 1. If ON_P is 0, don't draw cursor. If ACTIVE_P is 1, system caret should track this cursor (when applicable). */ - void (*draw_window_cursor) P_ ((struct window *w, - struct glyph_row *glyph_row, - int x, int y, - int cursor_type, int cursor_width, - int on_p, int active_p)); + void (*draw_window_cursor) (struct window *w, + struct glyph_row *glyph_row, + int x, int y, + int cursor_type, int cursor_width, + int on_p, int active_p); /* Draw vertical border for window W from (X,Y0) to (X,Y1). */ - void (*draw_vertical_window_border) P_ ((struct window *w, - int x, int y0, int y1)); + void (*draw_vertical_window_border) (struct window *w, + int x, int y0, int y1); /* Shift display of frame F to make room for inserted glyphs. The area at pixel (X,Y) of width WIDTH and height HEIGHT is shifted right by SHIFT_BY pixels. */ - void (*shift_glyphs_for_insert) P_ ((struct frame *f, - int x, int y, int width, - int height, int shift_by)); + void (*shift_glyphs_for_insert) (struct frame *f, + int x, int y, int width, + int height, int shift_by); #endif /* HAVE_WINDOW_SYSTEM */ }; @@ -2621,14 +2621,14 @@ /* Check that SPEC is a valid image specification for the given image type. Value is non-zero if SPEC is valid. */ - int (* valid_p) P_ ((Lisp_Object spec)); + int (* valid_p) (Lisp_Object spec); /* Load IMG which is used on frame F from information contained in IMG->spec. Value is non-zero if successful. */ - int (* load) P_ ((struct frame *f, struct image *img)); + int (* load) (struct frame *f, struct image *img); /* Free resources of image IMG which is used on frame F. */ - void (* free) P_ ((struct frame *f, struct image *img)); + void (* free) (struct frame *f, struct image *img); /* Next in list of all supported image types. */ struct image_type *next; @@ -2885,65 +2885,65 @@ /* Defined in bidi.c */ -extern void bidi_init_it P_ ((EMACS_INT, EMACS_INT, struct bidi_it *)); -extern void bidi_move_to_visually_next P_ ((struct bidi_it *)); -extern void bidi_paragraph_init P_ ((bidi_dir_t, struct bidi_it *)); -extern int bidi_mirror_char P_ ((int)); +extern void bidi_init_it (EMACS_INT, EMACS_INT, struct bidi_it *); +extern void bidi_move_to_visually_next (struct bidi_it *); +extern void bidi_paragraph_init (bidi_dir_t, struct bidi_it *); +extern int bidi_mirror_char (int); /* Defined in xdisp.c */ -struct glyph_row *row_containing_pos P_ ((struct window *, int, - struct glyph_row *, - struct glyph_row *, int)); -EMACS_INT string_buffer_position P_ ((struct window *, Lisp_Object, - EMACS_INT)); -int line_bottom_y P_ ((struct it *)); -int display_prop_intangible_p P_ ((Lisp_Object)); -void resize_echo_area_exactly P_ ((void)); -int resize_mini_window P_ ((struct window *, int)); -int try_window P_ ((Lisp_Object, struct text_pos, int)); -void window_box P_ ((struct window *, int, int *, int *, int *, int *)); -int window_box_height P_ ((struct window *)); -int window_text_bottom_y P_ ((struct window *)); -int window_box_width P_ ((struct window *, int)); -int window_box_left P_ ((struct window *, int)); -int window_box_left_offset P_ ((struct window *, int)); -int window_box_right P_ ((struct window *, int)); -int window_box_right_offset P_ ((struct window *, int)); -void window_box_edges P_ ((struct window *, int, int *, int *, int *, int *)); -int estimate_mode_line_height P_ ((struct frame *, enum face_id)); -void pixel_to_glyph_coords P_ ((struct frame *, int, int, int *, int *, - NativeRectangle *, int)); -int glyph_to_pixel_coords P_ ((struct window *, int, int, int *, int *)); -void remember_mouse_glyph P_ ((struct frame *, int, int, NativeRectangle *)); - -void mark_window_display_accurate P_ ((Lisp_Object, int)); -void redisplay_preserve_echo_area P_ ((int)); -int set_cursor_from_row P_ ((struct window *, struct glyph_row *, - struct glyph_matrix *, int, int, int, int)); -void init_iterator P_ ((struct it *, struct window *, EMACS_INT, - EMACS_INT, struct glyph_row *, enum face_id)); -void init_iterator_to_row_start P_ ((struct it *, struct window *, - struct glyph_row *)); -int get_next_display_element P_ ((struct it *)); -void set_iterator_to_next P_ ((struct it *, int)); -void start_display P_ ((struct it *, struct window *, struct text_pos)); -void move_it_to P_ ((struct it *, int, int, int, int, int)); -void move_it_vertically P_ ((struct it *, int)); -void move_it_vertically_backward P_ ((struct it *, int)); -void move_it_by_lines P_ ((struct it *, int, int)); -void move_it_past_eol P_ ((struct it *)); +struct glyph_row *row_containing_pos (struct window *, int, + struct glyph_row *, + struct glyph_row *, int); +EMACS_INT string_buffer_position (struct window *, Lisp_Object, + EMACS_INT); +int line_bottom_y (struct it *); +int display_prop_intangible_p (Lisp_Object); +void resize_echo_area_exactly (void); +int resize_mini_window (struct window *, int); +int try_window (Lisp_Object, struct text_pos, int); +void window_box (struct window *, int, int *, int *, int *, int *); +int window_box_height (struct window *); +int window_text_bottom_y (struct window *); +int window_box_width (struct window *, int); +int window_box_left (struct window *, int); +int window_box_left_offset (struct window *, int); +int window_box_right (struct window *, int); +int window_box_right_offset (struct window *, int); +void window_box_edges (struct window *, int, int *, int *, int *, int *); +int estimate_mode_line_height (struct frame *, enum face_id); +void pixel_to_glyph_coords (struct frame *, int, int, int *, int *, + NativeRectangle *, int); +int glyph_to_pixel_coords (struct window *, int, int, int *, int *); +void remember_mouse_glyph (struct frame *, int, int, NativeRectangle *); + +void mark_window_display_accurate (Lisp_Object, int); +void redisplay_preserve_echo_area (int); +int set_cursor_from_row (struct window *, struct glyph_row *, + struct glyph_matrix *, int, int, int, int); +void init_iterator (struct it *, struct window *, EMACS_INT, + EMACS_INT, struct glyph_row *, enum face_id); +void init_iterator_to_row_start (struct it *, struct window *, + struct glyph_row *); +int get_next_display_element (struct it *); +void set_iterator_to_next (struct it *, int); +void start_display (struct it *, struct window *, struct text_pos); +void move_it_to (struct it *, int, int, int, int, int); +void move_it_vertically (struct it *, int); +void move_it_vertically_backward (struct it *, int); +void move_it_by_lines (struct it *, int, int); +void move_it_past_eol (struct it *); void move_it_in_display_line (struct it *it, EMACS_INT to_charpos, int to_x, enum move_operation_enum op); -int in_display_vector_p P_ ((struct it *)); -int frame_mode_line_height P_ ((struct frame *)); -void highlight_trailing_whitespace P_ ((struct frame *, struct glyph_row *)); +int in_display_vector_p (struct it *); +int frame_mode_line_height (struct frame *); +void highlight_trailing_whitespace (struct frame *, struct glyph_row *); extern Lisp_Object Qtool_bar; extern Lisp_Object Vshow_trailing_whitespace; extern int mode_line_in_non_selected_windows; extern int redisplaying_p; -extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object)); +extern void add_to_log (char *, Lisp_Object, Lisp_Object); extern int help_echo_showing_p; extern int current_mode_line_height, current_header_line_height; extern Lisp_Object help_echo_string, help_echo_window; @@ -2955,67 +2955,67 @@ extern int unibyte_display_via_language_environment; extern EMACS_INT underline_minimum_offset; -extern void reseat_at_previous_visible_line_start P_ ((struct it *)); - -extern int calc_pixel_width_or_height P_ ((double *, struct it *, Lisp_Object, - struct font *, int, int *)); +extern void reseat_at_previous_visible_line_start (struct it *); + +extern int calc_pixel_width_or_height (double *, struct it *, Lisp_Object, + struct font *, int, int *); #ifdef HAVE_WINDOW_SYSTEM #if GLYPH_DEBUG -extern void dump_glyph_string P_ ((struct glyph_string *)); +extern void dump_glyph_string (struct glyph_string *); #endif -extern void x_get_glyph_overhangs P_ ((struct glyph *, struct frame *, - int *, int *)); -extern void x_produce_glyphs P_ ((struct it *)); - -extern void x_write_glyphs P_ ((struct glyph *, int)); -extern void x_insert_glyphs P_ ((struct glyph *, int len)); -extern void x_clear_end_of_line P_ ((int)); +extern void x_get_glyph_overhangs (struct glyph *, struct frame *, + int *, int *); +extern void x_produce_glyphs (struct it *); + +extern void x_write_glyphs (struct glyph *, int); +extern void x_insert_glyphs (struct glyph *, int len); +extern void x_clear_end_of_line (int); extern int x_stretch_cursor_p; extern struct cursor_pos output_cursor; -extern void x_fix_overlapping_area P_ ((struct window *, struct glyph_row *, - enum glyph_row_area, int)); -extern void draw_phys_cursor_glyph P_ ((struct window *, - struct glyph_row *, - enum draw_glyphs_face)); -extern void get_phys_cursor_geometry P_ ((struct window *, struct glyph_row *, - struct glyph *, int *, int *, int *)); -extern void erase_phys_cursor P_ ((struct window *)); -extern void display_and_set_cursor P_ ((struct window *, - int, int, int, int, int)); - -extern void set_output_cursor P_ ((struct cursor_pos *)); -extern void x_cursor_to P_ ((int, int, int, int)); - -extern void x_update_cursor P_ ((struct frame *, int)); -extern void x_clear_cursor P_ ((struct window *)); -extern void x_draw_vertical_border P_ ((struct window *w)); - -extern void frame_to_window_pixel_xy P_ ((struct window *, int *, int *)); -extern int get_glyph_string_clip_rects P_ ((struct glyph_string *, - NativeRectangle *, int)); -extern void get_glyph_string_clip_rect P_ ((struct glyph_string *, - NativeRectangle *nr)); -extern Lisp_Object find_hot_spot P_ ((Lisp_Object, int, int)); -extern void note_mouse_highlight P_ ((struct frame *, int, int)); -extern void x_clear_window_mouse_face P_ ((struct window *)); -extern void cancel_mouse_face P_ ((struct frame *)); - -extern void handle_tool_bar_click P_ ((struct frame *, - int, int, int, unsigned int)); +extern void x_fix_overlapping_area (struct window *, struct glyph_row *, + enum glyph_row_area, int); +extern void draw_phys_cursor_glyph (struct window *, + struct glyph_row *, + enum draw_glyphs_face); +extern void get_phys_cursor_geometry (struct window *, struct glyph_row *, + struct glyph *, int *, int *, int *); +extern void erase_phys_cursor (struct window *); +extern void display_and_set_cursor (struct window *, + int, int, int, int, int); + +extern void set_output_cursor (struct cursor_pos *); +extern void x_cursor_to (int, int, int, int); + +extern void x_update_cursor (struct frame *, int); +extern void x_clear_cursor (struct window *); +extern void x_draw_vertical_border (struct window *w); + +extern void frame_to_window_pixel_xy (struct window *, int *, int *); +extern int get_glyph_string_clip_rects (struct glyph_string *, + NativeRectangle *, int); +extern void get_glyph_string_clip_rect (struct glyph_string *, + NativeRectangle *nr); +extern Lisp_Object find_hot_spot (Lisp_Object, int, int); +extern void note_mouse_highlight (struct frame *, int, int); +extern void x_clear_window_mouse_face (struct window *); +extern void cancel_mouse_face (struct frame *); + +extern void handle_tool_bar_click (struct frame *, + int, int, int, unsigned int); /* msdos.c defines its own versions of these functions. */ -extern int clear_mouse_face P_ ((Display_Info *)); -extern void show_mouse_face P_ ((Display_Info *, enum draw_glyphs_face)); -extern int cursor_in_mouse_face_p P_ ((struct window *w)); - -extern void expose_frame P_ ((struct frame *, int, int, int, int)); -extern int x_intersect_rectangles P_ ((XRectangle *, XRectangle *, - XRectangle *)); +extern int clear_mouse_face (Display_Info *); +extern void show_mouse_face (Display_Info *, enum draw_glyphs_face); +extern int cursor_in_mouse_face_p (struct window *w); + +extern void expose_frame (struct frame *, int, int, int, int); +extern int x_intersect_rectangles (XRectangle *, XRectangle *, + XRectangle *); #endif /* Flags passed to try_window. */ @@ -3025,107 +3025,107 @@ /* Defined in fringe.c */ int lookup_fringe_bitmap (Lisp_Object); -void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int)); -void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *)); -int draw_window_fringes P_ ((struct window *, int)); -int update_window_fringes P_ ((struct window *, int)); -void compute_fringe_widths P_ ((struct frame *, int)); +void draw_fringe_bitmap (struct window *, struct glyph_row *, int); +void draw_row_fringe_bitmaps (struct window *, struct glyph_row *); +int draw_window_fringes (struct window *, int); +int update_window_fringes (struct window *, int); +void compute_fringe_widths (struct frame *, int); #ifdef WINDOWSNT -void w32_init_fringe P_ ((struct redisplay_interface *)); -void w32_reset_fringes P_ ((void)); +void w32_init_fringe (struct redisplay_interface *); +void w32_reset_fringes (void); #endif /* Defined in image.c */ #ifdef HAVE_WINDOW_SYSTEM -extern int x_bitmap_height P_ ((struct frame *, int)); -extern int x_bitmap_width P_ ((struct frame *, int)); -extern int x_bitmap_pixmap P_ ((struct frame *, int)); -extern void x_reference_bitmap P_ ((struct frame *, int)); -extern int x_create_bitmap_from_data P_ ((struct frame *, char *, - unsigned int, unsigned int)); -extern int x_create_bitmap_from_file P_ ((struct frame *, Lisp_Object)); +extern int x_bitmap_height (struct frame *, int); +extern int x_bitmap_width (struct frame *, int); +extern int x_bitmap_pixmap (struct frame *, int); +extern void x_reference_bitmap (struct frame *, int); +extern int x_create_bitmap_from_data (struct frame *, char *, + unsigned int, unsigned int); +extern int x_create_bitmap_from_file (struct frame *, Lisp_Object); #if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) -extern int x_create_bitmap_from_xpm_data P_ ((struct frame *f, char **bits)); +extern int x_create_bitmap_from_xpm_data (struct frame *f, char **bits); #endif #ifndef x_destroy_bitmap -extern void x_destroy_bitmap P_ ((struct frame *, int)); +extern void x_destroy_bitmap (struct frame *, int); #endif -extern void x_destroy_all_bitmaps P_ ((Display_Info *)); -extern int x_create_bitmap_mask P_ ((struct frame * , int)); -extern Lisp_Object x_find_image_file P_ ((Lisp_Object)); - -void x_kill_gs_process P_ ((Pixmap, struct frame *)); -struct image_cache *make_image_cache P_ ((void)); -void free_image_cache P_ ((struct frame *)); -void clear_image_caches P_ ((Lisp_Object)); -void mark_image_cache P_ ((struct image_cache *)); -int valid_image_p P_ ((Lisp_Object)); -void prepare_image_for_display P_ ((struct frame *, struct image *)); -int lookup_image P_ ((struct frame *, Lisp_Object)); - -unsigned long image_background P_ ((struct image *, struct frame *, - XImagePtr_or_DC ximg)); -int image_background_transparent P_ ((struct image *, struct frame *, - XImagePtr_or_DC mask)); - -int image_ascent P_ ((struct image *, struct face *, struct glyph_slice *)); +extern void x_destroy_all_bitmaps (Display_Info *); +extern int x_create_bitmap_mask (struct frame * , int); +extern Lisp_Object x_find_image_file (Lisp_Object); + +void x_kill_gs_process (Pixmap, struct frame *); +struct image_cache *make_image_cache (void); +void free_image_cache (struct frame *); +void clear_image_caches (Lisp_Object); +void mark_image_cache (struct image_cache *); +int valid_image_p (Lisp_Object); +void prepare_image_for_display (struct frame *, struct image *); +int lookup_image (struct frame *, Lisp_Object); + +unsigned long image_background (struct image *, struct frame *, + XImagePtr_or_DC ximg); +int image_background_transparent (struct image *, struct frame *, + XImagePtr_or_DC mask); + +int image_ascent (struct image *, struct face *, struct glyph_slice *); #endif /* Defined in sysdep.c */ -void get_tty_size P_ ((int, int *, int *)); -void request_sigio P_ ((void)); -void unrequest_sigio P_ ((void)); -int tabs_safe_p P_ ((int)); -void init_baud_rate P_ ((int)); -void init_sigio P_ ((int)); +void get_tty_size (int, int *, int *); +void request_sigio (void); +void unrequest_sigio (void); +int tabs_safe_p (int); +void init_baud_rate (int); +void init_sigio (int); /* Defined in xfaces.c */ #ifdef HAVE_X_WINDOWS -void x_free_colors P_ ((struct frame *, unsigned long *, int)); +void x_free_colors (struct frame *, unsigned long *, int); #endif -void update_face_from_frame_parameter P_ ((struct frame *, Lisp_Object, - Lisp_Object)); -Lisp_Object tty_color_name P_ ((struct frame *, int)); -void clear_face_cache P_ ((int)); -unsigned long load_color P_ ((struct frame *, struct face *, Lisp_Object, - enum lface_attribute_index)); -void unload_color P_ ((struct frame *, unsigned long)); -char *choose_face_font P_ ((struct frame *, Lisp_Object *, Lisp_Object, - int *)); -int ascii_face_of_lisp_face P_ ((struct frame *, int)); -void prepare_face_for_display P_ ((struct frame *, struct face *)); -int xstrcasecmp P_ ((const unsigned char *, const unsigned char *)); -int lookup_face P_ ((struct frame *, Lisp_Object *)); -int lookup_named_face P_ ((struct frame *, Lisp_Object, int)); -int lookup_basic_face P_ ((struct frame *, int)); -int smaller_face P_ ((struct frame *, int, int)); -int face_with_height P_ ((struct frame *, int, int)); -int lookup_derived_face P_ ((struct frame *, Lisp_Object, int, int)); -void init_frame_faces P_ ((struct frame *)); -void free_frame_faces P_ ((struct frame *)); -void recompute_basic_faces P_ ((struct frame *)); -int face_at_buffer_position P_ ((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)); -int face_for_overlay_string P_ ((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)); -int face_at_string_position P_ ((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, int mouse)); -int merge_faces P_ ((struct frame *, Lisp_Object, int, int)); -int compute_char_face P_ ((struct frame *, int, Lisp_Object)); -void free_all_realized_faces P_ ((Lisp_Object)); -void free_realized_face P_ ((struct frame *, struct face *)); +void update_face_from_frame_parameter (struct frame *, Lisp_Object, + Lisp_Object); +Lisp_Object tty_color_name (struct frame *, int); +void clear_face_cache (int); +unsigned long load_color (struct frame *, struct face *, Lisp_Object, + enum lface_attribute_index); +void unload_color (struct frame *, unsigned long); +char *choose_face_font (struct frame *, Lisp_Object *, Lisp_Object, + int *); +int ascii_face_of_lisp_face (struct frame *, int); +void prepare_face_for_display (struct frame *, struct face *); +int xstrcasecmp (const unsigned char *, const unsigned char *); +int lookup_face (struct frame *, Lisp_Object *); +int lookup_named_face (struct frame *, Lisp_Object, int); +int lookup_basic_face (struct frame *, int); +int smaller_face (struct frame *, int, int); +int face_with_height (struct frame *, int, int); +int lookup_derived_face (struct frame *, Lisp_Object, int, int); +void init_frame_faces (struct frame *); +void free_frame_faces (struct frame *); +void recompute_basic_faces (struct frame *); +int 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); +int 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); +int 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, int mouse); +int merge_faces (struct frame *, Lisp_Object, int, int); +int compute_char_face (struct frame *, int, Lisp_Object); +void free_all_realized_faces (Lisp_Object); +void free_realized_face (struct frame *, struct face *); extern Lisp_Object Qforeground_color, Qbackground_color; extern Lisp_Object Qframe_set_background_mode; extern char unspecified_fg[], unspecified_bg[]; @@ -3135,24 +3135,24 @@ /* Defined in xfns.c */ #ifdef HAVE_X_WINDOWS -void gamma_correct P_ ((struct frame *, XColor *)); +void gamma_correct (struct frame *, XColor *); #endif #ifdef WINDOWSNT -void gamma_correct P_ ((struct frame *, COLORREF *)); +void gamma_correct (struct frame *, COLORREF *); #endif #ifdef HAVE_WINDOW_SYSTEM -int x_screen_planes P_ ((struct frame *)); -void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); +int x_screen_planes (struct frame *); +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 P_ ((void)); -extern void cancel_hourglass P_ ((void)); -extern int hourglass_started P_ ((void)); +extern void start_hourglass (void); +extern void cancel_hourglass (void); +extern int hourglass_started (void); extern int display_hourglass_p; extern int hourglass_shown_p; struct atimer; /* Defined in atimer.h. */ @@ -3161,8 +3161,8 @@ extern struct atimer *hourglass_atimer; /* Each GUI implements these. FIXME: move into RIF. */ -extern void show_hourglass P_ ((struct atimer *)); -extern void hide_hourglass P_ ((void)); +extern void show_hourglass (struct atimer *); +extern void hide_hourglass (void); /* Returns the background color of IMG, calculating one heuristically if necessary. If non-zero, XIMG is an existing XImage object to use for @@ -3187,116 +3187,116 @@ /* Defined in xmenu.c */ -int popup_activated P_ ((void)); +int popup_activated (void); /* Defined in dispnew.c */ extern int inverse_video; -extern int required_matrix_width P_ ((struct window *)); -extern int required_matrix_height P_ ((struct window *)); -extern Lisp_Object buffer_posn_from_coords P_ ((struct window *, - int *, int *, - struct display_pos *, - Lisp_Object *, - int *, int *, int *, int *)); -extern Lisp_Object mode_line_string P_ ((struct window *, enum window_part, - int *, int *, int *, - Lisp_Object *, - int *, int *, int *, int *)); -extern Lisp_Object marginal_area_string P_ ((struct window *, enum window_part, - int *, int *, int *, - Lisp_Object *, - int *, int *, int *, int *)); -extern void redraw_frame P_ ((struct frame *)); -extern void redraw_garbaged_frames P_ ((void)); -extern void cancel_line P_ ((int, struct frame *)); -extern void init_desired_glyphs P_ ((struct frame *)); -extern int scroll_frame_lines P_ ((struct frame *, int, int, int, int)); -extern int update_frame P_ ((struct frame *, int, int)); -extern int scrolling P_ ((struct frame *)); -extern void bitch_at_user P_ ((void)); -void adjust_glyphs P_ ((struct frame *)); -void free_glyphs P_ ((struct frame *)); -void free_window_matrices P_ ((struct window *)); -void check_glyph_memory P_ ((void)); -void mirrored_line_dance P_ ((struct glyph_matrix *, int, int, int *, char *)); -void clear_glyph_matrix P_ ((struct glyph_matrix *)); -void clear_current_matrices P_ ((struct frame *f)); -void clear_desired_matrices P_ ((struct frame *)); -void shift_glyph_matrix P_ ((struct window *, struct glyph_matrix *, - int, int, int)); -void rotate_matrix P_ ((struct glyph_matrix *, int, int, int)); -void increment_matrix_positions P_ ((struct glyph_matrix *, - int, int, int, int)); -void blank_row P_ ((struct window *, struct glyph_row *, int)); -void increment_row_positions P_ ((struct glyph_row *, int, int)); -void enable_glyph_matrix_rows P_ ((struct glyph_matrix *, int, int, int)); -void clear_glyph_row P_ ((struct glyph_row *)); -void prepare_desired_row P_ ((struct glyph_row *)); -int line_hash_code P_ ((struct glyph_row *)); -void set_window_update_flags P_ ((struct window *, int)); -void redraw_frame P_ ((struct frame *)); -void redraw_garbaged_frames P_ ((void)); -int scroll_cost P_ ((struct frame *, int, int, int)); -int update_frame P_ ((struct frame *, int, int)); -void update_single_window P_ ((struct window *, int)); -int scrolling P_ ((struct frame *)); -void do_pending_window_change P_ ((int)); -void change_frame_size P_ ((struct frame *, int, int, int, int, int)); -void bitch_at_user P_ ((void)); -void init_display P_ ((void)); -void syms_of_display P_ ((void)); +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 *, + Lisp_Object *, + int *, int *, int *, int *); +extern Lisp_Object mode_line_string (struct window *, enum window_part, + int *, int *, int *, + Lisp_Object *, + int *, int *, int *, int *); +extern Lisp_Object marginal_area_string (struct window *, enum window_part, + int *, int *, int *, + 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 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); +void adjust_glyphs (struct frame *); +void free_glyphs (struct frame *); +void free_window_matrices (struct window *); +void check_glyph_memory (void); +void mirrored_line_dance (struct glyph_matrix *, int, int, int *, char *); +void clear_glyph_matrix (struct glyph_matrix *); +void clear_current_matrices (struct frame *f); +void clear_desired_matrices (struct frame *); +void shift_glyph_matrix (struct window *, struct glyph_matrix *, + int, int, int); +void rotate_matrix (struct glyph_matrix *, int, int, int); +void increment_matrix_positions (struct glyph_matrix *, + int, int, int, int); +void blank_row (struct window *, struct glyph_row *, int); +void increment_row_positions (struct glyph_row *, int, 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 redraw_frame (struct frame *); +void redraw_garbaged_frames (void); +int scroll_cost (struct frame *, int, int, int); +int update_frame (struct frame *, int, int); +void update_single_window (struct window *, int); +int scrolling (struct frame *); +void do_pending_window_change (int); +void change_frame_size (struct frame *, int, int, int, int, int); +void bitch_at_user (void); +void init_display (void); +void syms_of_display (void); extern Lisp_Object Qredisplay_dont_pause; -void spec_glyph_lookup_face P_ ((struct window *, GLYPH *)); +void spec_glyph_lookup_face (struct window *, GLYPH *); /* Defined in terminal.c */ -extern void ring_bell P_ ((struct frame *)); -extern void update_begin P_ ((struct frame *)); -extern void update_end P_ ((struct frame *)); -extern void set_terminal_window P_ ((struct frame *, int)); -extern void cursor_to P_ ((struct frame *, int, int)); -extern void raw_cursor_to P_ ((struct frame *, int, int)); -extern void clear_to_end P_ ((struct frame *)); -extern void clear_frame P_ ((struct frame *)); -extern void clear_end_of_line P_ ((struct frame *, int)); -extern void write_glyphs P_ ((struct frame *, struct glyph *, int)); -extern void insert_glyphs P_ ((struct frame *, struct glyph *, int)); -extern void delete_glyphs P_ ((struct frame *, int)); -extern void ins_del_lines P_ ((struct frame *, int, int)); - -extern struct terminal *init_initial_terminal P_ ((void)); +extern void ring_bell (struct frame *); +extern void update_begin (struct frame *); +extern void update_end (struct frame *); +extern void set_terminal_window (struct frame *, int); +extern void cursor_to (struct frame *, int, int); +extern void raw_cursor_to (struct frame *, int, int); +extern void clear_to_end (struct frame *); +extern void clear_frame (struct frame *); +extern void clear_end_of_line (struct frame *, int); +extern void write_glyphs (struct frame *, struct glyph *, int); +extern void insert_glyphs (struct frame *, struct glyph *, int); +extern void delete_glyphs (struct frame *, int); +extern void ins_del_lines (struct frame *, int, int); + +extern struct terminal *init_initial_terminal (void); /* Defined in term.c */ -extern void tty_set_terminal_modes P_ ((struct terminal *)); -extern void tty_reset_terminal_modes P_ ((struct terminal *)); -extern void tty_turn_off_insert P_ ((struct tty_display_info *)); -extern void tty_turn_off_highlight P_ ((struct tty_display_info *)); -extern int string_cost P_ ((char *)); -extern int per_line_cost P_ ((char *)); -extern void calculate_costs P_ ((struct frame *)); -extern void produce_glyphs P_ ((struct it *)); -extern void produce_special_glyphs P_ ((struct it *, enum display_element_type)); -extern int tty_capable_p P_ ((struct tty_display_info *, unsigned, unsigned long, unsigned long)); +extern void tty_set_terminal_modes (struct terminal *); +extern void tty_reset_terminal_modes (struct terminal *); +extern void tty_turn_off_insert (struct tty_display_info *); +extern void tty_turn_off_highlight (struct tty_display_info *); +extern int string_cost (char *); +extern int per_line_cost (char *); +extern void calculate_costs (struct frame *); +extern void produce_glyphs (struct it *); +extern void produce_special_glyphs (struct it *, enum display_element_type); +extern int tty_capable_p (struct tty_display_info *, unsigned, unsigned long, unsigned long); extern void set_tty_color_mode (struct tty_display_info *, struct frame *); -extern struct terminal *get_tty_terminal P_ ((Lisp_Object, int)); -extern struct terminal *get_named_tty P_ ((char *)); +extern struct terminal *get_tty_terminal (Lisp_Object, int); +extern struct terminal *get_named_tty (char *); EXFUN (Ftty_type, 1); -extern void create_tty_output P_ ((struct frame *)); -extern struct terminal *init_tty P_ ((char *, char *, int)); +extern void create_tty_output (struct frame *); +extern struct terminal *init_tty (char *, char *, int); /* Defined in scroll.c */ -extern int scrolling_max_lines_saved P_ ((int, int, int *, int *, int *)); -extern int scroll_cost P_ ((struct frame *, int, int, int)); -extern void do_line_insertion_deletion_costs P_ ((struct frame *, char *, - char *, char *, char *, - char *, char *, int)); -void scrolling_1 P_ ((struct frame *, int, int, int, int *, int *, int *, - int *, int)); +extern int scrolling_max_lines_saved (int, int, int *, int *, int *); +extern int scroll_cost (struct frame *, int, int, int); +extern void do_line_insertion_deletion_costs (struct frame *, char *, + char *, char *, char *, + char *, char *, int); +void scrolling_1 (struct frame *, int, int, int, int *, int *, int *, + int *, int); /* Defined in frame.c */ @@ -3313,20 +3313,20 @@ RES_TYPE_BOOLEAN_NUMBER }; -extern Lisp_Object x_get_arg P_ ((Display_Info *, Lisp_Object, - Lisp_Object, char *, char *class, - enum resource_types)); -extern Lisp_Object x_frame_get_arg P_ ((struct frame *, Lisp_Object, - Lisp_Object, char *, char *, - enum resource_types)); -extern Lisp_Object x_frame_get_and_record_arg P_ (( - struct frame *, Lisp_Object, - Lisp_Object, char *, char *, - enum resource_types)); -extern Lisp_Object x_default_parameter P_ ((struct frame *, Lisp_Object, - Lisp_Object, Lisp_Object, - char *, char *, - enum resource_types)); +extern Lisp_Object x_get_arg (Display_Info *, Lisp_Object, + Lisp_Object, char *, char *class, + enum resource_types); +extern Lisp_Object x_frame_get_arg (struct frame *, Lisp_Object, + Lisp_Object, char *, char *, + enum resource_types); +extern Lisp_Object x_frame_get_and_record_arg ( + struct frame *, Lisp_Object, + Lisp_Object, char *, char *, + enum resource_types); +extern Lisp_Object x_default_parameter (struct frame *, Lisp_Object, + Lisp_Object, Lisp_Object, + char *, char *, + enum resource_types); #endif /* HAVE_WINDOW_SYSTEM */
--- a/src/disptab.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/disptab.h Fri Jul 02 11:26:33 2010 +0200 @@ -32,7 +32,7 @@ #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4]) #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5]) -extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int)); +extern Lisp_Object disp_char_vector (struct Lisp_Char_Table *, int); #define DISP_CHAR_VECTOR(dp, c) \ (ASCII_CHAR_P(c) \ @@ -44,10 +44,10 @@ : disp_char_vector ((dp), (c))) /* Defined in window.c. */ -extern struct Lisp_Char_Table *window_display_table P_ ((struct window *)); +extern struct Lisp_Char_Table *window_display_table (struct window *); /* Defined in indent.c. */ -extern struct Lisp_Char_Table *buffer_display_table P_ ((void)); +extern struct Lisp_Char_Table *buffer_display_table (void); /* Display table to use for vectors that don't specify their own. */ extern Lisp_Object Vstandard_display_table;
--- a/src/font.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/font.h Fri Jul 02 11:26:33 2010 +0200 @@ -507,7 +507,7 @@ /* Return a cache of font-entities on frame F. The cache must be a cons whose cdr part is the actual cache area. */ - Lisp_Object (*get_cache) P_ ((FRAME_PTR F)); + Lisp_Object (*get_cache) (FRAME_PTR F); /* List fonts exactly matching with FONT_SPEC on FRAME. The value is a list of font-entities. The font properties to be considered @@ -530,7 +530,7 @@ This and the following `match' are the only APIs that allocate font-entities. */ - Lisp_Object (*list) P_ ((Lisp_Object frame, Lisp_Object font_spec)); + Lisp_Object (*list) (Lisp_Object frame, Lisp_Object font_spec); /* Return a font-entity most closely matching with FONT_SPEC on FRAME. Which font property to consider, and how to calculate the @@ -539,92 +539,92 @@ The properties that the font-entity has is the same as `list' method. */ - Lisp_Object (*match) P_ ((Lisp_Object frame, Lisp_Object font_spec)); + Lisp_Object (*match) (Lisp_Object frame, Lisp_Object font_spec); /* Optional. List available families. The value is a list of family names (symbols). */ - Lisp_Object (*list_family) P_ ((Lisp_Object frame)); + Lisp_Object (*list_family) (Lisp_Object frame); /* Optional (if FONT_EXTRA_INDEX is not Lisp_Save_Value). Free FONT_EXTRA_INDEX field of FONT_ENTITY. */ - void (*free_entity) P_ ((Lisp_Object font_entity)); + void (*free_entity) (Lisp_Object font_entity); /* Open a font specified by FONT_ENTITY on frame F. If the font is scalable, open it with PIXEL_SIZE. */ - Lisp_Object (*open) P_ ((FRAME_PTR f, Lisp_Object font_entity, - int pixel_size)); + Lisp_Object (*open) (FRAME_PTR f, Lisp_Object font_entity, + int pixel_size); /* Close FONT on frame F. */ - void (*close) P_ ((FRAME_PTR f, struct font *font)); + void (*close) (FRAME_PTR f, struct font *font); /* Optional (if FACE->extra is not used). Prepare FACE for displaying characters by FONT on frame F by storing some data in FACE->extra. If successful, return 0. Otherwise, return -1. */ - int (*prepare_face) P_ ((FRAME_PTR f, struct face *face)); + int (*prepare_face) (FRAME_PTR f, struct face *face); /* Optional. Done FACE for displaying characters by FACE->font on frame F. */ - void (*done_face) P_ ((FRAME_PTR f, struct face *face)); + void (*done_face) (FRAME_PTR f, struct face *face); /* Optional. If FONT (FONT-ENTITY or FONT-OBJECT) has a glyph for character C (Unicode code point), return 1. If not, return 0. If FONT is FONT-ENTITY and it must be opened to check it, return -1. */ - int (*has_char) P_ ((Lisp_Object font, int c)); + int (*has_char) (Lisp_Object font, int c); /* Return a glyph code of FONT for characer C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */ - unsigned (*encode_char) P_ ((struct font *font, int c)); + unsigned (*encode_char) (struct font *font, int c); /* Computate the total metrics of the NGLYPHS glyphs specified by the font FONT and the sequence of glyph codes CODE, and store the result in METRICS. */ - int (*text_extents) P_ ((struct font *font, - unsigned *code, int nglyphs, - struct font_metrics *metrics)); + int (*text_extents) (struct font *font, + unsigned *code, int nglyphs, + struct font_metrics *metrics); /* Optional. Draw glyphs between FROM and TO of S->char2b at (X Y) pixel position of frame F with S->FACE and S->GC. If WITH_BACKGROUND is nonzero, fill the background in advance. It is assured that WITH_BACKGROUND is zero when (FROM > 0 || TO < S->nchars). */ - int (*draw) P_ ((struct glyph_string *s, int from, int to, - int x, int y, int with_background)); + int (*draw) (struct glyph_string *s, int from, int to, + int x, int y, int with_background); /* Optional. Store bitmap data for glyph-code CODE of FONT in BITMAP. It is intended that this method is callled from the other font-driver for actual drawing. */ - int (*get_bitmap) P_ ((struct font *font, unsigned code, - struct font_bitmap *bitmap, - int bits_per_pixel)); + int (*get_bitmap) (struct font *font, unsigned code, + struct font_bitmap *bitmap, + int bits_per_pixel); /* Optional. Free bitmap data in BITMAP. */ - void (*free_bitmap) P_ ((struct font *font, struct font_bitmap *bitmap)); + void (*free_bitmap) (struct font *font, struct font_bitmap *bitmap); /* Optional. Return an outline data for glyph-code CODE of FONT. The format of the outline data depends on the font-driver. */ - void *(*get_outline) P_ ((struct font *font, unsigned code)); + void *(*get_outline) (struct font *font, unsigned code); /* Optional. Free OUTLINE (that is obtained by the above method). */ - void (*free_outline) P_ ((struct font *font, void *outline)); + void (*free_outline) (struct font *font, void *outline); /* Optional. Get coordinates of the INDEXth anchor point of the glyph whose code is CODE. Store the coordinates in *X and *Y. Return 0 if the operations was successfull. Otherwise return -1. */ - int (*anchor_point) P_ ((struct font *font, unsigned code, int index, - int *x, int *y)); + int (*anchor_point) (struct font *font, unsigned code, int index, + int *x, int *y); /* Optional. Return a list describing which scripts/languages FONT supports by which GSUB/GPOS features of OpenType tables. */ - Lisp_Object (*otf_capability) P_ ((struct font *font)); + Lisp_Object (*otf_capability) (struct font *font); /* Optional. Apply FONT's OTF-FEATURES to the glyph string. @@ -641,20 +641,20 @@ Return the number of output codes. If none of the features are applicable to the input data, return 0. If GSTRING-OUT is too short, return -1. */ - int (*otf_drive) P_ ((struct font *font, Lisp_Object features, - Lisp_Object gstring_in, int from, int to, - Lisp_Object gstring_out, int idx, int alternate_subst)); + int (*otf_drive) (struct font *font, Lisp_Object features, + Lisp_Object gstring_in, int from, int to, + Lisp_Object gstring_out, int idx, int alternate_subst); /* Optional. Make the font driver ready for frame F. Usually this function makes some data specific to F and stores it in F by calling font_put_frame_data (). */ - int (*start_for_frame) P_ ((FRAME_PTR f)); + int (*start_for_frame) (FRAME_PTR f); /* Optional. End using the driver for frame F. Usually this function free some data stored for F. */ - int (*end_for_frame) P_ ((FRAME_PTR f)); + int (*end_for_frame) (FRAME_PTR f); /* Optional. @@ -670,14 +670,14 @@ a new glyph object and storing it in GSTRING. If (M) is greater than the length of GSTRING, nil should be return. In that case, this function is called again with the larger GSTRING. */ - Lisp_Object (*shape) P_ ((Lisp_Object lgstring)); + Lisp_Object (*shape) (Lisp_Object lgstring); /* Optional. If FONT is usable on frame F, return 0. Otherwise return -1. This method is used only for debugging. If this method is NULL, Emacs assumes that the font is usable on any frame. */ - int (*check) P_ ((FRAME_PTR F, struct font *font)); + int (*check) (FRAME_PTR F, struct font *font); /* Optional. @@ -685,18 +685,18 @@ FONT. VARIATIONS is an array of 256 elements. If the variation selector N (1..256) defines a glyph, that glyph code is stored in the (N-1)th element of VARIATIONS. */ - int (*get_variation_glyphs) P_ ((struct font *font, - int c, unsigned variations[256])); + int (*get_variation_glyphs) (struct font *font, + int c, unsigned variations[256]); - void (*filter_properties) P_ ((Lisp_Object font, Lisp_Object properties)); + void (*filter_properties) (Lisp_Object font, Lisp_Object properties); /* Optional. Return non-zero if FONT_OBJECT can be used as a (cached) font for ENTITY on frame F. */ - int (*cached_font_ok) P_ ((struct frame *f, - Lisp_Object font_object, - Lisp_Object entity)); + int (*cached_font_ok) (struct frame *f, + Lisp_Object font_object, + Lisp_Object entity); }; @@ -739,80 +739,80 @@ EXFUN (Fclear_font_cache, 0); EXFUN (Ffont_xlfd_name, 2); -extern Lisp_Object font_make_spec P_ ((void)); -extern Lisp_Object font_make_entity P_ ((void)); -extern Lisp_Object font_make_object P_ ((int, Lisp_Object, int)); +extern Lisp_Object font_make_spec (void); +extern Lisp_Object font_make_entity (void); +extern Lisp_Object font_make_object (int, Lisp_Object, int); -extern Lisp_Object find_font_encoding P_ ((Lisp_Object)); -extern int font_registry_charsets P_ ((Lisp_Object, struct charset **, - struct charset **)); -extern int font_style_to_value P_ ((enum font_property_index prop, - Lisp_Object name, int noerror)); -extern Lisp_Object font_style_symbolic P_ ((Lisp_Object font, - enum font_property_index prop, - int for_face)); +extern Lisp_Object find_font_encoding (Lisp_Object); +extern int font_registry_charsets (Lisp_Object, struct charset **, + struct charset **); +extern int font_style_to_value (enum font_property_index prop, + Lisp_Object name, int noerror); +extern Lisp_Object font_style_symbolic (Lisp_Object font, + enum font_property_index prop, + int for_face); -extern int font_match_p P_ ((Lisp_Object spec, Lisp_Object font)); -extern Lisp_Object font_list_entities P_ ((Lisp_Object frame, - Lisp_Object spec)); +extern int font_match_p (Lisp_Object spec, Lisp_Object font); +extern Lisp_Object font_list_entities (Lisp_Object frame, + Lisp_Object spec); -extern Lisp_Object font_get_name P_ ((Lisp_Object font_object)); -extern Lisp_Object font_spec_from_name P_ ((Lisp_Object font_name)); -extern Lisp_Object font_get_frame P_ ((Lisp_Object font_object)); -extern int font_has_char P_ ((FRAME_PTR, Lisp_Object, int)); -extern unsigned font_encode_char P_ ((Lisp_Object, int)); +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 P_ ((Lisp_Object *attrs, - enum font_property_index prop)); -extern void font_update_lface P_ ((FRAME_PTR f, Lisp_Object *attrs)); -extern Lisp_Object font_find_for_lface P_ ((FRAME_PTR f, Lisp_Object *lface, - Lisp_Object spec, int c)); -extern Lisp_Object font_open_for_lface P_ ((FRAME_PTR f, Lisp_Object entity, - Lisp_Object *lface, - Lisp_Object spec)); -extern Lisp_Object font_load_for_lface P_ ((FRAME_PTR f, Lisp_Object *lface, - Lisp_Object spec)); -extern void font_prepare_for_face P_ ((FRAME_PTR f, struct face *face)); -extern void font_done_for_face P_ ((FRAME_PTR f, struct face *face)); +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, + Lisp_Object *lface, + Lisp_Object spec); +extern Lisp_Object font_load_for_lface (FRAME_PTR f, Lisp_Object *lface, + Lisp_Object spec); +extern void font_prepare_for_face (FRAME_PTR f, struct face *face); +extern void font_done_for_face (FRAME_PTR f, struct face *face); -extern Lisp_Object font_open_by_spec P_ ((FRAME_PTR f, Lisp_Object spec)); -extern Lisp_Object font_open_by_name P_ ((FRAME_PTR f, char *name)); +extern Lisp_Object font_open_by_spec (FRAME_PTR f, Lisp_Object spec); +extern Lisp_Object font_open_by_name (FRAME_PTR f, char *name); extern void font_close_object (FRAME_PTR f, Lisp_Object font_object); -extern Lisp_Object font_intern_prop P_ ((char *str, int len, int force_symbol)); -extern void font_update_sort_order P_ ((int *order)); +extern Lisp_Object font_intern_prop (char *str, int len, int force_symbol); +extern void font_update_sort_order (int *order); -extern void font_parse_family_registry P_ ((Lisp_Object family, - Lisp_Object registry, - Lisp_Object spec)); -extern Lisp_Object font_spec_from_family_registry P_ ((Lisp_Object family, - Lisp_Object registry)); +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 P_ ((char *name, Lisp_Object font)); -extern int font_unparse_xlfd P_ ((Lisp_Object font, int pixel_size, - char *name, int bytes)); -extern int font_parse_fcname P_ ((char *name, Lisp_Object font)); -extern int font_unparse_fcname P_ ((Lisp_Object font, int pixel_size, - char *name, int bytes)); -extern int font_unparse_gtkname P_ ((Lisp_Object, struct frame *, char *, int)); -extern void register_font_driver P_ ((struct font_driver *driver, FRAME_PTR f)); -extern void free_font_driver_list P_ ((FRAME_PTR f)); -extern Lisp_Object font_update_drivers P_ ((FRAME_PTR f, Lisp_Object list)); -extern Lisp_Object font_at P_ ((int c, EMACS_INT pos, struct face *face, - struct window *w, Lisp_Object object)); +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); -extern void font_fill_lglyph_metrics P_ ((Lisp_Object, Lisp_Object)); +extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object); -extern Lisp_Object font_put_extra P_ ((Lisp_Object font, Lisp_Object prop, - Lisp_Object val)); +extern Lisp_Object font_put_extra (Lisp_Object font, Lisp_Object prop, + Lisp_Object val); -extern int font_put_frame_data P_ ((FRAME_PTR f, - struct font_driver *driver, - void *data)); -extern void *font_get_frame_data P_ ((FRAME_PTR f, - struct font_driver *driver)); +extern int font_put_frame_data (FRAME_PTR f, + struct font_driver *driver, + void *data); +extern void *font_get_frame_data (FRAME_PTR f, + struct font_driver *driver); #ifdef HAVE_FREETYPE extern struct font_driver ftfont_driver; @@ -837,8 +837,8 @@ #endif extern Lisp_Object Vfont_log; -extern void font_add_log P_ ((char *, Lisp_Object, Lisp_Object)); -extern void font_deferred_log P_ ((char *, Lisp_Object, Lisp_Object)); +extern void font_add_log (char *, Lisp_Object, Lisp_Object); +extern void font_deferred_log (char *, Lisp_Object, Lisp_Object); #define FONT_ADD_LOG(ACTION, ARG, RESULT) \ do { \
--- a/src/fontset.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/fontset.h Fri Jul 02 11:26:33 2010 +0200 @@ -28,22 +28,22 @@ #define EMACS_FONTSET_H /* Check if any window system is used now. */ -extern void (*check_window_system_func) P_ ((void)); +extern void (*check_window_system_func) (void); struct face; -extern void free_face_fontset P_ ((FRAME_PTR, struct face *)); -extern Lisp_Object fontset_font_pattern P_ ((FRAME_PTR, struct face *, int)); -extern int face_suitable_for_char_p P_ ((struct face *, int)); -extern int face_for_char P_ ((FRAME_PTR, struct face *, int, - int, Lisp_Object)); -extern Lisp_Object font_for_char P_ ((struct face *, int, int, Lisp_Object)); +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); +extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object); -extern int make_fontset_for_ascii_face P_ ((FRAME_PTR, int, struct face *)); -extern int fontset_from_font P_ ((Lisp_Object)); -extern int fs_query_fontset P_ ((Lisp_Object, int)); +extern int make_fontset_for_ascii_face (FRAME_PTR, int, struct face *); +extern int fontset_from_font (Lisp_Object); +extern int fs_query_fontset (Lisp_Object, int); EXFUN (Fquery_fontset, 2); -extern Lisp_Object list_fontsets P_ ((struct frame *, Lisp_Object, int)); +extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int); extern Lisp_Object Vuse_default_ascent; extern Lisp_Object Vignore_relative_composition; @@ -52,12 +52,12 @@ extern Lisp_Object Vvertical_centering_font_regexp; extern Lisp_Object Votf_script_alist; -extern Lisp_Object fontset_name P_ ((int)); -extern Lisp_Object fontset_ascii P_ ((int)); -extern int fontset_height P_ ((int)); +extern Lisp_Object fontset_name (int); +extern Lisp_Object fontset_ascii (int); +extern int fontset_height (int); struct font; -extern int face_for_font P_ ((struct frame *, Lisp_Object, struct face *)); +extern int face_for_font (struct frame *, Lisp_Object, struct face *); #endif /* EMACS_FONTSET_H */
--- a/src/frame.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/frame.h Fri Jul 02 11:26:33 2010 +0200 @@ -828,19 +828,19 @@ extern struct frame *last_nonminibuf_frame; -extern struct frame *make_initial_frame P_ ((void)); -extern struct frame *make_terminal_frame P_ ((struct terminal *)); -extern struct frame *make_frame P_ ((int)); +extern struct frame *make_initial_frame (void); +extern struct frame *make_terminal_frame (struct terminal *); +extern struct frame *make_frame (int); #ifdef HAVE_WINDOW_SYSTEM -extern struct frame *make_minibuffer_frame P_ ((void)); -extern struct frame *make_frame_without_minibuffer P_ ((Lisp_Object, - struct kboard *, - Lisp_Object)); +extern struct frame *make_minibuffer_frame (void); +extern struct frame *make_frame_without_minibuffer (Lisp_Object, + struct kboard *, + Lisp_Object); #endif /* HAVE_WINDOW_SYSTEM */ -extern int other_visible_frames P_ ((struct frame *)); -extern void frame_make_pointer_invisible P_ ((void)); -extern void frame_make_pointer_visible P_ ((void)); -extern Lisp_Object delete_frame P_ ((Lisp_Object, Lisp_Object)); +extern int other_visible_frames (struct frame *); +extern void frame_make_pointer_invisible (void); +extern void frame_make_pointer_visible (void); +extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object); extern Lisp_Object Vframe_list; extern Lisp_Object Vdefault_frame_alist; @@ -1081,11 +1081,11 @@ /* These are in xterm.c, w32term.c, etc. */ -extern void x_set_scroll_bar_default_width P_ ((struct frame *)); -extern void x_set_offset P_ ((struct frame *, int, int, int)); -extern void x_wm_set_icon_position P_ ((struct frame *, int, int)); +extern void x_set_scroll_bar_default_width (struct frame *); +extern void x_set_offset (struct frame *, int, int, int); +extern void x_wm_set_icon_position (struct frame *, int, int); -extern Lisp_Object x_new_font P_ ((struct frame *, Lisp_Object, int)); +extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int); /* These are in frame.c */ @@ -1095,38 +1095,38 @@ extern Lisp_Object Qface_set_after_frame_default; -extern void x_fullscreen_adjust P_ ((struct frame *f, int *, int *, - int *, int *)); +extern void x_fullscreen_adjust (struct frame *f, int *, int *, + int *, int *); -extern void x_set_frame_parameters P_ ((struct frame *, Lisp_Object)); -extern void x_report_frame_params P_ ((struct frame *, Lisp_Object *)); +extern void x_set_frame_parameters (struct frame *, Lisp_Object); +extern void x_report_frame_params (struct frame *, Lisp_Object *); -extern void x_set_fullscreen P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_line_spacing P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_screen_gamma P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_font_backend P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_fringe_width P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_internal_border_width P_ ((struct frame *, Lisp_Object, - Lisp_Object)); -extern void x_set_visibility P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_autoraise P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_autolower P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_unsplittable P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_vertical_scroll_bars P_ ((struct frame *, Lisp_Object, - Lisp_Object)); -extern void x_set_scroll_bar_width P_ ((struct frame *, Lisp_Object, - Lisp_Object)); +extern void x_set_fullscreen (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_line_spacing (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_screen_gamma (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_font (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_font_backend (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_fringe_width (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_border_width (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_internal_border_width (struct frame *, Lisp_Object, + Lisp_Object); +extern void x_set_visibility (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_autoraise (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_autolower (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_unsplittable (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_vertical_scroll_bars (struct frame *, Lisp_Object, + Lisp_Object); +extern void x_set_scroll_bar_width (struct frame *, Lisp_Object, + Lisp_Object); -extern Lisp_Object x_icon_type P_ ((struct frame *)); +extern Lisp_Object x_icon_type (struct frame *); -extern int x_figure_window_size P_ ((struct frame *, Lisp_Object, int)); +extern int x_figure_window_size (struct frame *, Lisp_Object, int); extern Lisp_Object Vframe_alpha_lower_limit; -extern void x_set_alpha P_ ((struct frame *, Lisp_Object, Lisp_Object)); +extern void x_set_alpha (struct frame *, Lisp_Object, Lisp_Object); -extern void validate_x_resource_name P_ ((void)); +extern void validate_x_resource_name (void); extern Lisp_Object display_x_get_resource (Display_Info *, Lisp_Object attribute,
--- a/src/gtkutil.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/gtkutil.h Fri Jul 02 11:26:33 2010 +0200 @@ -122,89 +122,89 @@ extern int use_old_gtk_file_dialog; #endif -extern widget_value *malloc_widget_value P_ ((void)); -extern void free_widget_value P_ ((widget_value *)); +extern widget_value *malloc_widget_value (void); +extern void free_widget_value (widget_value *); -extern int xg_uses_old_file_dialog P_ ((void)); +extern int xg_uses_old_file_dialog (void); -extern char *xg_get_file_name P_ ((FRAME_PTR f, - char *prompt, - char *default_filename, - int mustmatch_p, - int only_dir_p)); +extern char *xg_get_file_name (FRAME_PTR f, + char *prompt, + char *default_filename, + int mustmatch_p, + int only_dir_p); -extern char *xg_get_font_name P_ ((FRAME_PTR f, char *)); +extern char *xg_get_font_name (FRAME_PTR f, char *); -extern GtkWidget *xg_create_widget P_ ((char *type, - char *name, - FRAME_PTR f, - widget_value *val, - GCallback select_cb, - GCallback deactivate_cb, - GCallback hightlight_cb)); +extern GtkWidget *xg_create_widget (char *type, + char *name, + FRAME_PTR f, + widget_value *val, + GCallback select_cb, + GCallback deactivate_cb, + GCallback hightlight_cb); -extern void xg_modify_menubar_widgets P_ ((GtkWidget *menubar, - FRAME_PTR f, - widget_value *val, - int deep_p, - GCallback select_cb, - GCallback deactivate_cb, - GCallback hightlight_cb)); +extern void xg_modify_menubar_widgets (GtkWidget *menubar, + FRAME_PTR f, + widget_value *val, + int deep_p, + GCallback select_cb, + GCallback deactivate_cb, + GCallback hightlight_cb); -extern int xg_update_frame_menubar P_ ((FRAME_PTR f)); +extern int xg_update_frame_menubar (FRAME_PTR f); -extern int xg_have_tear_offs P_ ((void)); +extern int xg_have_tear_offs (void); -extern int xg_get_scroll_id_for_window P_ ((Display *dpy, Window wid)); +extern int xg_get_scroll_id_for_window (Display *dpy, Window wid); -extern void xg_create_scroll_bar P_ ((FRAME_PTR f, - struct scroll_bar *bar, - GCallback scroll_callback, - GCallback end_callback, - char *scroll_bar_name)); -extern void xg_remove_scroll_bar P_ ((FRAME_PTR f, int scrollbar_id)); +extern void xg_create_scroll_bar (FRAME_PTR f, + struct scroll_bar *bar, + GCallback scroll_callback, + GCallback end_callback, + char *scroll_bar_name); +extern void xg_remove_scroll_bar (FRAME_PTR f, int scrollbar_id); -extern void xg_update_scrollbar_pos P_ ((FRAME_PTR f, - int scrollbar_id, - int top, - int left, - int width, - int height)); +extern void xg_update_scrollbar_pos (FRAME_PTR f, + int scrollbar_id, + int top, + int left, + int width, + int height); -extern void xg_set_toolkit_scroll_bar_thumb P_ ((struct scroll_bar *bar, - int portion, - int position, - int whole)); -extern int xg_event_is_for_scrollbar P_ ((FRAME_PTR f, XEvent *event)); +extern void xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, + int portion, + int position, + int whole); +extern int xg_event_is_for_scrollbar (FRAME_PTR f, XEvent *event); -extern void update_frame_tool_bar P_ ((FRAME_PTR f)); -extern void free_frame_tool_bar P_ ((FRAME_PTR f)); +extern void update_frame_tool_bar (FRAME_PTR f); +extern void free_frame_tool_bar (FRAME_PTR f); -extern void xg_frame_resized P_ ((FRAME_PTR f, - int pixelwidth, - int pixelheight)); -extern void xg_frame_set_char_size P_ ((FRAME_PTR f, int cols, int rows)); -extern GtkWidget * xg_win_to_widget P_ ((Display *dpy, Window wdesc)); +extern void xg_frame_resized (FRAME_PTR f, + int pixelwidth, + int pixelheight); +extern void xg_frame_set_char_size (FRAME_PTR f, int cols, int rows); +extern GtkWidget * xg_win_to_widget (Display *dpy, Window wdesc); -extern void xg_display_open P_ ((char *display_name, Display **dpy)); -extern void xg_display_close P_ ((Display *dpy)); -extern GdkCursor * xg_create_default_cursor P_ ((Display *dpy)); +extern void xg_display_open (char *display_name, Display **dpy); +extern void xg_display_close (Display *dpy); +extern GdkCursor * xg_create_default_cursor (Display *dpy); -extern int xg_create_frame_widgets P_ ((FRAME_PTR f)); -extern void x_wm_set_size_hint P_ ((FRAME_PTR f, - long flags, - int user_position)); -extern void xg_set_background_color P_ ((FRAME_PTR f, unsigned long bg)); +extern int xg_create_frame_widgets (FRAME_PTR f); +extern void x_wm_set_size_hint (FRAME_PTR f, + long flags, + int user_position); +extern void xg_set_background_color (FRAME_PTR f, unsigned long bg); -extern void xg_set_frame_icon P_ ((FRAME_PTR f, - Pixmap icon_pixmap, - Pixmap icon_mask)); +extern void xg_set_frame_icon (FRAME_PTR f, + Pixmap icon_pixmap, + Pixmap icon_mask); /* Mark all callback data that are Lisp_object:s during GC. */ -extern void xg_mark_data P_ ((void)); +extern void xg_mark_data (void); /* Initialize GTK specific parts. */ -extern void xg_initialize P_ ((void)); +extern void xg_initialize (void); /* Setting scrollbar values invokes the callback. Use this variable to indicate that the callback should do nothing. */
--- a/src/indent.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/indent.h Fri Jul 02 11:26:33 2010 +0200 @@ -49,16 +49,16 @@ EMACS_INT tab_offset; }; -struct position *compute_motion P_ ((EMACS_INT from, EMACS_INT fromvpos, - EMACS_INT fromhpos, int did_motion, - EMACS_INT to, EMACS_INT tovpos, - EMACS_INT tohpos, - EMACS_INT width, EMACS_INT hscroll, - EMACS_INT tab_offset, struct window *)); -struct position *vmotion P_ ((EMACS_INT from, EMACS_INT vtarget, - struct window *)); -EMACS_INT skip_invisible P_ ((EMACS_INT pos, EMACS_INT *next_boundary_p, - EMACS_INT to, Lisp_Object window)); +struct position *compute_motion (EMACS_INT from, EMACS_INT fromvpos, + EMACS_INT fromhpos, int did_motion, + EMACS_INT to, EMACS_INT tovpos, + EMACS_INT tohpos, + EMACS_INT width, EMACS_INT hscroll, + EMACS_INT tab_offset, struct window *); +struct position *vmotion (EMACS_INT from, EMACS_INT vtarget, + struct window *); +EMACS_INT skip_invisible (EMACS_INT pos, EMACS_INT *next_boundary_p, + EMACS_INT to, Lisp_Object window); /* Value of point when current_column was called */ extern EMACS_INT last_known_column_point; @@ -68,12 +68,12 @@ /* Return true if the display table DISPTAB specifies the same widths for characters as WIDTHTAB. We use this to decide when to invalidate the buffer's column_cache. */ -int disptab_matches_widthtab P_ ((struct Lisp_Char_Table *disptab, - struct Lisp_Vector *widthtab)); +int disptab_matches_widthtab (struct Lisp_Char_Table *disptab, + struct Lisp_Vector *widthtab); /* Recompute BUF's width table, using the display table DISPTAB. */ -void recompute_width_table P_ ((struct buffer *buf, - struct Lisp_Char_Table *disptab)); +void recompute_width_table (struct buffer *buf, + struct Lisp_Char_Table *disptab); /* arch-tag: f9feb373-5bff-4f4f-9198-94805d00cfd7
--- a/src/intervals.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/intervals.h Fri Jul 02 11:26:33 2010 +0200 @@ -243,49 +243,49 @@ /* Declared in alloc.c */ -extern INTERVAL make_interval P_ ((void)); +extern INTERVAL make_interval (void); /* Declared in intervals.c */ -extern INTERVAL create_root_interval P_ ((Lisp_Object)); -extern void copy_properties P_ ((INTERVAL, INTERVAL)); -extern int intervals_equal P_ ((INTERVAL, INTERVAL)); -extern void traverse_intervals P_ ((INTERVAL, int, - void (*) (INTERVAL, Lisp_Object), - Lisp_Object)); -extern void traverse_intervals_noorder P_ ((INTERVAL, - void (*) (INTERVAL, Lisp_Object), - Lisp_Object)); -extern INTERVAL split_interval_right P_ ((INTERVAL, int)); -extern INTERVAL split_interval_left P_ ((INTERVAL, int)); -extern INTERVAL find_interval P_ ((INTERVAL, int)); -extern INTERVAL next_interval P_ ((INTERVAL)); -extern INTERVAL previous_interval P_ ((INTERVAL)); -extern INTERVAL merge_interval_left P_ ((INTERVAL)); -extern INTERVAL merge_interval_right P_ ((INTERVAL)); -extern void delete_interval P_ ((INTERVAL)); -extern INLINE void offset_intervals P_ ((struct buffer *, int, int)); -extern void graft_intervals_into_buffer P_ ((INTERVAL, int, int, - struct buffer *, int)); -extern void verify_interval_modification P_ ((struct buffer *, int, int)); -extern INTERVAL balance_intervals P_ ((INTERVAL)); -extern INLINE void copy_intervals_to_string P_ ((Lisp_Object, struct buffer *, - int, int)); -extern INTERVAL copy_intervals P_ ((INTERVAL, int, int)); -extern int compare_string_intervals P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object textget P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object lookup_char_property P_ ((Lisp_Object, Lisp_Object, int)); -extern void move_if_not_intangible P_ ((int)); -extern int get_property_and_range P_ ((int, Lisp_Object, Lisp_Object *, - EMACS_INT *, EMACS_INT *, Lisp_Object)); -extern Lisp_Object get_local_map P_ ((int, struct buffer *, Lisp_Object)); -extern INTERVAL update_interval P_ ((INTERVAL, int)); -extern void set_intervals_multibyte P_ ((int)); -extern INTERVAL validate_interval_range P_ ((Lisp_Object, Lisp_Object *, - Lisp_Object *, int)); +extern INTERVAL create_root_interval (Lisp_Object); +extern void copy_properties (INTERVAL, INTERVAL); +extern int intervals_equal (INTERVAL, INTERVAL); +extern void traverse_intervals (INTERVAL, int, + void (*) (INTERVAL, Lisp_Object), + Lisp_Object); +extern void traverse_intervals_noorder (INTERVAL, + void (*) (INTERVAL, Lisp_Object), + Lisp_Object); +extern INTERVAL split_interval_right (INTERVAL, int); +extern INTERVAL split_interval_left (INTERVAL, int); +extern INTERVAL find_interval (INTERVAL, int); +extern INTERVAL next_interval (INTERVAL); +extern INTERVAL previous_interval (INTERVAL); +extern INTERVAL merge_interval_left (INTERVAL); +extern INTERVAL merge_interval_right (INTERVAL); +extern void delete_interval (INTERVAL); +extern INLINE void offset_intervals (struct buffer *, int, int); +extern void graft_intervals_into_buffer (INTERVAL, int, int, + struct buffer *, int); +extern void verify_interval_modification (struct buffer *, int, int); +extern INTERVAL balance_intervals (INTERVAL); +extern INLINE void copy_intervals_to_string (Lisp_Object, struct buffer *, + int, int); +extern INTERVAL copy_intervals (INTERVAL, int, int); +extern int compare_string_intervals (Lisp_Object, Lisp_Object); +extern Lisp_Object textget (Lisp_Object, Lisp_Object); +extern Lisp_Object lookup_char_property (Lisp_Object, Lisp_Object, int); +extern void move_if_not_intangible (int); +extern int get_property_and_range (int, Lisp_Object, Lisp_Object *, + EMACS_INT *, EMACS_INT *, Lisp_Object); +extern Lisp_Object get_local_map (int, struct buffer *, Lisp_Object); +extern INTERVAL update_interval (INTERVAL, int); +extern void set_intervals_multibyte (int); +extern INTERVAL validate_interval_range (Lisp_Object, Lisp_Object *, + Lisp_Object *, int); /* Defined in xdisp.c */ -extern int invisible_p P_ ((Lisp_Object, Lisp_Object)); +extern int invisible_p (Lisp_Object, Lisp_Object); /* Declared in textprop.c */ @@ -323,27 +323,27 @@ EXFUN (Ftext_property_any, 5); EXFUN (Ftext_property_not_all, 5); EXFUN (Fprevious_single_char_property_change, 4); -extern Lisp_Object copy_text_properties P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object)); -extern Lisp_Object set_text_properties P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, - Lisp_Object)); -extern void set_text_properties_1 P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, INTERVAL)); +extern Lisp_Object copy_text_properties (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object); +extern Lisp_Object set_text_properties (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, + Lisp_Object); +extern void set_text_properties_1 (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, INTERVAL); -Lisp_Object text_property_list P_ ((Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object)); -int add_text_properties_from_list P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); -Lisp_Object extend_property_ranges P_ ((Lisp_Object, Lisp_Object)); -Lisp_Object get_char_property_and_overlay P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object*)); -extern int text_property_stickiness P_ ((Lisp_Object prop, Lisp_Object pos, - Lisp_Object buffer)); -extern Lisp_Object get_pos_property P_ ((Lisp_Object pos, Lisp_Object prop, - Lisp_Object object)); +Lisp_Object text_property_list (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object); +int add_text_properties_from_list (Lisp_Object, Lisp_Object, Lisp_Object); +Lisp_Object extend_property_ranges (Lisp_Object, Lisp_Object); +Lisp_Object get_char_property_and_overlay (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object*); +extern int text_property_stickiness (Lisp_Object prop, Lisp_Object pos, + Lisp_Object buffer); +extern Lisp_Object get_pos_property (Lisp_Object pos, Lisp_Object prop, + Lisp_Object object); -extern void syms_of_textprop P_ ((void)); +extern void syms_of_textprop (void); #include "composite.h"
--- a/src/keyboard.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/keyboard.h Fri Jul 02 11:26:33 2010 +0200 @@ -300,7 +300,7 @@ MENU_ITEMS_ITEM_LENGTH }; -extern Lisp_Object unuse_menu_items P_ ((Lisp_Object dummy)); +extern Lisp_Object unuse_menu_items (Lisp_Object dummy); /* This is how to deal with multibyte text if HAVE_MULTILINGUAL_MENU isn't defined. The use of HAVE_MULTILINGUAL_MENU could probably be @@ -366,8 +366,8 @@ struct _widget_value* next; } widget_value; -extern widget_value *xmalloc_widget_value P_ ((void)); -extern widget_value *digest_single_submenu P_ ((int, int, int)); +extern widget_value *xmalloc_widget_value (void); +extern widget_value *digest_single_submenu (int, int, int); #endif /* HAVE_NS || HAVE_NTGUI */ @@ -430,10 +430,10 @@ /* Forward declaration for prototypes. */ struct input_event; -extern Lisp_Object parse_modifiers P_ ((Lisp_Object)); -extern Lisp_Object reorder_modifiers P_ ((Lisp_Object)); -extern Lisp_Object read_char P_ ((int, int, Lisp_Object *, Lisp_Object, - int *, EMACS_TIME *)); +extern Lisp_Object parse_modifiers (Lisp_Object); +extern Lisp_Object reorder_modifiers (Lisp_Object); +extern Lisp_Object read_char (int, int, Lisp_Object *, Lisp_Object, + int *, EMACS_TIME *); extern int parse_solitary_modifier (Lisp_Object symbol); @@ -445,50 +445,50 @@ extern int parse_menu_item (Lisp_Object, int); -extern void echo_now P_ ((void)); -extern void init_kboard P_ ((KBOARD *)); -extern void delete_kboard P_ ((KBOARD *)); -extern void not_single_kboard_state P_ ((KBOARD *)); -extern void push_kboard P_ ((struct kboard *)); -extern void push_frame_kboard P_ ((struct frame *)); -extern void pop_kboard P_ ((void)); -extern void temporarily_switch_to_single_kboard P_ ((struct frame *)); -extern void record_asynch_buffer_change P_ ((void)); -extern SIGTYPE input_poll_signal P_ ((int)); -extern void start_polling P_ ((void)); -extern void stop_polling P_ ((void)); -extern void set_poll_suppress_count P_ ((int)); -extern void gobble_input P_ ((int)); -extern int input_polling_used P_ ((void)); -extern void clear_input_pending P_ ((void)); -extern int requeued_events_pending_p P_ ((void)); -extern void bind_polling_period P_ ((int)); -extern void stuff_buffered_input P_ ((Lisp_Object)); -extern void clear_waiting_for_input P_ ((void)); -extern void swallow_events P_ ((int)); -extern int help_char_p P_ ((Lisp_Object)); -extern void quit_throw_to_read_char P_ ((void)) NO_RETURN; -extern void cmd_error_internal P_ ((Lisp_Object, char *)); -extern int lucid_event_type_list_p P_ ((Lisp_Object)); -extern void kbd_buffer_store_event P_ ((struct input_event *)); -extern void kbd_buffer_store_event_hold P_ ((struct input_event *, - struct input_event *)); -extern void kbd_buffer_unget_event P_ ((struct input_event *)); +extern void echo_now (void); +extern void init_kboard (KBOARD *); +extern void delete_kboard (KBOARD *); +extern void not_single_kboard_state (KBOARD *); +extern void push_kboard (struct kboard *); +extern void push_frame_kboard (struct frame *); +extern void pop_kboard (void); +extern void temporarily_switch_to_single_kboard (struct frame *); +extern void record_asynch_buffer_change (void); +extern SIGTYPE input_poll_signal (int); +extern void start_polling (void); +extern void stop_polling (void); +extern void set_poll_suppress_count (int); +extern void gobble_input (int); +extern int input_polling_used (void); +extern void clear_input_pending (void); +extern int requeued_events_pending_p (void); +extern void bind_polling_period (int); +extern void stuff_buffered_input (Lisp_Object); +extern void clear_waiting_for_input (void); +extern void swallow_events (int); +extern int help_char_p (Lisp_Object); +extern void quit_throw_to_read_char (void) NO_RETURN; +extern void cmd_error_internal (Lisp_Object, char *); +extern int lucid_event_type_list_p (Lisp_Object); +extern void kbd_buffer_store_event (struct input_event *); +extern void kbd_buffer_store_event_hold (struct input_event *, + struct input_event *); +extern void kbd_buffer_unget_event (struct input_event *); #ifdef POLL_FOR_INPUT -extern void poll_for_input_1 P_ ((void)); +extern void poll_for_input_1 (void); #endif -extern void show_help_echo P_ ((Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object, int)); -extern void gen_help_event P_ ((Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object, int)); -extern void kbd_buffer_store_help_event P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object menu_item_eval_property P_ ((Lisp_Object)); -extern int kbd_buffer_events_waiting P_ ((int)); -extern void add_user_signal P_ ((int, const char *)); +extern void show_help_echo (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, int); +extern void gen_help_event (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, int); +extern void kbd_buffer_store_help_event (Lisp_Object, Lisp_Object); +extern Lisp_Object menu_item_eval_property (Lisp_Object); +extern int kbd_buffer_events_waiting (int); +extern void add_user_signal (int, const char *); -extern int tty_read_avail_input P_ ((struct terminal *, int, - struct input_event *)); -extern EMACS_TIME timer_check P_ ((int)); +extern int tty_read_avail_input (struct terminal *, int, + struct input_event *); +extern EMACS_TIME timer_check (int); /* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3 (do not change this comment) */
--- a/src/keymap.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/keymap.h Fri Jul 02 11:26:33 2010 +0200 @@ -33,21 +33,21 @@ EXFUN (Fsingle_key_description, 2); EXFUN (Fwhere_is_internal, 5); EXFUN (Fcurrent_active_maps, 2); -extern Lisp_Object access_keymap P_ ((Lisp_Object, Lisp_Object, int, int, int)); -extern Lisp_Object get_keyelt P_ ((Lisp_Object, int)); -extern Lisp_Object get_keymap P_ ((Lisp_Object, int, int)); +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 P_ ((Lisp_Object, int, Lisp_Object, Lisp_Object, - char *, int, int, int, int)); -extern int current_minor_maps P_ ((Lisp_Object **, Lisp_Object **)); -extern void initial_define_key P_ ((Lisp_Object, int, char *)); -extern void initial_define_lispy_key P_ ((Lisp_Object, char *, char *)); -extern void syms_of_keymap P_ ((void)); -extern void keys_of_keymap P_ ((void)); +extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object, + char *, int, int, int, int); +extern int current_minor_maps (Lisp_Object **, Lisp_Object **); +extern void initial_define_key (Lisp_Object, int, char *); +extern void initial_define_lispy_key (Lisp_Object, char *, char *); +extern void syms_of_keymap (void); +extern void keys_of_keymap (void); typedef void (*map_keymap_function_t) - P_ ((Lisp_Object key, Lisp_Object val, Lisp_Object args, void* data)); -extern void map_keymap P_ ((Lisp_Object map, map_keymap_function_t fun, Lisp_Object largs, void* cargs, int autoload)); + (Lisp_Object key, Lisp_Object val, Lisp_Object args, void* data); +extern void map_keymap (Lisp_Object map, map_keymap_function_t fun, Lisp_Object largs, void* cargs, int autoload); extern void map_keymap_canonical (Lisp_Object map, map_keymap_function_t fun, Lisp_Object args, void *data);
--- a/src/lisp.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/lisp.h Fri Jul 02 11:26:33 2010 +0200 @@ -54,7 +54,7 @@ /* Extra internal type checking? */ extern int suppress_checking; -extern void die P_((const char *, const char *, int)) NO_RETURN; +extern void die (const char *, const char *, int) NO_RETURN; #ifdef ENABLE_CHECKING @@ -492,7 +492,7 @@ #define make_number(N) \ (__extension__ ({ Lisp_Object _l; _l.s.val = (N); _l.s.type = Lisp_Int; _l; })) #else -extern Lisp_Object make_number P_ ((EMACS_INT)); +extern Lisp_Object make_number (EMACS_INT); #endif #endif /* USE_LISP_UNION_TYPE */ @@ -746,7 +746,7 @@ #ifdef GC_CHECK_STRING_BYTES struct Lisp_String; -extern int string_bytes P_ ((struct Lisp_String *)); +extern int string_bytes (struct Lisp_String *); #define STRING_BYTES(S) string_bytes ((S)) #else /* not GC_CHECK_STRING_BYTES */ @@ -1154,11 +1154,11 @@ struct Lisp_Hash_Table *next_weak; /* C function to compare two keys. */ - int (* cmpfn) P_ ((struct Lisp_Hash_Table *, Lisp_Object, - unsigned, Lisp_Object, unsigned)); + int (* cmpfn) (struct Lisp_Hash_Table *, Lisp_Object, + unsigned, Lisp_Object, unsigned); /* C function to compute hash code. */ - unsigned (* hashfn) P_ ((struct Lisp_Hash_Table *, Lisp_Object)); + unsigned (* hashfn) (struct Lisp_Hash_Table *, Lisp_Object); }; @@ -1801,7 +1801,7 @@ /* defsubr (Sname); is how we define the symbol for function `name' at start-up time. */ -extern void defsubr P_ ((struct Lisp_Subr *)); +extern void defsubr (struct Lisp_Subr *); #define MANY -2 #define UNEVALLED -1 @@ -1867,7 +1867,7 @@ WHERE being a buffer or frame means we saw a buffer-local or frame-local value. Other values of WHERE mean an internal error. */ -typedef Lisp_Object (*specbinding_func) P_ ((Lisp_Object)); +typedef Lisp_Object (*specbinding_func) (Lisp_Object); struct specbinding { @@ -1967,7 +1967,7 @@ and (in particular) cannot call arbitrary Lisp code. */ #ifdef SYNC_INPUT -extern void process_pending_signals P_ ((void)); +extern void process_pending_signals (void); extern int pending_signals; #define ELSE_PENDING_SIGNALS \ else if (pending_signals) \ @@ -2240,7 +2240,7 @@ /* Call staticpro (&var) to protect static variable `var'. */ -void staticpro P_ ((Lisp_Object *)); +void staticpro (Lisp_Object *); /* Declare a Lisp-callable function. The MAXARGS parameter has the same meaning as in the DEFUN macro, and is used to construct a prototype. */ @@ -2283,7 +2283,7 @@ extern Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; -extern void circular_list_error P_ ((Lisp_Object)) NO_RETURN; +extern void circular_list_error (Lisp_Object) NO_RETURN; EXFUN (Finteractive_form, 1); EXFUN (Fbyteorder, 0); @@ -2326,12 +2326,12 @@ EXFUN (Fsymbol_function, 1); EXFUN (Fsymbol_plist, 1); EXFUN (Fsymbol_name, 1); -extern Lisp_Object indirect_function P_ ((Lisp_Object)); +extern Lisp_Object indirect_function (Lisp_Object); EXFUN (Findirect_function, 2); EXFUN (Ffset, 2); EXFUN (Fsetplist, 2); EXFUN (Fsymbol_value, 1); -extern Lisp_Object find_symbol_value P_ ((Lisp_Object)); +extern Lisp_Object find_symbol_value (Lisp_Object); EXFUN (Fset, 2); EXFUN (Fdefault_value, 1); EXFUN (Fset_default, 2); @@ -2371,25 +2371,25 @@ EXFUN (Fmake_variable_buffer_local, 1); extern struct Lisp_Symbol *indirect_variable (struct Lisp_Symbol *); -extern Lisp_Object long_to_cons P_ ((unsigned long)); -extern unsigned long cons_to_long P_ ((Lisp_Object)); -extern void args_out_of_range P_ ((Lisp_Object, Lisp_Object)) NO_RETURN; -extern void args_out_of_range_3 P_ ((Lisp_Object, Lisp_Object, - Lisp_Object)) NO_RETURN; -extern Lisp_Object wrong_type_argument P_ ((Lisp_Object, Lisp_Object)) NO_RETURN; +extern Lisp_Object long_to_cons (unsigned long); +extern unsigned long cons_to_long (Lisp_Object); +extern void args_out_of_range (Lisp_Object, Lisp_Object) NO_RETURN; +extern void args_out_of_range_3 (Lisp_Object, Lisp_Object, + Lisp_Object) NO_RETURN; +extern Lisp_Object wrong_type_argument (Lisp_Object, Lisp_Object) NO_RETURN; extern Lisp_Object do_symval_forwarding (union Lisp_Fwd *); extern void set_internal (Lisp_Object, Lisp_Object, Lisp_Object, int); -extern void syms_of_data P_ ((void)); -extern void init_data P_ ((void)); -extern void swap_in_global_binding P_ ((struct Lisp_Symbol *)); +extern void syms_of_data (void); +extern void init_data (void); +extern void swap_in_global_binding (struct Lisp_Symbol *); /* Defined in cmds.c */ EXFUN (Fend_of_line, 1); EXFUN (Fforward_char, 1); EXFUN (Fforward_line, 1); -extern int internal_self_insert P_ ((int, int)); -extern void syms_of_cmds P_ ((void)); -extern void keys_of_cmds P_ ((void)); +extern int internal_self_insert (int, int); +extern void syms_of_cmds (void); +extern void keys_of_cmds (void); /* Defined in coding.c */ EXFUN (Fcoding_system_p, 1); @@ -2403,34 +2403,34 @@ EXFUN (Fupdate_coding_systems_internal, 0); EXFUN (Fencode_coding_string, 4); EXFUN (Fdecode_coding_string, 4); -extern Lisp_Object detect_coding_system P_ ((const unsigned char *, EMACS_INT, - EMACS_INT, int, int, Lisp_Object)); -extern void init_coding P_ ((void)); -extern void init_coding_once P_ ((void)); -extern void syms_of_coding P_ ((void)); +extern Lisp_Object detect_coding_system (const unsigned char *, EMACS_INT, + EMACS_INT, int, int, Lisp_Object); +extern void init_coding (void); +extern void init_coding_once (void); +extern void syms_of_coding (void); /* Defined in character.c */ -extern void init_character_once P_ ((void)); -extern void syms_of_character P_ ((void)); +extern void init_character_once (void); +extern void syms_of_character (void); EXFUN (Funibyte_char_to_multibyte, 1); /* Defined in charset.c */ EXFUN (Fchar_bytes, 1); EXFUN (Fchar_width, 1); EXFUN (Fstring, MANY); -extern EMACS_INT chars_in_text P_ ((const unsigned char *, EMACS_INT)); -extern EMACS_INT multibyte_chars_in_text P_ ((const unsigned char *, EMACS_INT)); -extern int multibyte_char_to_unibyte P_ ((int, Lisp_Object)); -extern int multibyte_char_to_unibyte_safe P_ ((int)); +extern EMACS_INT chars_in_text (const unsigned char *, EMACS_INT); +extern EMACS_INT multibyte_chars_in_text (const unsigned char *, EMACS_INT); +extern int multibyte_char_to_unibyte (int, Lisp_Object); +extern int multibyte_char_to_unibyte_safe (int); extern Lisp_Object Qcharset; -extern void init_charset P_ ((void)); -extern void init_charset_once P_ ((void)); -extern void syms_of_charset P_ ((void)); +extern void init_charset (void); +extern void init_charset_once (void); +extern void syms_of_charset (void); /* Structure forward declarations. */ struct charset; /* Defined in composite.c */ -extern void syms_of_composite P_ ((void)); +extern void syms_of_composite (void); /* Defined in syntax.c */ EXFUN (Fforward_word, 1); @@ -2439,28 +2439,28 @@ EXFUN (Fsyntax_table_p, 1); EXFUN (Fsyntax_table, 0); EXFUN (Fset_syntax_table, 1); -extern void init_syntax_once P_ ((void)); -extern void syms_of_syntax P_ ((void)); +extern void init_syntax_once (void); +extern void syms_of_syntax (void); /* Defined in fns.c */ extern int use_dialog_box; -extern int next_almost_prime P_ ((int)); -extern Lisp_Object larger_vector P_ ((Lisp_Object, int, Lisp_Object)); -extern void sweep_weak_hash_tables P_ ((void)); +extern int next_almost_prime (int); +extern Lisp_Object larger_vector (Lisp_Object, int, Lisp_Object); +extern void sweep_weak_hash_tables (void); extern Lisp_Object Qstring_lessp; extern Lisp_Object Vfeatures; extern Lisp_Object QCtest, QCweakness, Qequal, Qeq; -unsigned sxhash P_ ((Lisp_Object, int)); -Lisp_Object make_hash_table P_ ((Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object)); -Lisp_Object copy_hash_table P_ ((struct Lisp_Hash_Table *)); -int hash_lookup P_ ((struct Lisp_Hash_Table *, Lisp_Object, unsigned *)); -int hash_put P_ ((struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object, - unsigned)); -void hash_clear P_ ((struct Lisp_Hash_Table *)); -void init_weak_hash_tables P_ ((void)); -extern void init_fns P_ ((void)); +unsigned sxhash (Lisp_Object, int); +Lisp_Object make_hash_table (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object); +Lisp_Object copy_hash_table (struct Lisp_Hash_Table *); +int hash_lookup (struct Lisp_Hash_Table *, Lisp_Object, unsigned *); +int hash_put (struct Lisp_Hash_Table *, Lisp_Object, Lisp_Object, + unsigned); +void hash_clear (struct Lisp_Hash_Table *); +void init_weak_hash_tables (void); +extern void init_fns (void); EXFUN (Fsxhash, 1); EXFUN (Fmake_hash_table, MANY); EXFUN (Fmakehash, 1); @@ -2494,7 +2494,7 @@ EXFUN (Fstring_to_multibyte, 1); EXFUN (Fstring_to_unibyte, 1); EXFUN (Fsubstring, 3); -extern Lisp_Object substring_both P_ ((Lisp_Object, int, int, int, int)); +extern Lisp_Object substring_both (Lisp_Object, int, int, int, int); EXFUN (Fnth, 2); EXFUN (Fnthcdr, 2); EXFUN (Fmemq, 2); @@ -2516,20 +2516,20 @@ EXFUN (Fmapcar, 2); EXFUN (Fmapconcat, 3); EXFUN (Fy_or_n_p, 1); -extern Lisp_Object do_yes_or_no_p P_ ((Lisp_Object)); +extern Lisp_Object do_yes_or_no_p (Lisp_Object); EXFUN (Frequire, 3); EXFUN (Fprovide, 2); -extern Lisp_Object concat2 P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object concat3 P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); -extern Lisp_Object nconc2 P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object assq_no_quit P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object assoc_no_quit P_ ((Lisp_Object, Lisp_Object)); -extern void clear_string_char_byte_cache P_ ((void)); -extern EMACS_INT string_char_to_byte P_ ((Lisp_Object, EMACS_INT)); -extern EMACS_INT string_byte_to_char P_ ((Lisp_Object, EMACS_INT)); -extern Lisp_Object string_make_multibyte P_ ((Lisp_Object)); -extern Lisp_Object string_to_multibyte P_ ((Lisp_Object)); -extern Lisp_Object string_make_unibyte P_ ((Lisp_Object)); +extern Lisp_Object concat2 (Lisp_Object, Lisp_Object); +extern Lisp_Object concat3 (Lisp_Object, Lisp_Object, Lisp_Object); +extern Lisp_Object nconc2 (Lisp_Object, Lisp_Object); +extern Lisp_Object assq_no_quit (Lisp_Object, Lisp_Object); +extern Lisp_Object assoc_no_quit (Lisp_Object, Lisp_Object); +extern void clear_string_char_byte_cache (void); +extern EMACS_INT string_char_to_byte (Lisp_Object, EMACS_INT); +extern EMACS_INT string_byte_to_char (Lisp_Object, EMACS_INT); +extern Lisp_Object string_make_multibyte (Lisp_Object); +extern Lisp_Object string_to_multibyte (Lisp_Object); +extern Lisp_Object string_make_unibyte (Lisp_Object); EXFUN (Fcopy_alist, 1); EXFUN (Fplist_get, 2); EXFUN (Fplist_put, 3); @@ -2538,24 +2538,24 @@ EXFUN (Fstring_equal, 2); EXFUN (Fcompare_strings, 7); EXFUN (Fstring_lessp, 2); -extern void syms_of_fns P_ ((void)); +extern void syms_of_fns (void); /* Defined in floatfns.c */ -extern double extract_float P_ ((Lisp_Object)); +extern double extract_float (Lisp_Object); EXFUN (Ffloat, 1); EXFUN (Ftruncate, 2); -extern void init_floatfns P_ ((void)); -extern void syms_of_floatfns P_ ((void)); +extern void init_floatfns (void); +extern void syms_of_floatfns (void); /* Defined in fringe.c */ -extern void syms_of_fringe P_ ((void)); -extern void init_fringe P_ ((void)); -extern void init_fringe_once P_ ((void)); +extern void syms_of_fringe (void); +extern void init_fringe (void); +extern void init_fringe_once (void); /* Defined in image.c */ EXFUN (Finit_image_library, 2); -extern void syms_of_image P_ ((void)); -extern void init_image P_ ((void)); +extern void syms_of_image (void); +extern void init_image (void); /* Defined in insdel.c */ extern Lisp_Object Qinhibit_modification_hooks; @@ -2617,10 +2617,10 @@ EXFUN (Fredraw_display, 0); EXFUN (Fsleep_for, 2); EXFUN (Fredisplay, 1); -extern Lisp_Object sit_for P_ ((Lisp_Object, int, int)); -extern void init_display P_ ((void)); -extern void syms_of_display P_ ((void)); -extern void safe_bcopy P_ ((const char *, char *, int)); +extern Lisp_Object sit_for (Lisp_Object, int, int); +extern void init_display (void); +extern void syms_of_display (void); +extern void safe_bcopy (const char *, char *, int); /* Defined in xdisp.c */ extern Lisp_Object Qinhibit_point_motion_hooks; @@ -2631,58 +2631,58 @@ extern Lisp_Object Vmessage_log_max; extern int message_enable_multibyte; extern Lisp_Object echo_area_buffer[2]; -extern void check_message_stack P_ ((void)); -extern void setup_echo_area_for_printing P_ ((int)); -extern int push_message P_ ((void)); -extern Lisp_Object pop_message_unwind P_ ((Lisp_Object)); -extern Lisp_Object restore_message_unwind P_ ((Lisp_Object)); -extern void pop_message P_ ((void)); -extern void restore_message P_ ((void)); -extern Lisp_Object current_message P_ ((void)); -extern void set_message P_ ((const char *s, Lisp_Object, int, int)); -extern void clear_message P_ ((int, int)); -extern void message P_ ((/* char *, ... */)); -extern void message_nolog P_ ((/* char *, ... */)); -extern void message1 P_ ((char *)); -extern void message1_nolog P_ ((char *)); -extern void message2 P_ ((const char *, int, int)); -extern void message2_nolog P_ ((const char *, int, int)); -extern void message3 P_ ((Lisp_Object, int, int)); -extern void message3_nolog P_ ((Lisp_Object, int, int)); -extern void message_dolog P_ ((const char *, int, int, int)); -extern void message_with_string P_ ((char *, Lisp_Object, int)); -extern void message_log_maybe_newline P_ ((void)); -extern void update_echo_area P_ ((void)); -extern void truncate_echo_area P_ ((int)); -extern void redisplay P_ ((void)); +extern void check_message_stack (void); +extern void setup_echo_area_for_printing (int); +extern int push_message (void); +extern Lisp_Object pop_message_unwind (Lisp_Object); +extern Lisp_Object restore_message_unwind (Lisp_Object); +extern void pop_message (void); +extern void restore_message (void); +extern Lisp_Object current_message (void); +extern void set_message (const char *s, Lisp_Object, int, int); +extern void clear_message (int, int); +extern void message (/* char *, ... */); +extern void message_nolog (/* char *, ... */); +extern void message1 (char *); +extern void message1_nolog (char *); +extern void message2 (const char *, int, int); +extern void message2_nolog (const char *, int, int); +extern void message3 (Lisp_Object, int, int); +extern void message3_nolog (Lisp_Object, int, int); +extern void message_dolog (const char *, int, int, int); +extern void message_with_string (char *, Lisp_Object, int); +extern void message_log_maybe_newline (void); +extern void update_echo_area (void); +extern void truncate_echo_area (int); +extern void redisplay (void); extern int check_point_in_composition - P_ ((struct buffer *, int, struct buffer *, int)); -extern void redisplay_preserve_echo_area P_ ((int)); -extern void prepare_menu_bars P_ ((void)); - -void set_frame_cursor_types P_ ((struct frame *, Lisp_Object)); -extern void syms_of_xdisp P_ ((void)); -extern void init_xdisp P_ ((void)); -extern Lisp_Object safe_eval P_ ((Lisp_Object)); -extern int pos_visible_p P_ ((struct window *, int, int *, - int *, int *, int *, int *, int *)); + (struct buffer *, int, struct buffer *, int); +extern void redisplay_preserve_echo_area (int); +extern void prepare_menu_bars (void); + +void set_frame_cursor_types (struct frame *, Lisp_Object); +extern void syms_of_xdisp (void); +extern void init_xdisp (void); +extern Lisp_Object safe_eval (Lisp_Object); +extern int pos_visible_p (struct window *, int, int *, + int *, int *, int *, int *, int *); /* Defined in xsettings.c */ -extern void syms_of_xsettings P_ ((void)); +extern void syms_of_xsettings (void); /* Defined in vm-limit.c. */ -extern void memory_warnings P_ ((POINTER_TYPE *, void (*warnfun) ())); +extern void memory_warnings (POINTER_TYPE *, void (*warnfun) ()); /* Defined in alloc.c */ -extern void check_pure_size P_ ((void)); -extern void allocate_string_data P_ ((struct Lisp_String *, int, int)); -extern void reset_malloc_hooks P_ ((void)); -extern void uninterrupt_malloc P_ ((void)); -extern void malloc_warning P_ ((char *)); -extern void memory_full P_ ((void)) NO_RETURN; -extern void buffer_memory_full P_ ((void)) NO_RETURN; -extern int survives_gc_p P_ ((Lisp_Object)); -extern void mark_object P_ ((Lisp_Object)); +extern void check_pure_size (void); +extern void allocate_string_data (struct Lisp_String *, int, int); +extern void reset_malloc_hooks (void); +extern void uninterrupt_malloc (void); +extern void malloc_warning (char *); +extern void memory_full (void) NO_RETURN; +extern void buffer_memory_full (void) NO_RETURN; +extern int survives_gc_p (Lisp_Object); +extern void mark_object (Lisp_Object); extern Lisp_Object Vpurify_flag; extern Lisp_Object Vmemory_full; EXFUN (Fcons, 2); @@ -2693,55 +2693,55 @@ EXFUN (list5, 5); EXFUN (Flist, MANY); EXFUN (Fmake_list, 2); -extern Lisp_Object allocate_misc P_ ((void)); +extern Lisp_Object allocate_misc (void); EXFUN (Fmake_vector, 2); EXFUN (Fvector, MANY); EXFUN (Fmake_symbol, 1); EXFUN (Fmake_marker, 0); EXFUN (Fmake_string, 2); -extern Lisp_Object build_string P_ ((const char *)); -extern Lisp_Object make_string P_ ((const char *, int)); -extern Lisp_Object make_unibyte_string P_ ((const char *, int)); -extern Lisp_Object make_multibyte_string P_ ((const char *, int, int)); -extern Lisp_Object make_event_array P_ ((int, Lisp_Object *)); -extern Lisp_Object make_uninit_string P_ ((int)); -extern Lisp_Object make_uninit_multibyte_string P_ ((int, int)); -extern Lisp_Object make_string_from_bytes P_ ((const char *, int, int)); -extern Lisp_Object make_specified_string P_ ((const char *, int, int, int)); +extern Lisp_Object build_string (const char *); +extern Lisp_Object make_string (const char *, int); +extern Lisp_Object make_unibyte_string (const char *, int); +extern Lisp_Object make_multibyte_string (const char *, int, int); +extern Lisp_Object make_event_array (int, Lisp_Object *); +extern Lisp_Object make_uninit_string (int); +extern Lisp_Object make_uninit_multibyte_string (int, int); +extern Lisp_Object make_string_from_bytes (const char *, int, int); +extern Lisp_Object make_specified_string (const char *, int, int, int); EXFUN (Fpurecopy, 1); -extern Lisp_Object make_pure_string P_ ((const char *, int, int, int)); +extern Lisp_Object make_pure_string (const char *, int, int, int); extern Lisp_Object make_pure_c_string (const char *data); -extern Lisp_Object pure_cons P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object make_pure_vector P_ ((EMACS_INT)); +extern Lisp_Object pure_cons (Lisp_Object, Lisp_Object); +extern Lisp_Object make_pure_vector (EMACS_INT); EXFUN (Fgarbage_collect, 0); EXFUN (Fmake_byte_code, MANY); EXFUN (Fmake_bool_vector, 2); extern Lisp_Object Qchar_table_extra_slots; -extern struct Lisp_Vector *allocate_vector P_ ((EMACS_INT)); -extern struct Lisp_Vector *allocate_pseudovector P_ ((int memlen, int lisplen, EMACS_INT tag)); +extern struct Lisp_Vector *allocate_vector (EMACS_INT); +extern struct Lisp_Vector *allocate_pseudovector (int memlen, int lisplen, EMACS_INT tag); #define ALLOCATE_PSEUDOVECTOR(typ,field,tag) \ ((typ*) \ allocate_pseudovector \ (VECSIZE (typ), PSEUDOVECSIZE (typ, field), tag)) -extern struct Lisp_Hash_Table *allocate_hash_table P_ ((void)); -extern struct window *allocate_window P_ ((void)); -extern struct frame *allocate_frame P_ ((void)); -extern struct Lisp_Process *allocate_process P_ ((void)); -extern struct terminal *allocate_terminal P_ ((void)); +extern struct Lisp_Hash_Table *allocate_hash_table (void); +extern struct window *allocate_window (void); +extern struct frame *allocate_frame (void); +extern struct Lisp_Process *allocate_process (void); +extern struct terminal *allocate_terminal (void); extern int gc_in_progress; extern int abort_on_gc; -extern Lisp_Object make_float P_ ((double)); -extern void display_malloc_warning P_ ((void)); -extern int inhibit_garbage_collection P_ ((void)); -extern Lisp_Object make_save_value P_ ((void *, int)); -extern void free_misc P_ ((Lisp_Object)); -extern void free_marker P_ ((Lisp_Object)); -extern void free_cons P_ ((struct Lisp_Cons *)); -extern void init_alloc_once P_ ((void)); -extern void init_alloc P_ ((void)); -extern void syms_of_alloc P_ ((void)); -extern struct buffer * allocate_buffer P_ ((void)); -extern int valid_lisp_object_p P_ ((Lisp_Object)); +extern Lisp_Object make_float (double); +extern void display_malloc_warning (void); +extern int inhibit_garbage_collection (void); +extern Lisp_Object make_save_value (void *, int); +extern void free_misc (Lisp_Object); +extern void free_marker (Lisp_Object); +extern void free_cons (struct Lisp_Cons *); +extern void init_alloc_once (void); +extern void init_alloc (void); +extern void syms_of_alloc (void); +extern struct buffer * allocate_buffer (void); +extern int valid_lisp_object_p (Lisp_Object); /* Defined in chartab.c */ EXFUN (Fmake_char_table, 2); @@ -2754,23 +2754,23 @@ EXFUN (Fset_char_table_default, 3); EXFUN (Foptimize_char_table, 2); EXFUN (Fmap_char_table, 2); -extern Lisp_Object copy_char_table P_ ((Lisp_Object)); -extern Lisp_Object sub_char_table_ref P_ ((Lisp_Object, int)); -extern Lisp_Object char_table_ref P_ ((Lisp_Object, int)); -extern Lisp_Object char_table_ref_and_range P_ ((Lisp_Object, int, - int *, int *)); -extern Lisp_Object char_table_set P_ ((Lisp_Object, int, Lisp_Object)); -extern Lisp_Object char_table_set_range P_ ((Lisp_Object, int, int, - Lisp_Object)); -extern int char_table_translate P_ ((Lisp_Object, int)); -extern void map_char_table P_ ((void (*) (Lisp_Object, Lisp_Object, - Lisp_Object), - Lisp_Object, Lisp_Object, Lisp_Object)); -extern void syms_of_chartab P_ ((void)); +extern Lisp_Object copy_char_table (Lisp_Object); +extern Lisp_Object sub_char_table_ref (Lisp_Object, int); +extern Lisp_Object char_table_ref (Lisp_Object, int); +extern Lisp_Object char_table_ref_and_range (Lisp_Object, int, + int *, int *); +extern Lisp_Object char_table_set (Lisp_Object, int, Lisp_Object); +extern Lisp_Object char_table_set_range (Lisp_Object, int, int, + Lisp_Object); +extern int char_table_translate (Lisp_Object, int); +extern void map_char_table (void (*) (Lisp_Object, Lisp_Object, + Lisp_Object), + Lisp_Object, Lisp_Object, Lisp_Object); +extern void syms_of_chartab (void); /* Defined in print.c */ extern Lisp_Object Vprin1_to_string_buffer; -extern void debug_print P_ ((Lisp_Object)); +extern void debug_print (Lisp_Object); EXFUN (Fprin1, 2); EXFUN (Fprin1_to_string, 2); EXFUN (Fprinc, 2); @@ -2779,19 +2779,19 @@ EXFUN (Ferror_message_string, 1); extern Lisp_Object Vstandard_output, Qstandard_output; extern Lisp_Object Qexternal_debugging_output; -extern void temp_output_buffer_setup P_ ((const char *)); +extern void temp_output_buffer_setup (const char *); extern int print_level, print_escape_newlines; extern Lisp_Object Qprint_escape_newlines; -extern void write_string P_ ((char *, int)); -extern void write_string_1 P_ ((char *, int, Lisp_Object)); -extern void print_error_message P_ ((Lisp_Object, Lisp_Object, char *, Lisp_Object)); +extern void write_string (char *, int); +extern void write_string_1 (char *, int, Lisp_Object); +extern void print_error_message (Lisp_Object, Lisp_Object, char *, Lisp_Object); extern Lisp_Object internal_with_output_to_temp_buffer - P_ ((const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object)); -extern void float_to_string P_ ((unsigned char *, double)); -extern void syms_of_print P_ ((void)); + (const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object); +extern void float_to_string (unsigned char *, double); +extern void syms_of_print (void); /* Defined in doprnt.c */ -extern int doprnt P_ ((char *, int, char *, char *, int, char **)); +extern int doprnt (char *, int, char *, char *, int, char **); /* Defined in lread.c */ extern Lisp_Object Qvariable_documentation, Qstandard_input; @@ -2805,29 +2805,29 @@ EXFUN (Fget_file_char, 0); EXFUN (Fread_char, 3); EXFUN (Fread_event, 3); -extern Lisp_Object read_filtered_event P_ ((int, int, int, int, Lisp_Object)); +extern Lisp_Object read_filtered_event (int, int, int, int, Lisp_Object); EXFUN (Feval_region, 4); -extern Lisp_Object check_obarray P_ ((Lisp_Object)); -extern Lisp_Object intern P_ ((const char *)); +extern Lisp_Object check_obarray (Lisp_Object); +extern Lisp_Object intern (const char *); extern Lisp_Object intern_c_string (const char *); -extern Lisp_Object make_symbol P_ ((char *)); -extern Lisp_Object oblookup P_ ((Lisp_Object, const char *, int, int)); +extern Lisp_Object make_symbol (char *); +extern Lisp_Object oblookup (Lisp_Object, const char *, int, int); #define LOADHIST_ATTACH(x) \ do { \ if (initialized) Vcurrent_load_list = Fcons (x, Vcurrent_load_list); \ } while (0) extern Lisp_Object Vcurrent_load_list; extern Lisp_Object Vload_history, Vload_suffixes, Vload_file_rep_suffixes; -extern int openp P_ ((Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object *, Lisp_Object)); -extern int isfloat_string P_ ((char *, int)); -extern void map_obarray P_ ((Lisp_Object, void (*) (Lisp_Object, Lisp_Object), - Lisp_Object)); -extern void dir_warning P_ ((char *, Lisp_Object)); -extern void close_load_descs P_ ((void)); -extern void init_obarray P_ ((void)); -extern void init_lread P_ ((void)); -extern void syms_of_lread P_ ((void)); +extern int openp (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object *, Lisp_Object); +extern int isfloat_string (char *, int); +extern void map_obarray (Lisp_Object, void (*) (Lisp_Object, Lisp_Object), + Lisp_Object); +extern void dir_warning (char *, Lisp_Object); +extern void close_load_descs (void); +extern void init_obarray (void); +extern void init_lread (void); +extern void syms_of_lread (void); /* Defined in eval.c */ extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro; @@ -2836,7 +2836,7 @@ extern Lisp_Object Vdebug_on_error; extern Lisp_Object Vsignaling_function; extern int handling_signal; -extern int interactive_p P_ ((int)); +extern int interactive_p (int); /* To run a normal hook, use the appropriate function from the list below. The calling convention: @@ -2850,8 +2850,8 @@ EXFUN (Frun_hook_with_args, MANY); EXFUN (Frun_hook_with_args_until_success, MANY); EXFUN (Frun_hook_with_args_until_failure, MANY); -extern Lisp_Object run_hook_list_with_args P_ ((Lisp_Object, int, Lisp_Object *)); -extern void run_hook_with_args_2 P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); +extern Lisp_Object run_hook_list_with_args (Lisp_Object, int, Lisp_Object *); +extern void run_hook_with_args_2 (Lisp_Object, Lisp_Object, Lisp_Object); EXFUN (Fand, UNEVALLED); EXFUN (For, UNEVALLED); EXFUN (Fif, UNEVALLED); @@ -2871,48 +2871,48 @@ EXFUN (Funwind_protect, UNEVALLED); EXFUN (Fcondition_case, UNEVALLED); EXFUN (Fsignal, 2); -extern void xsignal P_ ((Lisp_Object, Lisp_Object)) NO_RETURN; -extern void xsignal0 P_ ((Lisp_Object)) NO_RETURN; -extern void xsignal1 P_ ((Lisp_Object, Lisp_Object)) NO_RETURN; -extern void xsignal2 P_ ((Lisp_Object, Lisp_Object, Lisp_Object)) NO_RETURN; -extern void xsignal3 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object)) NO_RETURN; -extern void signal_error P_ ((char *, Lisp_Object)) NO_RETURN; +extern void xsignal (Lisp_Object, Lisp_Object) NO_RETURN; +extern void xsignal0 (Lisp_Object) NO_RETURN; +extern void xsignal1 (Lisp_Object, Lisp_Object) NO_RETURN; +extern void xsignal2 (Lisp_Object, Lisp_Object, Lisp_Object) NO_RETURN; +extern void xsignal3 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object) NO_RETURN; +extern void signal_error (char *, Lisp_Object) NO_RETURN; EXFUN (Fautoload, 5); EXFUN (Fcommandp, 2); EXFUN (Feval, 1); EXFUN (Fapply, MANY); EXFUN (Ffuncall, MANY); EXFUN (Fbacktrace, 0); -extern Lisp_Object apply1 P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object call0 P_ ((Lisp_Object)); -extern Lisp_Object call1 P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object call2 P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); -extern Lisp_Object call3 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object)); -extern Lisp_Object call4 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object)); -extern Lisp_Object call5 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object)); -extern Lisp_Object call6 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object)); -extern Lisp_Object call7 P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object)); +extern Lisp_Object apply1 (Lisp_Object, Lisp_Object); +extern Lisp_Object call0 (Lisp_Object); +extern Lisp_Object call1 (Lisp_Object, Lisp_Object); +extern Lisp_Object call2 (Lisp_Object, Lisp_Object, Lisp_Object); +extern Lisp_Object call3 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); +extern Lisp_Object call4 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); +extern Lisp_Object call5 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); +extern Lisp_Object call6 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); +extern Lisp_Object call7 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); EXFUN (Fdo_auto_save, 2); -extern Lisp_Object apply_lambda P_ ((Lisp_Object, Lisp_Object, int)); -extern Lisp_Object internal_catch P_ ((Lisp_Object, Lisp_Object (*) (Lisp_Object), Lisp_Object)); -extern Lisp_Object internal_lisp_condition_case P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); -extern Lisp_Object internal_condition_case P_ ((Lisp_Object (*) (void), Lisp_Object, Lisp_Object (*) (Lisp_Object))); -extern Lisp_Object internal_condition_case_1 P_ ((Lisp_Object (*) (Lisp_Object), Lisp_Object, Lisp_Object, Lisp_Object (*) (Lisp_Object))); -extern Lisp_Object internal_condition_case_2 P_ ((Lisp_Object (*) (Lisp_Object, Lisp_Object), Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object (*) (Lisp_Object))); -extern Lisp_Object internal_condition_case_n P_ ((Lisp_Object (*) (int, Lisp_Object *), int, Lisp_Object *, Lisp_Object, Lisp_Object (*) (Lisp_Object))); -extern void specbind P_ ((Lisp_Object, Lisp_Object)); -extern void record_unwind_protect P_ ((Lisp_Object (*) (Lisp_Object), Lisp_Object)); -extern Lisp_Object unbind_to P_ ((int, Lisp_Object)); -extern void error P_ ((/* char *, ... */)) NO_RETURN; -extern void do_autoload P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object un_autoload P_ ((Lisp_Object)); +extern Lisp_Object apply_lambda (Lisp_Object, Lisp_Object, int); +extern Lisp_Object internal_catch (Lisp_Object, Lisp_Object (*) (Lisp_Object), Lisp_Object); +extern Lisp_Object internal_lisp_condition_case (Lisp_Object, Lisp_Object, Lisp_Object); +extern Lisp_Object internal_condition_case (Lisp_Object (*) (void), Lisp_Object, Lisp_Object (*) (Lisp_Object)); +extern Lisp_Object internal_condition_case_1 (Lisp_Object (*) (Lisp_Object), Lisp_Object, Lisp_Object, Lisp_Object (*) (Lisp_Object)); +extern Lisp_Object internal_condition_case_2 (Lisp_Object (*) (Lisp_Object, Lisp_Object), Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object (*) (Lisp_Object)); +extern Lisp_Object internal_condition_case_n (Lisp_Object (*) (int, Lisp_Object *), int, Lisp_Object *, Lisp_Object, Lisp_Object (*) (Lisp_Object)); +extern void specbind (Lisp_Object, Lisp_Object); +extern void record_unwind_protect (Lisp_Object (*) (Lisp_Object), Lisp_Object); +extern Lisp_Object unbind_to (int, Lisp_Object); +extern void error (/* char *, ... */) NO_RETURN; +extern void do_autoload (Lisp_Object, Lisp_Object); +extern Lisp_Object un_autoload (Lisp_Object); EXFUN (Ffetch_bytecode, 1); -extern void init_eval_once P_ ((void)); -extern Lisp_Object safe_call P_ ((int, Lisp_Object *)); -extern Lisp_Object safe_call1 P_ ((Lisp_Object, Lisp_Object)); +extern void init_eval_once (void); +extern Lisp_Object safe_call (int, Lisp_Object *); +extern Lisp_Object safe_call1 (Lisp_Object, Lisp_Object); extern Lisp_Object safe_call2 (Lisp_Object, Lisp_Object, Lisp_Object); -extern void init_eval P_ ((void)); -extern void syms_of_eval P_ ((void)); +extern void init_eval (void); +extern void syms_of_eval (void); /* Defined in editfns.c */ EXFUN (Fpropertize, MANY); @@ -2935,20 +2935,20 @@ EXFUN (Finsert_before_markers, MANY); EXFUN (Finsert_buffer_substring, 3); EXFUN (Finsert_char, 3); -extern void insert1 P_ ((Lisp_Object)); +extern void insert1 (Lisp_Object); EXFUN (Feolp, 0); EXFUN (Feobp, 0); EXFUN (Fbolp, 0); EXFUN (Fbobp, 0); EXFUN (Fformat, MANY); EXFUN (Fmessage, MANY); -extern Lisp_Object format2 P_ ((char *, Lisp_Object, Lisp_Object)); +extern Lisp_Object format2 (char *, Lisp_Object, Lisp_Object); EXFUN (Fbuffer_substring, 2); EXFUN (Fbuffer_string, 0); -extern Lisp_Object save_excursion_save P_ ((void)); -extern Lisp_Object save_restriction_save P_ ((void)); -extern Lisp_Object save_excursion_restore P_ ((Lisp_Object)); -extern Lisp_Object save_restriction_restore P_ ((Lisp_Object)); +extern Lisp_Object save_excursion_save (void); +extern Lisp_Object save_restriction_save (void); +extern Lisp_Object save_excursion_restore (Lisp_Object); +extern Lisp_Object save_restriction_restore (Lisp_Object); EXFUN (Fchar_to_string, 1); EXFUN (Fdelete_region, 2); EXFUN (Fnarrow_to_region, 2); @@ -2956,11 +2956,11 @@ EXFUN (Fuser_login_name, 1); EXFUN (Fsystem_name, 0); EXFUN (Fcurrent_time, 0); -extern int clip_to_bounds P_ ((int, int, int)); -extern Lisp_Object make_buffer_string P_ ((int, int, int)); -extern Lisp_Object make_buffer_string_both P_ ((int, int, int, int, int)); -extern void init_editfns P_ ((void)); -extern void syms_of_editfns P_ ((void)); +extern int clip_to_bounds (int, int, int); +extern Lisp_Object make_buffer_string (int, int, int); +extern Lisp_Object make_buffer_string_both (int, int, int, int, int); +extern void init_editfns (void); +extern void syms_of_editfns (void); extern Lisp_Object Vinhibit_field_text_motion; EXFUN (Fconstrain_to_field, 5); EXFUN (Ffield_string, 1); @@ -2968,21 +2968,21 @@ EXFUN (Ffield_beginning, 3); EXFUN (Ffield_end, 3); EXFUN (Ffield_string_no_properties, 1); -extern void set_time_zone_rule P_ ((char *)); +extern void set_time_zone_rule (char *); /* Defined in buffer.c */ -extern int mouse_face_overlay_overlaps P_ ((Lisp_Object)); -extern void nsberror P_ ((Lisp_Object)) NO_RETURN; +extern int mouse_face_overlay_overlaps (Lisp_Object); +extern void nsberror (Lisp_Object) NO_RETURN; EXFUN (Fset_buffer_multibyte, 1); EXFUN (Foverlay_start, 1); EXFUN (Foverlay_end, 1); EXFUN (Foverlay_buffer, 1); -extern void adjust_overlays_for_insert P_ ((EMACS_INT, EMACS_INT)); -extern void adjust_overlays_for_delete P_ ((EMACS_INT, EMACS_INT)); -extern void fix_start_end_in_overlays P_ ((int, int)); -extern void report_overlay_modification P_ ((Lisp_Object, Lisp_Object, int, - Lisp_Object, Lisp_Object, Lisp_Object)); -extern int overlay_touches_p P_ ((int)); +extern void adjust_overlays_for_insert (EMACS_INT, EMACS_INT); +extern void adjust_overlays_for_delete (EMACS_INT, EMACS_INT); +extern void fix_start_end_in_overlays (int, int); +extern void report_overlay_modification (Lisp_Object, Lisp_Object, int, + Lisp_Object, Lisp_Object, Lisp_Object); +extern int overlay_touches_p (int); extern Lisp_Object Vbuffer_alist, Vinhibit_read_only; EXFUN (Fbuffer_list, 1); EXFUN (Fget_buffer, 1); @@ -3004,14 +3004,14 @@ EXFUN (Ferase_buffer, 0); extern Lisp_Object Qoverlayp; extern Lisp_Object Qevaporate; -extern Lisp_Object get_truename_buffer P_ ((Lisp_Object)); +extern Lisp_Object get_truename_buffer (Lisp_Object); extern struct buffer *all_buffers; EXFUN (Fprevious_overlay_change, 1); EXFUN (Fbuffer_file_name, 1); -extern void init_buffer_once P_ ((void)); -extern void init_buffer P_ ((void)); -extern void syms_of_buffer P_ ((void)); -extern void keys_of_buffer P_ ((void)); +extern void init_buffer_once (void); +extern void init_buffer (void); +extern void syms_of_buffer (void); +extern void keys_of_buffer (void); /* Defined in marker.c */ @@ -3019,18 +3019,18 @@ EXFUN (Fmarker_buffer, 1); EXFUN (Fcopy_marker, 2); EXFUN (Fset_marker, 3); -extern int marker_position P_ ((Lisp_Object)); -extern int marker_byte_position P_ ((Lisp_Object)); -extern void clear_charpos_cache P_ ((struct buffer *)); -extern int charpos_to_bytepos P_ ((int)); -extern int buf_charpos_to_bytepos P_ ((struct buffer *, int)); -extern int buf_bytepos_to_charpos P_ ((struct buffer *, int)); -extern void unchain_marker P_ ((struct Lisp_Marker *marker)); -extern Lisp_Object set_marker_restricted P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); -extern Lisp_Object set_marker_both P_ ((Lisp_Object, Lisp_Object, int, int)); -extern Lisp_Object set_marker_restricted_both P_ ((Lisp_Object, Lisp_Object, - int, int)); -extern void syms_of_marker P_ ((void)); +extern int marker_position (Lisp_Object); +extern int marker_byte_position (Lisp_Object); +extern void clear_charpos_cache (struct buffer *); +extern int charpos_to_bytepos (int); +extern int buf_charpos_to_bytepos (struct buffer *, int); +extern int buf_bytepos_to_charpos (struct buffer *, int); +extern void unchain_marker (struct Lisp_Marker *marker); +extern Lisp_Object set_marker_restricted (Lisp_Object, Lisp_Object, Lisp_Object); +extern Lisp_Object set_marker_both (Lisp_Object, Lisp_Object, int, int); +extern Lisp_Object set_marker_restricted_both (Lisp_Object, Lisp_Object, + int, int); +extern void syms_of_marker (void); /* Defined in fileio.c */ @@ -3047,7 +3047,7 @@ EXFUN (Ffile_name_absolute_p, 1); EXFUN (Fdirectory_file_name, 1); EXFUN (Ffile_name_directory, 1); -extern Lisp_Object expand_and_dir_to_file P_ ((Lisp_Object, Lisp_Object)); +extern Lisp_Object expand_and_dir_to_file (Lisp_Object, Lisp_Object); EXFUN (Ffile_accessible_directory_p, 1); EXFUN (Funhandled_file_name_directory, 1); EXFUN (Ffile_directory_p, 1); @@ -3055,47 +3055,47 @@ EXFUN (Ffile_readable_p, 1); EXFUN (Ffile_executable_p, 1); EXFUN (Fread_file_name, 6); -extern Lisp_Object close_file_unwind P_ ((Lisp_Object)); -extern Lisp_Object restore_point_unwind P_ ((Lisp_Object)); -extern void report_file_error P_ ((const char *, Lisp_Object)) NO_RETURN; -extern int internal_delete_file P_ ((Lisp_Object)); -extern void syms_of_fileio P_ ((void)); -extern Lisp_Object make_temp_name P_ ((Lisp_Object, int)); +extern Lisp_Object close_file_unwind (Lisp_Object); +extern Lisp_Object restore_point_unwind (Lisp_Object); +extern void report_file_error (const char *, Lisp_Object) NO_RETURN; +extern int internal_delete_file (Lisp_Object); +extern void syms_of_fileio (void); +extern Lisp_Object make_temp_name (Lisp_Object, int); EXFUN (Fmake_symbolic_link, 3); extern Lisp_Object Qdelete_file; /* Defined in abbrev.c */ -extern void syms_of_abbrev P_ ((void)); +extern void syms_of_abbrev (void); /* Defined in search.c */ -extern void shrink_regexp_cache P_ ((void)); +extern void shrink_regexp_cache (void); EXFUN (Fstring_match, 3); -extern void restore_search_regs P_ ((void)); +extern void restore_search_regs (void); EXFUN (Fmatch_data, 3); EXFUN (Fset_match_data, 2); EXFUN (Fmatch_beginning, 1); EXFUN (Fmatch_end, 1); -extern void record_unwind_save_match_data P_ ((void)); +extern void record_unwind_save_match_data (void); EXFUN (Flooking_at, 1); -extern int fast_string_match P_ ((Lisp_Object, Lisp_Object)); -extern int fast_c_string_match_ignore_case P_ ((Lisp_Object, const char *)); -extern int fast_string_match_ignore_case P_ ((Lisp_Object, Lisp_Object)); -extern EMACS_INT fast_looking_at P_ ((Lisp_Object, EMACS_INT, EMACS_INT, - EMACS_INT, EMACS_INT, Lisp_Object)); -extern int scan_buffer P_ ((int, EMACS_INT, EMACS_INT, int, int *, int)); -extern int scan_newline P_ ((EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, - int, int)); -extern int find_next_newline P_ ((EMACS_INT, int)); -extern int find_next_newline_no_quit P_ ((EMACS_INT, int)); -extern int find_before_next_newline P_ ((EMACS_INT, EMACS_INT, int)); -extern void syms_of_search P_ ((void)); -extern void clear_regexp_cache P_ ((void)); +extern int fast_string_match (Lisp_Object, Lisp_Object); +extern int fast_c_string_match_ignore_case (Lisp_Object, const char *); +extern int fast_string_match_ignore_case (Lisp_Object, Lisp_Object); +extern EMACS_INT fast_looking_at (Lisp_Object, EMACS_INT, EMACS_INT, + EMACS_INT, EMACS_INT, Lisp_Object); +extern int scan_buffer (int, EMACS_INT, EMACS_INT, int, int *, int); +extern int scan_newline (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, + int, int); +extern int find_next_newline (EMACS_INT, int); +extern int find_next_newline_no_quit (EMACS_INT, int); +extern int find_before_next_newline (EMACS_INT, EMACS_INT, int); +extern void syms_of_search (void); +extern void clear_regexp_cache (void); /* Defined in minibuf.c */ extern Lisp_Object last_minibuf_string; -extern void choose_minibuf_frame P_ ((void)); +extern void choose_minibuf_frame (void); EXFUN (Fcompleting_read, 8); EXFUN (Fread_from_minibuffer, 7); EXFUN (Fread_variable, 2); @@ -3105,10 +3105,10 @@ EXFUN (Fread_string, 5); EXFUN (Fread_no_blanks_input, 3); EXFUN (Fassoc_string, 3); -extern Lisp_Object get_minibuffer P_ ((int)); -extern void temp_echo_area_glyphs P_ ((Lisp_Object)); -extern void init_minibuf_once P_ ((void)); -extern void syms_of_minibuf P_ ((void)); +extern Lisp_Object get_minibuffer (int); +extern void temp_echo_area_glyphs (Lisp_Object); +extern void init_minibuf_once (void); +extern void syms_of_minibuf (void); /* Defined in callint.c */ @@ -3117,7 +3117,7 @@ extern Lisp_Object Qcall_interactively, Qmouse_leave_buffer_hook; EXFUN (Fcall_interactively, 3); EXFUN (Fprefix_numeric_value, 1); -extern void syms_of_callint P_ ((void)); +extern void syms_of_callint (void); /* Defined in casefiddle.c */ @@ -3127,22 +3127,22 @@ EXFUN (Fupcase_region, 2); EXFUN (Fupcase_initials, 1); EXFUN (Fupcase_initials_region, 2); -extern void syms_of_casefiddle P_ ((void)); -extern void keys_of_casefiddle P_ ((void)); +extern void syms_of_casefiddle (void); +extern void keys_of_casefiddle (void); /* Defined in casetab.c */ EXFUN (Fset_case_table, 1); EXFUN (Fset_standard_case_table, 1); -extern void init_casetab_once P_ ((void)); -extern void syms_of_casetab P_ ((void)); +extern void init_casetab_once (void); +extern void syms_of_casetab (void); /* Defined in keyboard.c */ extern int echoing; extern Lisp_Object echo_message_buffer; extern struct kboard *echo_kboard; -extern void cancel_echoing P_ ((void)); +extern void cancel_echoing (void); extern Lisp_Object Qdisabled, QCfilter; extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level; extern Lisp_Object Vthrow_on_input; @@ -3152,10 +3152,10 @@ EXFUN (Ftop_level, 0); EXFUN (Fcommand_execute, 4); EXFUN (Finput_pending_p, 0); -extern Lisp_Object menu_bar_items P_ ((Lisp_Object)); -extern Lisp_Object tool_bar_items P_ ((Lisp_Object, int *)); +extern Lisp_Object menu_bar_items (Lisp_Object); +extern Lisp_Object tool_bar_items (Lisp_Object, int *); extern Lisp_Object Qvertical_scroll_bar; -extern void discard_mouse_events P_ ((void)); +extern void discard_mouse_events (void); EXFUN (Fevent_convert_list, 1); EXFUN (Fread_key_sequence, 5); EXFUN (Fset_input_interrupt_mode, 1); @@ -3164,18 +3164,18 @@ EXFUN (Fset_quit_char, 1); EXFUN (Fset_input_mode, 4); extern Lisp_Object pending_funcalls; -extern int detect_input_pending P_ ((void)); -extern int detect_input_pending_ignore_squeezables P_ ((void)); -extern int detect_input_pending_run_timers P_ ((int)); -extern void safe_run_hooks P_ ((Lisp_Object)); -extern void cmd_error_internal P_ ((Lisp_Object, char *)); -extern Lisp_Object command_loop_1 P_ ((void)); -extern Lisp_Object recursive_edit_1 P_ ((void)); -extern void record_auto_save P_ ((void)); -extern void init_keyboard P_ ((void)); -extern void syms_of_keyboard P_ ((void)); -extern void keys_of_keyboard P_ ((void)); -extern char *push_key_description P_ ((unsigned int, char *, int)); +extern int detect_input_pending (void); +extern int detect_input_pending_ignore_squeezables (void); +extern int detect_input_pending_run_timers (int); +extern void safe_run_hooks (Lisp_Object); +extern void cmd_error_internal (Lisp_Object, char *); +extern Lisp_Object command_loop_1 (void); +extern Lisp_Object recursive_edit_1 (void); +extern void record_auto_save (void); +extern void init_keyboard (void); +extern void syms_of_keyboard (void); +extern void keys_of_keyboard (void); +extern char *push_key_description (unsigned int, char *, int); /* Defined in indent.c */ @@ -3183,10 +3183,10 @@ EXFUN (Findent_to, 2); EXFUN (Fcurrent_column, 0); EXFUN (Fmove_to_column, 2); -extern double current_column P_ ((void)); -extern void invalidate_current_column P_ ((void)); -extern int indented_beyond_p P_ ((int, int, double)); -extern void syms_of_indent P_ ((void)); +extern double current_column (void); +extern void invalidate_current_column (void); +extern int indented_beyond_p (int, int, double); +extern void syms_of_indent (void); /* Defined in frame.c */ #ifdef HAVE_WINDOW_SYSTEM @@ -3194,11 +3194,11 @@ extern Lisp_Object Vx_resource_class; #endif /* HAVE_WINDOW_SYSTEM */ extern Lisp_Object Qvisible; -extern void store_frame_param P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void store_in_alist P_ ((Lisp_Object *, Lisp_Object, Lisp_Object)); -extern Lisp_Object do_switch_frame P_ ((Lisp_Object, int, int, Lisp_Object)); -extern Lisp_Object get_frame_param P_ ((struct frame *, Lisp_Object)); -extern Lisp_Object frame_buffer_predicate P_ ((Lisp_Object)); +extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object); +extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object); +extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object); +extern Lisp_Object get_frame_param (struct frame *, Lisp_Object); +extern Lisp_Object frame_buffer_predicate (Lisp_Object); EXFUN (Fframep, 1); EXFUN (Fselect_frame, 2); EXFUN (Fselected_frame, 0); @@ -3225,30 +3225,30 @@ EXFUN (Fraise_frame, 1); EXFUN (Fredirect_frame_focus, 2); EXFUN (Fset_frame_selected_window, 3); -extern Lisp_Object frame_buffer_list P_ ((Lisp_Object)); -extern void frames_discard_buffer P_ ((Lisp_Object)); -extern void set_frame_buffer_list P_ ((Lisp_Object, Lisp_Object)); -extern void frames_bury_buffer P_ ((Lisp_Object)); -extern void syms_of_frame P_ ((void)); +extern Lisp_Object frame_buffer_list (Lisp_Object); +extern void frames_discard_buffer (Lisp_Object); +extern void set_frame_buffer_list (Lisp_Object, Lisp_Object); +extern void frames_bury_buffer (Lisp_Object); +extern void syms_of_frame (void); /* Defined in emacs.c */ -extern Lisp_Object decode_env_path P_ ((char *, char *)); +extern Lisp_Object decode_env_path (char *, char *); extern Lisp_Object Vinvocation_name, Vinvocation_directory; extern Lisp_Object Vbefore_init_time, Vafter_init_time; extern Lisp_Object Vinstallation_directory; extern Lisp_Object empty_unibyte_string, empty_multibyte_string; EXFUN (Fkill_emacs, 1); #if HAVE_SETLOCALE -void fixup_locale P_ ((void)); -void synchronize_system_messages_locale P_ ((void)); -void synchronize_system_time_locale P_ ((void)); +void fixup_locale (void); +void synchronize_system_messages_locale (void); +void synchronize_system_time_locale (void); #else #define setlocale(category, locale) #define fixup_locale() #define synchronize_system_messages_locale() #define synchronize_system_time_locale() #endif -void shut_down_emacs P_ ((int, int, Lisp_Object)); +void shut_down_emacs (int, int, Lisp_Object); /* Nonzero means don't do interactive redisplay and don't change tty modes. */ extern int noninteractive; @@ -3274,68 +3274,68 @@ EXFUN (Fprocess_send_eof, 1); EXFUN (Fwaiting_for_user_input_p, 0); extern Lisp_Object Qprocessp; -extern void kill_buffer_processes P_ ((Lisp_Object)); -extern int wait_reading_process_output P_ ((int, int, int, int, - Lisp_Object, - struct Lisp_Process *, - int)); -extern void add_keyboard_wait_descriptor P_ ((int)); -extern void delete_keyboard_wait_descriptor P_ ((int)); -extern void add_gpm_wait_descriptor P_ ((int)); -extern void delete_gpm_wait_descriptor P_ ((int)); -extern void close_process_descs P_ ((void)); -extern void init_process P_ ((void)); -extern void syms_of_process P_ ((void)); -extern void setup_process_coding_systems P_ ((Lisp_Object)); +extern void kill_buffer_processes (Lisp_Object); +extern int wait_reading_process_output (int, int, int, int, + Lisp_Object, + struct Lisp_Process *, + int); +extern void add_keyboard_wait_descriptor (int); +extern void delete_keyboard_wait_descriptor (int); +extern void add_gpm_wait_descriptor (int); +extern void delete_gpm_wait_descriptor (int); +extern void close_process_descs (void); +extern void init_process (void); +extern void syms_of_process (void); +extern void setup_process_coding_systems (Lisp_Object); /* Defined in callproc.c */ extern Lisp_Object Vexec_path, Vexec_suffixes, Vexec_directory, Vdata_directory; extern Lisp_Object Vdoc_directory; EXFUN (Fcall_process, MANY); -extern int child_setup P_ ((int, int, int, char **, int, Lisp_Object)); -extern void init_callproc_1 P_ ((void)); -extern void init_callproc P_ ((void)); -extern void set_initial_environment P_ ((void)); -extern void syms_of_callproc P_ ((void)); +extern int child_setup (int, int, int, char **, int, Lisp_Object); +extern void init_callproc_1 (void); +extern void init_callproc (void); +extern void set_initial_environment (void); +extern void syms_of_callproc (void); /* Defined in doc.c */ extern Lisp_Object Vdoc_file_name; EXFUN (Fsubstitute_command_keys, 1); EXFUN (Fdocumentation, 2); EXFUN (Fdocumentation_property, 3); -extern Lisp_Object read_doc_string P_ ((Lisp_Object)); -extern Lisp_Object get_doc_string P_ ((Lisp_Object, int, int)); -extern void syms_of_doc P_ ((void)); -extern int read_bytecode_char P_ ((int)); +extern Lisp_Object read_doc_string (Lisp_Object); +extern Lisp_Object get_doc_string (Lisp_Object, int, int); +extern void syms_of_doc (void); +extern int read_bytecode_char (int); /* Defined in bytecode.c */ extern Lisp_Object Qbytecode; EXFUN (Fbyte_code, 3); -extern void syms_of_bytecode P_ ((void)); +extern void syms_of_bytecode (void); extern struct byte_stack *byte_stack_list; -extern void mark_byte_stack P_ ((void)); -extern void unmark_byte_stack P_ ((void)); +extern void mark_byte_stack (void); +extern void unmark_byte_stack (void); /* Defined in macros.c */ extern Lisp_Object Qexecute_kbd_macro; EXFUN (Fexecute_kbd_macro, 3); EXFUN (Fcancel_kbd_macro_events, 0); -extern void init_macros P_ ((void)); -extern void syms_of_macros P_ ((void)); +extern void init_macros (void); +extern void syms_of_macros (void); /* Defined in undo.c */ extern Lisp_Object Qinhibit_read_only; EXFUN (Fundo_boundary, 0); -extern void truncate_undo_list P_ ((struct buffer *)); -extern void record_marker_adjustment P_ ((Lisp_Object, int)); -extern void record_insert P_ ((int, int)); -extern void record_delete P_ ((int, Lisp_Object)); -extern void record_first_change P_ ((void)); -extern void record_change P_ ((int, int)); -extern void record_property_change P_ ((int, int, Lisp_Object, Lisp_Object, - Lisp_Object)); -extern void syms_of_undo P_ ((void)); +extern void truncate_undo_list (struct buffer *); +extern void record_marker_adjustment (Lisp_Object, int); +extern void record_insert (int, int); +extern void record_delete (int, Lisp_Object); +extern void record_first_change (void); +extern void record_change (int, int); +extern void record_property_change (int, int, Lisp_Object, Lisp_Object, + Lisp_Object); +extern void syms_of_undo (void); extern Lisp_Object Vundo_outer_limit; /* Defined in textprop.c */ @@ -3349,19 +3349,19 @@ EXFUN (Fget_text_property, 3); EXFUN (Fprevious_char_property_change, 2); EXFUN (Fnext_char_property_change, 2); -extern void report_interval_modification P_ ((Lisp_Object, Lisp_Object)); -extern Lisp_Object next_single_char_property_change P_ ((Lisp_Object, - Lisp_Object, - Lisp_Object, - Lisp_Object)); +extern void report_interval_modification (Lisp_Object, Lisp_Object); +extern Lisp_Object next_single_char_property_change (Lisp_Object, + Lisp_Object, + Lisp_Object, + Lisp_Object); /* Defined in menu.c */ -extern void syms_of_menu P_ ((void)); +extern void syms_of_menu (void); /* Defined in xmenu.c */ EXFUN (Fx_popup_menu, 2); EXFUN (Fx_popup_dialog, 3); -extern void syms_of_xmenu P_ ((void)); +extern void syms_of_xmenu (void); /* Defined in termchar.h */ struct tty_display_info; @@ -3371,73 +3371,73 @@ /* Defined in sysdep.c */ #ifndef HAVE_GET_CURRENT_DIR_NAME -extern char *get_current_dir_name P_ ((void)); +extern char *get_current_dir_name (void); #endif -extern void stuff_char P_ ((char c)); -extern void init_sigio P_ ((int)); -extern void sys_subshell P_ ((void)); -extern void sys_suspend P_ ((void)); -extern void discard_tty_input P_ ((void)); -extern void init_sys_modes P_ ((struct tty_display_info *)); -extern void reset_sys_modes P_ ((struct tty_display_info *)); -extern void init_all_sys_modes P_ ((void)); -extern void reset_all_sys_modes P_ ((void)); -extern void wait_for_termination P_ ((int)); -extern void flush_pending_output P_ ((int)); -extern void child_setup_tty P_ ((int)); -extern void setup_pty P_ ((int)); -extern int set_window_size P_ ((int, int, int)); -extern void create_process P_ ((Lisp_Object, char **, Lisp_Object)); -extern int emacs_open P_ ((const char *, int, int)); -extern int emacs_close P_ ((int)); -extern int emacs_read P_ ((int, char *, unsigned int)); -extern int emacs_write P_ ((int, const char *, unsigned int)); +extern void stuff_char (char c); +extern void init_sigio (int); +extern void sys_subshell (void); +extern void sys_suspend (void); +extern void discard_tty_input (void); +extern void init_sys_modes (struct tty_display_info *); +extern void reset_sys_modes (struct tty_display_info *); +extern void init_all_sys_modes (void); +extern void reset_all_sys_modes (void); +extern void wait_for_termination (int); +extern void flush_pending_output (int); +extern void child_setup_tty (int); +extern void setup_pty (int); +extern int set_window_size (int, int, int); +extern void create_process (Lisp_Object, char **, Lisp_Object); +extern int emacs_open (const char *, int, int); +extern int emacs_close (int); +extern int emacs_read (int, char *, unsigned int); +extern int emacs_write (int, const char *, unsigned int); /* Defined in filelock.c */ EXFUN (Funlock_buffer, 0); EXFUN (Ffile_locked_p, 1); -extern void unlock_all_files P_ ((void)); -extern void lock_file P_ ((Lisp_Object)); -extern void unlock_file P_ ((Lisp_Object)); -extern void unlock_buffer P_ ((struct buffer *)); -extern void syms_of_filelock P_ ((void)); -extern void init_filelock P_ ((void)); +extern void unlock_all_files (void); +extern void lock_file (Lisp_Object); +extern void unlock_file (Lisp_Object); +extern void unlock_buffer (struct buffer *); +extern void syms_of_filelock (void); +extern void init_filelock (void); /* Defined in sound.c */ -extern void syms_of_sound P_ ((void)); -extern void init_sound P_ ((void)); +extern void syms_of_sound (void); +extern void init_sound (void); /* Defined in category.c */ -extern void init_category_once P_ ((void)); -extern Lisp_Object char_category_set P_ ((int)); -extern void syms_of_category P_ ((void)); +extern void init_category_once (void); +extern Lisp_Object char_category_set (int); +extern void syms_of_category (void); /* Defined in ccl.c */ -extern void syms_of_ccl P_ ((void)); +extern void syms_of_ccl (void); /* Defined in dired.c */ EXFUN (Ffile_attributes, 2); -extern void syms_of_dired P_ ((void)); -extern Lisp_Object directory_files_internal P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, - int, Lisp_Object)); +extern void syms_of_dired (void); +extern Lisp_Object directory_files_internal (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, + int, Lisp_Object); /* Defined in term.c */ -extern void syms_of_term P_ ((void)); -extern void fatal P_ ((const char *msgid, ...)) NO_RETURN; +extern void syms_of_term (void); +extern void fatal (const char *msgid, ...) NO_RETURN; /* Defined in terminal.c */ EXFUN (Fframe_terminal, 1); EXFUN (Fdelete_terminal, 2); -extern void syms_of_terminal P_ ((void)); +extern void syms_of_terminal (void); /* Defined in font.c */ -extern void syms_of_font P_ ((void)); -extern void init_font P_ ((void)); +extern void syms_of_font (void); +extern void init_font (void); #ifdef HAVE_WINDOW_SYSTEM /* Defined in fontset.c */ -extern void syms_of_fontset P_ ((void)); +extern void syms_of_fontset (void); EXFUN (Fset_fontset_font, 5); EXFUN (Fnew_fontset, 2); @@ -3450,26 +3450,26 @@ /* Defined in xfaces.c */ EXFUN (Fclear_face_cache, 1); EXFUN (Fx_load_color_file, 1); -extern void syms_of_xfaces P_ ((void)); +extern void syms_of_xfaces (void); #ifndef HAVE_GETLOADAVG /* Defined in getloadavg.c */ -extern int getloadavg P_ ((double *, int)); +extern int getloadavg (double *, int); #endif #ifdef HAVE_X_WINDOWS /* Defined in xfns.c */ -extern void syms_of_xfns P_ ((void)); +extern void syms_of_xfns (void); /* Defined in xsmfns.c */ -extern void syms_of_xsmfns P_ ((void)); +extern void syms_of_xsmfns (void); /* Defined in xselect.c */ EXFUN (Fx_send_client_event, 6); -extern void syms_of_xselect P_ ((void)); +extern void syms_of_xselect (void); /* Defined in xterm.c */ -extern void syms_of_xterm P_ ((void)); +extern void syms_of_xterm (void); #endif /* HAVE_X_WINDOWS */ #ifdef MSDOS @@ -3479,14 +3479,14 @@ #ifdef HAVE_MENUS /* Defined in (x|w32)fns.c, nsfns.m... */ -extern int have_menus_p P_ ((void)); +extern int have_menus_p (void); #endif #ifdef HAVE_DBUS /* Defined in dbusbind.c */ -int xd_pending_messages P_ ((void)); -void xd_read_queued_messages P_ ((void)); -void syms_of_dbusbind P_ ((void)); +int xd_pending_messages (void); +void xd_read_queued_messages (void); +void syms_of_dbusbind (void); #endif /* Nonzero means Emacs has already been initialized. @@ -3495,16 +3495,16 @@ extern int immediate_quit; /* Nonzero means ^G can quit instantly */ -extern POINTER_TYPE *xmalloc P_ ((size_t)); -extern POINTER_TYPE *xrealloc P_ ((POINTER_TYPE *, size_t)); -extern void xfree P_ ((POINTER_TYPE *)); - -extern char *xstrdup P_ ((const char *)); - -extern char *egetenv P_ ((char *)); +extern POINTER_TYPE *xmalloc (size_t); +extern POINTER_TYPE *xrealloc (POINTER_TYPE *, size_t); +extern void xfree (POINTER_TYPE *); + +extern char *xstrdup (const char *); + +extern char *egetenv (char *); /* Set up the name of the machine we're running on. */ -extern void init_system_name P_ ((void)); +extern void init_system_name (void); /* Some systems (e.g., NT) use a different path separator than Unix, in addition to a device separator. Set the path separator
--- a/src/macros.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/macros.h Fri Jul 02 11:26:33 2010 +0200 @@ -41,16 +41,16 @@ /* Finish defining the current keyboard macro. */ -extern void end_kbd_macro P_ ((void)); +extern void end_kbd_macro (void); /* Declare that all chars stored so far in the kbd macro being defined really belong to it. This is done in between editor commands. */ -extern void finalize_kbd_macro_chars P_ ((void)); +extern void finalize_kbd_macro_chars (void); /* Store a character into kbd macro being defined */ -extern void store_kbd_macro_char P_ ((Lisp_Object)); +extern void store_kbd_macro_char (Lisp_Object); /* arch-tag: 8edb7088-682f-4d1f-a4d9-0fbb7284234e (do not change this comment) */
--- a/src/md5.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/md5.h Fri Jul 02 11:26:33 2010 +0200 @@ -97,21 +97,21 @@ /* Initialize structure containing state of computation. (RFC 1321, 3.3: Step 3) */ -extern void md5_init_ctx __P ((struct md5_ctx *ctx)); +extern void md5_init_ctx (struct md5_ctx *ctx); /* Starting with the result of former calls of this function (or the initialization function update the context for the next LEN bytes starting at BUFFER. It is necessary that LEN is a multiple of 64!!! */ -extern void md5_process_block __P ((const void *buffer, size_t len, - struct md5_ctx *ctx)); +extern void md5_process_block (const void *buffer, size_t len, + struct md5_ctx *ctx); /* Starting with the result of former calls of this function (or the initialization function update the context for the next LEN bytes starting at BUFFER. It is NOT required that LEN is a multiple of 64. */ -extern void md5_process_bytes __P ((const void *buffer, size_t len, - struct md5_ctx *ctx)); +extern void md5_process_bytes (const void *buffer, size_t len, + struct md5_ctx *ctx); /* Process the remaining bytes in the buffer and put result from CTX in first 16 bytes following RESBUF. The result is always in little @@ -120,7 +120,7 @@ IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ -extern void *md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf)); +extern void *md5_finish_ctx (struct md5_ctx *ctx, void *resbuf); /* Put result from CTX in first 16 bytes following RESBUF. The result is @@ -129,20 +129,20 @@ IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ -extern void *md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf)); +extern void *md5_read_ctx (const struct md5_ctx *ctx, void *resbuf); /* Compute MD5 message digest for bytes read from STREAM. The resulting message digest number will be written into the 16 bytes beginning at RESBLOCK. */ -extern int md5_stream __P ((FILE *stream, void *resblock)); +extern int md5_stream (FILE *stream, void *resblock); /* Compute MD5 message digest for LEN bytes beginning at BUFFER. The result is always in little endian byte order, so that a byte-wise output yields to the wanted ASCII representation of the message digest. */ -extern void *md5_buffer __P ((const char *buffer, size_t len, - void *resblock)); +extern void *md5_buffer (const char *buffer, size_t len, + void *resblock); #endif /* md5.h */
--- a/src/menu.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/menu.h Fri Jul 02 11:26:33 2010 +0200 @@ -21,17 +21,17 @@ extern Lisp_Object Vmenu_updating_frame; -extern void init_menu_items P_ ((void)); -extern void finish_menu_items P_ ((void)); -extern void discard_menu_items P_ ((void)); -extern void save_menu_items P_ ((void)); -extern int parse_single_submenu P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); -extern void list_of_panes P_ ((Lisp_Object)); +extern void init_menu_items (void); +extern void finish_menu_items (void); +extern void discard_menu_items (void); +extern void save_menu_items (void); +extern int parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object); +extern void list_of_panes (Lisp_Object); #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) -extern void free_menubar_widget_value_tree P_ ((widget_value *)); -extern void update_submenu_strings P_ ((widget_value *)); -extern void find_and_call_menu_selection P_ ((FRAME_PTR, int, - Lisp_Object, void *)); +extern void free_menubar_widget_value_tree (widget_value *); +extern void update_submenu_strings (widget_value *); +extern void find_and_call_menu_selection (FRAME_PTR, int, + Lisp_Object, void *); #endif #ifdef HAVE_X_WINDOWS
--- a/src/msdos.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/msdos.h Fri Jul 02 11:26:33 2010 +0200 @@ -70,9 +70,9 @@ /* Defined in xfns.c; emulated on msdos.c */ -extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern int x_pixel_width P_ ((struct frame *)); -extern int x_pixel_height P_ ((struct frame *)); +extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); +extern int x_pixel_width (struct frame *); +extern int x_pixel_height (struct frame *); #define XFreeGC (void) #define x_destroy_bitmap(p1,p2)
--- a/src/nsterm.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/nsterm.h Fri Jul 02 11:26:33 2010 +0200 @@ -760,8 +760,8 @@ extern void ns_put_pixel (void *img, int x, int y, unsigned long argb); extern void ns_set_alpha (void *img, int x, int y, unsigned char a); -extern int x_display_pixel_height P_ ((struct ns_display_info *)); -extern int x_display_pixel_width P_ ((struct ns_display_info *)); +extern int x_display_pixel_height (struct ns_display_info *); +extern int x_display_pixel_width (struct ns_display_info *); /* This in nsterm.m */ extern unsigned long ns_get_rgb_color (struct frame *f,
--- a/src/puresize.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/puresize.h Fri Jul 02 11:26:33 2010 +0200 @@ -72,7 +72,7 @@ { if (PURE_P (obj)) \ pure_write_error (); } -extern void pure_write_error P_ ((void)) NO_RETURN; +extern void pure_write_error (void) NO_RETURN; /* Define PURE_P. */
--- a/src/region-cache.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/region-cache.h Fri Jul 02 11:26:33 2010 +0200 @@ -61,17 +61,17 @@ /* Allocate, initialize and return a new, empty region cache. */ -struct region_cache *new_region_cache P_ ((void)); +struct region_cache *new_region_cache (void); /* Free a region cache. */ -void free_region_cache P_ ((struct region_cache *)); +void free_region_cache (struct region_cache *); /* Assert that the region of BUF between START and END (absolute buffer positions) is "known," for the purposes of CACHE (e.g. "has no newlines", in the case of the line cache). */ -extern void know_region_cache P_ ((struct buffer *BUF, - struct region_cache *CACHE, - int START, int END)); +extern void know_region_cache (struct buffer *BUF, + struct region_cache *CACHE, + int START, int END); /* Indicate that a section of BUF has changed, to invalidate CACHE. HEAD is the number of chars unchanged at the beginning of the buffer. @@ -81,9 +81,9 @@ (This way of specifying regions makes more sense than absolute buffer positions in the presence of insertions and deletions; the args to pass are the same before and after such an operation.) */ -extern void invalidate_region_cache P_ ((struct buffer *BUF, - struct region_cache *CACHE, - int HEAD, int TAIL)); +extern void invalidate_region_cache (struct buffer *BUF, + struct region_cache *CACHE, + int HEAD, int TAIL); /* The scanning functions. @@ -97,18 +97,18 @@ /* Return true if the text immediately after POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest position after POS where the knownness changes. */ -extern int region_cache_forward P_ ((struct buffer *BUF, - struct region_cache *CACHE, - int POS, - int *NEXT)); +extern int region_cache_forward (struct buffer *BUF, + struct region_cache *CACHE, + int POS, + int *NEXT); /* Return true if the text immediately before POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest position before POS where the knownness changes. */ -extern int region_cache_backward P_ ((struct buffer *BUF, - struct region_cache *CACHE, - int POS, - int *NEXT)); +extern int region_cache_backward (struct buffer *BUF, + struct region_cache *CACHE, + int POS, + int *NEXT); /* arch-tag: 70f79125-ef22-4f58-9aec-a48ca2791435 (do not change this comment) */
--- a/src/syntax.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/syntax.h Fri Jul 02 11:26:33 2010 +0200 @@ -19,7 +19,7 @@ extern Lisp_Object Qsyntax_table_p; -extern void update_syntax_table P_ ((int, int, int, Lisp_Object)); +extern void update_syntax_table (int, int, int, Lisp_Object); /* The standard syntax table is stored where it will automatically be used in all new buffers. */ @@ -346,9 +346,9 @@ extern struct gl_state_s gl_state; extern int parse_sexp_lookup_properties; -extern INTERVAL interval_of P_ ((int, Lisp_Object)); +extern INTERVAL interval_of (int, Lisp_Object); -extern int scan_words P_ ((int, int)); +extern int scan_words (int, int); /* arch-tag: 28833cca-cd73-4741-8c85-a3111166a0e0 (do not change this comment) */
--- a/src/syssignal.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/syssignal.h Fri Jul 02 11:26:33 2010 +0200 @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -extern void init_signals P_ ((void)); +extern void init_signals (void); #if defined (HAVE_GTK_AND_PTHREAD) || defined (HAVE_NS) #include <pthread.h> @@ -78,10 +78,10 @@ appears to be assumed in the source, for example data.c:arith_error. */ typedef RETSIGTYPE (*signal_handler_t) (/*int*/); -signal_handler_t sys_signal P_ ((int signal_number, signal_handler_t action)); -sigset_t sys_sigblock P_ ((sigset_t new_mask)); -sigset_t sys_sigunblock P_ ((sigset_t new_mask)); -sigset_t sys_sigsetmask P_ ((sigset_t new_mask)); +signal_handler_t sys_signal (int signal_number, signal_handler_t action); +sigset_t sys_sigblock (sigset_t new_mask); +sigset_t sys_sigunblock (sigset_t new_mask); +sigset_t sys_sigsetmask (sigset_t new_mask); #define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG)
--- a/src/systime.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/systime.h Fri Jul 02 11:26:33 2010 +0200 @@ -136,17 +136,17 @@ #define EMACS_SET_SECS_USECS(time, secs, usecs) \ (EMACS_SET_SECS (time, secs), EMACS_SET_USECS (time, usecs)) -extern int set_file_times __P ((const char *, EMACS_TIME, EMACS_TIME)); +extern int set_file_times (const char *, EMACS_TIME, EMACS_TIME); /* defined in keyboard.c */ -extern void set_waiting_for_input __P ((EMACS_TIME *)); +extern void set_waiting_for_input (EMACS_TIME *); /* When lisp.h is not included Lisp_Object is not defined (this can happen when this files is used outside the src directory). Use GCPRO1 to determine if lisp.h was included. */ #ifdef GCPRO1 /* defined in dired.c */ -extern Lisp_Object make_time __P ((time_t)); +extern Lisp_Object make_time (time_t); #endif /* Compare times T1 and T2. Value is 0 if T1 and T2 are the same.
--- a/src/termhooks.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/termhooks.h Fri Jul 02 11:26:33 2010 +0200 @@ -39,7 +39,7 @@ /* If the value of the frame parameter changed, whis hook is called. For example, if going from fullscreen to not fullscreen this hook may do something OS dependent, like extended window manager hints on X11. */ -extern void (*fullscreen_hook) P_ ((struct frame *f)); +extern void (*fullscreen_hook) (struct frame *f); /* Input queue declarations and hooks. */ @@ -415,28 +415,28 @@ /* Text display hooks. */ - void (*cursor_to_hook) P_ ((struct frame *f, int vpos, int hpos)); - void (*raw_cursor_to_hook) P_ ((struct frame *, int, int)); + void (*cursor_to_hook) (struct frame *f, int vpos, int hpos); + void (*raw_cursor_to_hook) (struct frame *, int, int); - void (*clear_to_end_hook) P_ ((struct frame *)); - void (*clear_frame_hook) P_ ((struct frame *)); - void (*clear_end_of_line_hook) P_ ((struct frame *, int)); + void (*clear_to_end_hook) (struct frame *); + void (*clear_frame_hook) (struct frame *); + void (*clear_end_of_line_hook) (struct frame *, int); - void (*ins_del_lines_hook) P_ ((struct frame *f, int, int)); + void (*ins_del_lines_hook) (struct frame *f, int, int); - void (*insert_glyphs_hook) P_ ((struct frame *f, struct glyph *s, int n)); - void (*write_glyphs_hook) P_ ((struct frame *f, struct glyph *s, int n)); - void (*delete_glyphs_hook) P_ ((struct frame *, int)); + void (*insert_glyphs_hook) (struct frame *f, struct glyph *s, int n); + void (*write_glyphs_hook) (struct frame *f, struct glyph *s, int n); + void (*delete_glyphs_hook) (struct frame *, int); - void (*ring_bell_hook) P_ ((struct frame *f)); - void (*toggle_invisible_pointer_hook) P_ ((struct frame *f, int invisible)); + void (*ring_bell_hook) (struct frame *f); + void (*toggle_invisible_pointer_hook) (struct frame *f, int invisible); - void (*reset_terminal_modes_hook) P_ ((struct terminal *)); - void (*set_terminal_modes_hook) P_ ((struct terminal *)); + void (*reset_terminal_modes_hook) (struct terminal *); + void (*set_terminal_modes_hook) (struct terminal *); - void (*update_begin_hook) P_ ((struct frame *)); - void (*update_end_hook) P_ ((struct frame *)); - void (*set_terminal_window_hook) P_ ((struct frame *, int)); + void (*update_begin_hook) (struct frame *); + void (*update_end_hook) (struct frame *); + void (*set_terminal_window_hook) (struct frame *, int); /* Multi-frame and mouse support hooks. */ @@ -458,12 +458,12 @@ This should clear mouse_moved until the next motion event arrives. */ - void (*mouse_position_hook) P_ ((struct frame **f, int, - Lisp_Object *bar_window, - enum scroll_bar_part *part, - Lisp_Object *x, - Lisp_Object *y, - unsigned long *time)); + void (*mouse_position_hook) (struct frame **f, int, + Lisp_Object *bar_window, + enum scroll_bar_part *part, + Lisp_Object *x, + Lisp_Object *y, + unsigned long *time); /* The window system handling code should set this if the mouse has moved since the last call to the mouse_position_hook. Calling that @@ -473,7 +473,7 @@ /* When a frame's focus redirection is changed, this hook tells the window system code to re-decide where to put the highlight. Under X, this means that Emacs lies about where the focus is. */ - void (*frame_rehighlight_hook) P_ ((struct frame *)); + void (*frame_rehighlight_hook) (struct frame *); /* If we're displaying frames using a window system that can stack frames on top of each other, this hook allows you to bring a frame @@ -485,12 +485,12 @@ If RAISE is non-zero, F is brought to the front, before all other windows. If RAISE is zero, F is sent to the back, behind all other windows. */ - void (*frame_raise_lower_hook) P_ ((struct frame *f, int raise)); + void (*frame_raise_lower_hook) (struct frame *f, int raise); /* If the value of the frame parameter changed, whis hook is called. For example, if going from fullscreen to not fullscreen this hook may do something OS dependent, like extended window manager hints on X11. */ - void (*fullscreen_hook) P_ ((struct frame *f)); + void (*fullscreen_hook) (struct frame *f); /* Scroll bar hooks. */ @@ -520,9 +520,9 @@ indicate that we are displaying PORTION characters out of a total of WHOLE characters, starting at POSITION. If WINDOW doesn't yet have a scroll bar, create one for it. */ - void (*set_vertical_scroll_bar_hook) P_ ((struct window *window, - int portion, int whole, - int position)); + void (*set_vertical_scroll_bar_hook) (struct window *window, + int portion, int whole, + int position); /* The following three hooks are used when we're doing a thorough @@ -545,11 +545,11 @@ If non-zero, this hook should be safe to apply to any frame, whether or not it can support scroll bars, and whether or not it is currently displaying them. */ - void (*condemn_scroll_bars_hook) P_ ((struct frame *frame)); + void (*condemn_scroll_bars_hook) (struct frame *frame); /* Unmark WINDOW's scroll bar for deletion in this judgement cycle. Note that it's okay to redeem a scroll bar that is not condemned. */ - void (*redeem_scroll_bar_hook) P_ ((struct window *window)); + void (*redeem_scroll_bar_hook) (struct window *window); /* Remove all scroll bars on FRAME that haven't been saved since the last call to `*condemn_scroll_bars_hook'. @@ -562,7 +562,7 @@ If non-zero, this hook should be safe to apply to any frame, whether or not it can support scroll bars, and whether or not it is currently displaying them. */ - void (*judge_scroll_bars_hook) P_ ((struct frame *FRAME)); + void (*judge_scroll_bars_hook) (struct frame *FRAME); /* Called to read input events. @@ -584,17 +584,17 @@ Therefore, in most cases EXPECTED should be simply ignored. XXX This documentation needs to be updated. */ - int (*read_socket_hook) P_ ((struct terminal *terminal, - int expected, - struct input_event *hold_quit)); + int (*read_socket_hook) (struct terminal *terminal, + int expected, + struct input_event *hold_quit); /* Called when a frame's display becomes entirely up to date. */ - void (*frame_up_to_date_hook) P_ ((struct frame *)); + void (*frame_up_to_date_hook) (struct frame *); /* Called to delete the device-specific portions of a frame that is on this terminal device. */ - void (*delete_frame_hook) P_ ((struct frame *)); + void (*delete_frame_hook) (struct frame *); /* Called after the last frame on this terminal is deleted, or when the display device was closed (hangup). @@ -606,7 +606,7 @@ on the terminal. delete_frame ensures that there are no live frames on the terminal when it calls this hook, so infinite recursion is prevented. */ - void (*delete_terminal_hook) P_ ((struct terminal *)); + void (*delete_terminal_hook) (struct terminal *); }; @@ -647,10 +647,10 @@ /* 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 P_ ((struct terminal *, Lisp_Object)); -extern struct terminal *get_terminal P_ ((Lisp_Object terminal, int)); -extern struct terminal *create_terminal P_ ((void)); -extern void delete_terminal P_ ((struct terminal *)); +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 *); /* The initial terminal device, created by initial_term_init. */ extern struct terminal *initial_terminal;
--- a/src/w32term.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/w32term.h Fri Jul 02 11:26:33 2010 +0200 @@ -228,14 +228,14 @@ struct w32_display_info *x_display_info_for_name (); -Lisp_Object display_x_get_resource P_ ((struct w32_display_info *, - Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object)); +Lisp_Object display_x_get_resource (struct w32_display_info *, + Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object); extern struct w32_display_info *w32_term_init (); -extern int x_display_pixel_height P_ ((struct w32_display_info *)); -extern int x_display_pixel_width P_ ((struct w32_display_info *)); +extern int x_display_pixel_height (struct w32_display_info *); +extern int x_display_pixel_width (struct w32_display_info *); #define PIX_TYPE COLORREF
--- a/src/widget.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/widget.h Fri Jul 02 11:26:33 2010 +0200 @@ -94,8 +94,8 @@ extern struct _DisplayContext* display_context; /* Special entrypoints */ -void EmacsFrameSetCharSize P_ ((Widget, int, int)); -void widget_store_internal_border P_ ((Widget widget)); +void EmacsFrameSetCharSize (Widget, int, int); +void widget_store_internal_border (Widget widget); #endif /* _EmacsFrame_h */
--- a/src/window.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/window.h Fri Jul 02 11:26:33 2010 +0200 @@ -785,25 +785,25 @@ EXFUN (Fset_window_margins, 3); EXFUN (Fwindow_live_p, 1); EXFUN (Fset_window_point, 2); -extern Lisp_Object make_window P_ ((void)); -extern void delete_window P_ ((Lisp_Object)); -extern Lisp_Object window_from_coordinates P_ ((struct frame *, int, int, - enum window_part *, - int *, int*, int)); +extern Lisp_Object make_window (void); +extern void delete_window (Lisp_Object); +extern Lisp_Object window_from_coordinates (struct frame *, int, int, + enum window_part *, + int *, int*, int); EXFUN (Fwindow_dedicated_p, 1); -extern int window_height P_ ((Lisp_Object)); -extern int window_width P_ ((Lisp_Object)); +extern int window_height (Lisp_Object); +extern int window_width (Lisp_Object); EXFUN (Fwindow_full_width_p, 1); -extern void set_window_height P_ ((Lisp_Object, int, int)); -extern void set_window_width P_ ((Lisp_Object, int, int)); -extern void change_window_heights P_ ((Lisp_Object, int)); -extern void delete_all_subwindows P_ ((struct window *)); -extern void freeze_window_starts P_ ((struct frame *, int)); -extern void foreach_window P_ ((struct frame *, - int (* fn) (struct window *, void *), - void *)); -extern void grow_mini_window P_ ((struct window *, int)); -extern void shrink_mini_window P_ ((struct window *)); +extern void set_window_height (Lisp_Object, int, int); +extern void set_window_width (Lisp_Object, int, int); +extern void change_window_heights (Lisp_Object, int); +extern void delete_all_subwindows (struct window *); +extern void freeze_window_starts (struct frame *, int); +extern void foreach_window (struct frame *, + int (* fn) (struct window *, void *), + void *); +extern void grow_mini_window (struct window *, int); +extern void shrink_mini_window (struct window *); void run_window_configuration_change_hook (struct frame *f); @@ -811,8 +811,8 @@ means it's allowed to run hooks. See make_frame for a case where it's not allowed. */ -void set_window_buffer P_ ((Lisp_Object window, Lisp_Object buffer, - int run_hooks_p, int keep_margins_p)); +void set_window_buffer (Lisp_Object window, Lisp_Object buffer, + int run_hooks_p, int keep_margins_p); /* Prompt to display in front of the minibuffer contents. */ @@ -862,13 +862,13 @@ /* If *ROWS or *COLS are too small a size for FRAME, set them to the minimum allowable size. */ -extern void check_frame_size P_ ((struct frame *frame, int *rows, int *cols)); +extern void check_frame_size (struct frame *frame, int *rows, int *cols); /* Return a pointer to the glyph W's physical cursor is on. Value is null if W's current matrix is invalid, so that no meaningfull glyph can be returned. */ -struct glyph *get_phys_cursor_glyph P_ ((struct window *w)); +struct glyph *get_phys_cursor_glyph (struct window *w); /* Value is non-zero if WINDOW is a live window. */ @@ -891,24 +891,24 @@ EXFUN (Fsplit_window, 3); EXFUN (Fset_window_configuration, 1); EXFUN (Fcurrent_window_configuration, 1); -extern int compare_window_configurations P_ ((Lisp_Object, Lisp_Object, int)); +extern int compare_window_configurations (Lisp_Object, Lisp_Object, int); EXFUN (Fcoordinates_in_window_p, 2); EXFUN (Fwindow_at, 3); EXFUN (Fpos_visible_in_window_p, 3); -extern void mark_window_cursors_off P_ ((struct window *)); -extern int window_internal_height P_ ((struct window *)); -extern int window_internal_width P_ ((struct window *)); +extern void mark_window_cursors_off (struct window *); +extern int window_internal_height (struct window *); +extern int window_internal_width (struct window *); EXFUN (Frecenter, 1); EXFUN (Fscroll_other_window, 1); EXFUN (Fset_window_start, 3); -extern void temp_output_buffer_show P_ ((Lisp_Object)); -extern void replace_buffer_in_all_windows P_ ((Lisp_Object)); -extern void init_window_once P_ ((void)); -extern void init_window P_ ((void)); -extern void syms_of_window P_ ((void)); -extern void keys_of_window P_ ((void)); +extern void temp_output_buffer_show (Lisp_Object); +extern void replace_buffer_in_all_windows (Lisp_Object); +extern void init_window_once (void); +extern void init_window (void); +extern void syms_of_window (void); +extern void keys_of_window (void); -extern int window_box_text_cols P_ ((struct window *w)); +extern int window_box_text_cols (struct window *w); #endif /* not WINDOW_H_INCLUDED */
--- a/src/xgselect.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/xgselect.h Fri Jul 02 11:26:33 2010 +0200 @@ -24,13 +24,13 @@ #include "systime.h" #include "sysselect.h" -extern int xg_select P_ ((int max_fds, - SELECT_TYPE *rfds, - SELECT_TYPE *wfds, - SELECT_TYPE *efds, - EMACS_TIME *timeout)); +extern int xg_select (int max_fds, + SELECT_TYPE *rfds, + SELECT_TYPE *wfds, + SELECT_TYPE *efds, + EMACS_TIME *timeout); -extern void xgselect_initialize P_ ((void)); +extern void xgselect_initialize (void); #endif /* XGSELECT_H */
--- a/src/xsettings.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/xsettings.h Fri Jul 02 11:26:33 2010 +0200 @@ -24,11 +24,11 @@ EXFUN (Ffont_get_system_normal_font, 0); EXFUN (Ftool_bar_get_system_style, 0); -extern void xsettings_initialize P_ ((struct x_display_info *dpyinfo)); -extern void xft_settings_event P_ ((struct x_display_info *dpyinfo, - XEvent *)); -extern const char *xsettings_get_system_font P_ ((void)); -extern const char *xsettings_get_system_normal_font P_ ((void)); +extern void xsettings_initialize (struct x_display_info *dpyinfo); +extern void xft_settings_event (struct x_display_info *dpyinfo, + XEvent *); +extern const char *xsettings_get_system_font (void); +extern const char *xsettings_get_system_normal_font (void); #endif /* XSETTINGS_H */
--- a/src/xterm.h Fri Jul 02 01:11:24 2010 -0700 +++ b/src/xterm.h Fri Jul 02 11:26:33 2010 +0200 @@ -378,13 +378,13 @@ #endif /* This checks to make sure we have a display. */ -extern void check_x P_ ((void)); +extern void check_x (void); -extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); +extern struct frame *x_window_to_frame (struct x_display_info *, int); -extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); -extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int)); -extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); +extern struct frame *x_any_window_to_frame (struct x_display_info *, int); +extern struct frame *x_menubar_window_to_frame (struct x_display_info *, int); +extern struct frame *x_top_window_to_frame (struct x_display_info *, int); #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) #define x_any_window_to_frame x_window_to_frame @@ -403,14 +403,14 @@ /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */ extern Lisp_Object Vx_pixel_size_width_font_regexp; -extern struct x_display_info *x_display_info_for_display P_ ((Display *)); -extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object)); -extern void x_set_frame_alpha P_ ((struct frame *)); +extern struct x_display_info *x_display_info_for_display (Display *); +extern struct x_display_info *x_display_info_for_name (Lisp_Object); +extern void x_set_frame_alpha (struct frame *); -extern struct x_display_info *x_term_init P_ ((Lisp_Object, char *, char *)); -extern int x_display_ok P_ ((const char *)); +extern struct x_display_info *x_term_init (Lisp_Object, char *, char *); +extern int x_display_ok (const char *); -extern void select_visual P_ ((struct x_display_info *)); +extern void select_visual (struct x_display_info *); struct font; @@ -915,168 +915,168 @@ /* From xselect.c. */ -void x_handle_selection_notify P_ ((XSelectionEvent *)); -void x_handle_property_notify P_ ((XPropertyEvent *)); +void x_handle_selection_notify (XSelectionEvent *); +void x_handle_property_notify (XPropertyEvent *); /* From xfns.c. */ -Lisp_Object display_x_get_resource P_ ((struct x_display_info *, - Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object)); -struct frame *check_x_frame P_ ((Lisp_Object)); +Lisp_Object display_x_get_resource (struct x_display_info *, + Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object); +struct frame *check_x_frame (Lisp_Object); EXFUN (Fx_display_color_p, 1); EXFUN (Fx_display_grayscale_p, 1); -extern void x_free_gcs P_ ((struct frame *)); +extern void x_free_gcs (struct frame *); /* From xrdb.c. */ -char *x_get_customization_string P_ ((XrmDatabase, char *, char *)); -XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *)); -int x_get_resource P_ ((XrmDatabase, char *, char *, - XrmRepresentation, XrmValue *)); -void x_delete_display P_ ((struct x_display_info *)); -void x_make_frame_visible P_ ((struct frame *)); -void x_iconify_frame P_ ((struct frame *)); -void x_wm_set_size_hint P_ ((struct frame *, long, int)); -int x_text_icon P_ ((struct frame *, char *)); -int x_bitmap_icon P_ ((struct frame *, Lisp_Object)); -void x_set_window_size P_ ((struct frame *, int, int, int)); -void x_wm_set_window_state P_ ((struct frame *, int)); -int x_alloc_nearest_color P_ ((struct frame *, Colormap, XColor *)); +char *x_get_customization_string (XrmDatabase, char *, char *); +XrmDatabase x_load_resources (Display *, char *, char *, char *); +int x_get_resource (XrmDatabase, char *, char *, + XrmRepresentation, XrmValue *); +void x_delete_display (struct x_display_info *); +void x_make_frame_visible (struct frame *); +void x_iconify_frame (struct frame *); +void x_wm_set_size_hint (struct frame *, long, int); +int x_text_icon (struct frame *, char *); +int x_bitmap_icon (struct frame *, Lisp_Object); +void x_set_window_size (struct frame *, int, int, int); +void x_wm_set_window_state (struct frame *, int); +int x_alloc_nearest_color (struct frame *, Colormap, XColor *); /* Defined in xterm.c */ -extern void cancel_mouse_face P_ ((struct frame *)); -extern void x_scroll_bar_clear P_ ((struct frame *)); -extern int x_text_icon P_ ((struct frame *, char *)); -extern int x_bitmap_icon P_ ((struct frame *, Lisp_Object)); -extern void x_catch_errors P_ ((Display *)); -extern void x_check_errors P_ ((Display *, char *)); -extern int x_had_errors_p P_ ((Display *)); -extern int x_catching_errors P_ ((void)); -extern void x_uncatch_errors P_ ((void)); -extern void x_clear_errors P_ ((Display *)); -extern void x_set_window_size P_ ((struct frame *, int, int, int)); -extern void x_set_mouse_position P_ ((struct frame *, int, int)); -extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int)); -extern void x_ewmh_activate_frame P_ ((struct frame *)); -extern void x_raise_frame P_ ((struct frame *)); -extern void x_lower_frame P_ ((struct frame *)); -extern void x_make_frame_visible P_ ((struct frame *)); -extern void x_make_frame_invisible P_ ((struct frame *)); -extern void x_iconify_frame P_ ((struct frame *)); -extern void x_free_frame_resources P_ ((struct frame *)); -extern void x_destroy_window P_ ((struct frame *)); -extern void x_wm_set_size_hint P_ ((struct frame *, long, int)); -extern void x_wm_set_window_state P_ ((struct frame *, int)); -extern void x_wm_set_icon_pixmap P_ ((struct frame *, int)); -extern void x_delete_display P_ ((struct x_display_info *)); -extern void x_delete_terminal P_ ((struct terminal *terminal)); -extern void x_initialize P_ ((void)); -extern unsigned long x_copy_color P_ ((struct frame *, unsigned long)); +extern void cancel_mouse_face (struct frame *); +extern void x_scroll_bar_clear (struct frame *); +extern int x_text_icon (struct frame *, char *); +extern int x_bitmap_icon (struct frame *, Lisp_Object); +extern void x_catch_errors (Display *); +extern void x_check_errors (Display *, char *); +extern int x_had_errors_p (Display *); +extern int x_catching_errors (void); +extern void x_uncatch_errors (void); +extern void x_clear_errors (Display *); +extern void x_set_window_size (struct frame *, int, int, int); +extern void x_set_mouse_position (struct frame *, int, int); +extern void x_set_mouse_pixel_position (struct frame *, int, int); +extern void x_ewmh_activate_frame (struct frame *); +extern void x_raise_frame (struct frame *); +extern void x_lower_frame (struct frame *); +extern void x_make_frame_visible (struct frame *); +extern void x_make_frame_invisible (struct frame *); +extern void x_iconify_frame (struct frame *); +extern void x_free_frame_resources (struct frame *); +extern void x_destroy_window (struct frame *); +extern void x_wm_set_size_hint (struct frame *, long, int); +extern void x_wm_set_window_state (struct frame *, int); +extern void x_wm_set_icon_pixmap (struct frame *, int); +extern void x_delete_display (struct x_display_info *); +extern void x_delete_terminal (struct terminal *terminal); +extern void x_initialize (void); +extern unsigned long x_copy_color (struct frame *, unsigned long); #ifdef USE_X_TOOLKIT extern XtAppContext Xt_app_con; -extern int x_alloc_lighter_color_for_widget __P ((Widget, Display*, Colormap, - unsigned long *, - double, int)); -extern void x_activate_timeout_atimer P_ ((void)); +extern int x_alloc_lighter_color_for_widget (Widget, Display*, Colormap, + unsigned long *, + double, int); +extern void x_activate_timeout_atimer (void); #endif -extern void x_query_colors P_ ((struct frame *f, XColor *, int)); -extern void x_query_color P_ ((struct frame *f, XColor *)); -extern void x_clear_area P_ ((Display *, Window, int, int, int, int, int)); -extern void set_vertical_scroll_bar P_ ((struct window *)); +extern void x_query_colors (struct frame *f, XColor *, int); +extern void x_query_color (struct frame *f, XColor *); +extern void x_clear_area (Display *, Window, int, int, int, int, int); +extern void set_vertical_scroll_bar (struct window *); -extern int x_dispatch_event P_ ((XEvent *, Display *)); -extern unsigned int x_x_to_emacs_modifiers P_ ((struct x_display_info *, - unsigned)); -extern int x_display_pixel_height P_ ((struct x_display_info *)); -extern int x_display_pixel_width P_ ((struct x_display_info *)); +extern int x_dispatch_event (XEvent *, Display *); +extern unsigned int x_x_to_emacs_modifiers (struct x_display_info *, + unsigned); +extern int x_display_pixel_height (struct x_display_info *); +extern int x_display_pixel_width (struct x_display_info *); -extern void x_set_sticky P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_wait_for_event P_ ((struct frame *, int)); +extern void x_set_sticky (struct frame *, Lisp_Object, Lisp_Object); +extern void x_wait_for_event (struct frame *, int); /* Defined in xselect.c */ -extern void x_handle_property_notify P_ ((XPropertyEvent *)); -extern void x_handle_selection_notify P_ ((XSelectionEvent *)); -extern void x_handle_selection_event P_ ((struct input_event *)); -extern void x_clear_frame_selections P_ ((struct frame *)); +extern void x_handle_property_notify (XPropertyEvent *); +extern void x_handle_selection_notify (XSelectionEvent *); +extern void x_handle_selection_event (struct input_event *); +extern void x_clear_frame_selections (struct frame *); -extern int x_handle_dnd_message P_ ((struct frame *, - XClientMessageEvent *, - struct x_display_info *, - struct input_event *bufp)); -extern int x_check_property_data P_ ((Lisp_Object)); -extern void x_fill_property_data P_ ((Display *, - Lisp_Object, - void *, - int)); -extern Lisp_Object x_property_data_to_lisp P_ ((struct frame *, - unsigned char *, - Atom, - int, - unsigned long)); +extern int x_handle_dnd_message (struct frame *, + XClientMessageEvent *, + struct x_display_info *, + struct input_event *bufp); +extern int x_check_property_data (Lisp_Object); +extern void x_fill_property_data (Display *, + Lisp_Object, + void *, + int); +extern Lisp_Object x_property_data_to_lisp (struct frame *, + unsigned char *, + Atom, + int, + unsigned long); /* Defined in xfns.c */ -extern struct x_display_info * check_x_display_info P_ ((Lisp_Object frame)); +extern struct x_display_info * check_x_display_info (Lisp_Object frame); #ifdef USE_GTK -extern int xg_set_icon P_ ((struct frame *, Lisp_Object)); -extern int xg_set_icon_from_xpm_data P_ ((struct frame *, char**)); +extern int xg_set_icon (struct frame *, Lisp_Object); +extern int xg_set_icon_from_xpm_data (struct frame *, char**); #endif /* USE_GTK */ -extern void x_real_positions P_ ((struct frame *, int *, int *)); -extern int defined_color P_ ((struct frame *, char *, XColor *, int)); -extern void x_set_border_pixel P_ ((struct frame *, int)); -extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void xic_free_xfontset P_ ((struct frame *)); -extern void create_frame_xic P_ ((struct frame *)); -extern void destroy_frame_xic P_ ((struct frame *)); -extern void xic_set_preeditarea P_ ((struct window *, int, int)); -extern void xic_set_statusarea P_ ((struct frame *)); -extern void xic_set_xfontset P_ ((struct frame *, char *)); -extern int x_pixel_width P_ ((struct frame *)); -extern int x_pixel_height P_ ((struct frame *)); -extern int x_char_width P_ ((struct frame *)); -extern int x_char_height P_ ((struct frame *)); -extern int x_screen_planes P_ ((struct frame *)); -extern void x_sync P_ ((struct frame *)); -extern int x_defined_color P_ ((struct frame *, char *, XColor *, int)); +extern void x_real_positions (struct frame *, int *, int *); +extern int defined_color (struct frame *, char *, XColor *, int); +extern void x_set_border_pixel (struct frame *, int); +extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); +extern void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object); +extern void xic_free_xfontset (struct frame *); +extern void create_frame_xic (struct frame *); +extern void destroy_frame_xic (struct frame *); +extern void xic_set_preeditarea (struct window *, int, int); +extern void xic_set_statusarea (struct frame *); +extern void xic_set_xfontset (struct frame *, char *); +extern int x_pixel_width (struct frame *); +extern int x_pixel_height (struct frame *); +extern int x_char_width (struct frame *); +extern int x_char_height (struct frame *); +extern int x_screen_planes (struct frame *); +extern void x_sync (struct frame *); +extern int x_defined_color (struct frame *, char *, XColor *, int); #ifdef HAVE_X_I18N -extern void free_frame_xic P_ ((struct frame *)); +extern void free_frame_xic (struct frame *); #endif -extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); +extern void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object); /* Defined in xfaces.c */ -extern int compute_glyph_face P_ ((struct frame *, int, int)); -extern int compute_glyph_face_1 P_ ((struct frame *, Lisp_Object, int)); -extern void x_free_dpy_colors P_ ((Display *, Screen *, Colormap, - unsigned long *, int)); +extern int compute_glyph_face (struct frame *, int, int); +extern int compute_glyph_face_1 (struct frame *, Lisp_Object, int); +extern void x_free_dpy_colors (Display *, Screen *, Colormap, + unsigned long *, int); /* Defined in xmenu.c */ -extern void x_menu_set_in_use P_ ((int)); -extern void x_menu_wait_for_event P_ ((void *data)); -extern void x_activate_menubar P_ ((struct frame *)); -extern int popup_activated P_ ((void)); -extern void initialize_frame_menubar P_ ((struct frame *)); -extern void free_frame_menubar P_ ((struct frame *)); +extern void x_menu_set_in_use (int); +extern void x_menu_wait_for_event (void *data); +extern void x_activate_menubar (struct frame *); +extern int popup_activated (void); +extern void initialize_frame_menubar (struct frame *); +extern void free_frame_menubar (struct frame *); /* Defined in widget.c */ #ifdef USE_X_TOOLKIT -extern void widget_store_internal_border P_ ((Widget)); +extern void widget_store_internal_border (Widget); #endif /* Defined in xsmfns.c */ #ifdef HAVE_X_SM -extern void x_session_initialize P_ ((struct x_display_info *dpyinfo)); -extern int x_session_check_input P_ ((struct input_event *bufp)); -extern int x_session_have_connection P_ ((void)); -extern void x_session_close P_ ((void)); +extern void x_session_initialize (struct x_display_info *dpyinfo); +extern int x_session_check_input (struct input_event *bufp); +extern int x_session_have_connection (void); +extern void x_session_close (void); #endif /* XEmbed implementation. */ @@ -1129,10 +1129,10 @@ /* Defined in xterm.c */ -extern void xembed_set_info P_ ((struct frame *f, enum xembed_info flags)); -extern void xembed_send_message P_ ((struct frame *f, Time time, - enum xembed_message message, - long detail, long data1, long data2)); +extern void xembed_set_info (struct frame *f, enum xembed_info flags); +extern void xembed_send_message (struct frame *f, Time time, + enum xembed_message message, + long detail, long data1, long data2); /* Is the frame embedded into another application? */