From 383e09700c9b3d175c506301d363be4597827db7 Mon Sep 17 00:00:00 2001 From: Jan D Date: Fri, 2 Jul 2010 11:26:33 +0200 Subject: 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. --- src/coding.h | 68 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'src/coding.h') diff --git a/src/coding.h b/src/coding.h index f47c33847f9..156ead91ed2 100644 --- a/src/coding.h +++ b/src/coding.h @@ -499,10 +499,10 @@ struct coding_system 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 @@ struct coding_system #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 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 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 (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 @@ extern void encode_coding_object P_ ((struct coding_system *, } 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 Qcall_process, Qcall_process_region; 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 Vdefault_file_name_coding_system; 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 */ -- cgit v1.2.1 From c532d349630038c45897e88004a8142a82e9dc85 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 2 Jul 2010 15:18:28 -0700 Subject: Convert some prototypes to standard C. * lib-src/make-docfile.c (xmalloc, xrealloc, concat, readline, fatal): * lib-src/b2m.c (scan_file, scan_lisp_file, scan_c_file): Convert to standard C prototypes. * src/term.c (term_clear_mouse_face, Fidentity): * src/syssignal.h (signal_handler_t): * src/lisp.h (memory_warnings): * src/coding.h (preferred_coding_system): * src/cm.h (evalcost): * src/blockinput.h (reinvoke_input_signal): Convert to standard C prototypes. --- src/coding.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/coding.h') diff --git a/src/coding.h b/src/coding.h index 156ead91ed2..75ed84bef71 100644 --- a/src/coding.h +++ b/src/coding.h @@ -753,7 +753,7 @@ extern void encode_coding_object (struct coding_system *, } while (0) -extern Lisp_Object preferred_coding_system (); +extern Lisp_Object preferred_coding_system (void); extern Lisp_Object Qutf_8, Qutf_8_emacs; -- cgit v1.2.1 From e6cba65065d7002d181c3d440bfc5e04ba953783 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 28 Jul 2010 22:48:06 -0700 Subject: Remove extern declarations from .c files, and them to .h files. * src/xsmfns.c (Vuser_login_name): * src/xrdb.c (Vdouble_click_time): * src/xfaces.c (xic_create_fontsetname): * src/w32select.c (waiting_for_input): * src/print.c (minibuffer_auto_raise): * src/msdos.c (Qhelp_echo): * src/macros.c (real_this_command): * src/keymap.c (Voverriding_local_map): * src/xterm.c (poll_for_input_1, gray_bitmap_width) (gray_bitmap_height, gray_bitmap_bits; * src/xmenu.c ( Voverriding_local_map) (Voverriding_local_map_menu_flag; Qmenu_item; use_dialog_box) (use_file_dialog, Xt_app_con): * src/xdisp.c (minibuffer_auto_raise, Voverriding_local_map) (Voverriding_local_map_menu_flag, Qmenu_item, Qface, Qinvisible) (Qwidth, Qinvisible, Qwindow, Qpriority, Qtool_bar_lines) (Qtool_bar_lines, ignore_mouse_drag_p): * src/minibuf.c (Voverriding_local_map, Qfield, Qfront_sticky) (Qrear_nonsticky, nconc2): * src/keyboard.c (current_global_map, minibuf_level, Qmenu_item) (Vhistory_length, Vtranslation_table_for_input, Qcomposition) (Qdisplay, Qafter_string, Qbefore_string, Qundefined): * src/fileio.c (use_dialog_box, use_file_dialog, Vuser_login_name) (minibuf_level, minibuffer_auto_raise, lisp_time_argument): * src/eval.c (Qinteractive_form, Qrisky_local_variable, Qfunction) (gc_in_progress): * src/doc.c (Voverriding_local_map, Qremap): * src/dired.c (completion_ignore_case, Qcompletion_ignore_case) (Vcompletion_regexp_list): * src/coding.c (Qmac, Qinsert_file_contents, Qwrite_region) (Qcompletion_ignore_case): * src/callint.c (Qcursor_in_echo_area, Qfile_directory_p, Qonly) (Vhistory_length, Vthis_original_command, real_this_command) (Qface, Qminibuffer_prompt, history_delete_duplicates): * src/image.c (Qrisky_local_variable): * src/fontset.c (QCname): * src/fns.c (minibuffer_auto_raise, QCname): * src/dispnew.c (char_ins_del_cost): * src/composite.c (font_fill_lglyph_metrics): * src/cmds.c (Qface, Vtranslation_table_for_input): * src/charset.c (map_char_table_for_charset, Qfile_name_handler_alist): * src/ccl.c (charset_unicode): * src/callproc.c (Vtemporary_file_directory): * src/buffer.c (emacs_strerror): Remove extern declarations. Remove extern declarations from .c files, and them to .h files. * src/keyboard.h (Qhelp_echo, waiting_for_input) (input_available_clear_time, ignore_mouse_drag_p) (Vdouble_click_time, real_this_command, Vthis_original_command): * src/keymap.h (Qremap, Qmenu_item, Voverriding_local_map) (Voverriding_local_map_menu_flag): * src/lisp.h (Qinteractive_form, use_file_dialog) (Qcursor_in_echo_area, QCascent, QCmargin, QCrelief, Qcount) (Qextension_data, QCconversion, QCcolor_symbols, QCheuristic_mask) (QCindex, QCmatrix, QCcolor_adjustment, QCmask) (Qrisky_local_variable, map_char_table_for_charset, Vprint_level) (Qfunction, debug_on_next_call, Qfield) (Vinhibit_field_text_motion, Vuser_login_name, lisp_time_argument) (Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string) (Qfile_directory_p, Qinsert_file_contents) (Qcompletion_ignore_case, Qcompletion_ignore_case) (Vcompletion_regexp_list, Vhistory_length, completion_ignore_case) (history_delete_duplicates, minibuffer_auto_raise, Qonly) (Qfile_name_handler_alist, Qfront_sticky, Qrear_nonsticky) (Qminibuffer_prompt) (Vtemporary_file_directory,char_ins_del_vector, Qface): * src/xterm.h (gray_bitmap_width, gray_bitmap_height) (gray_bitmap_bits, xic_create_fontsetname): * src/coding.h (Vtranslation_table_for_input): Add extern declarations. * src/data.c (Qwindow): Make non-static, used from other files too. * src/frame.c (validate_x_resource_name): Remove shadow definition for i. --- src/coding.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/coding.h') diff --git a/src/coding.h b/src/coding.h index 75ed84bef71..0caa5b2f96f 100644 --- a/src/coding.h +++ b/src/coding.h @@ -802,6 +802,9 @@ extern struct coding_system safe_terminal_coding; /* Default coding systems used for process I/O. */ extern Lisp_Object Vdefault_process_coding_system; +/* Char table for translating Quail and self-inserting input. */ +extern Lisp_Object Vtranslation_table_for_input; + /* Function to call to force a user to force select a propert coding system. */ extern Lisp_Object Vselect_safe_coding_system_function; -- cgit v1.2.1