diff options
| author | Jan D <[email protected]> | 2010-07-02 14:19:53 +0200 |
|---|---|---|
| committer | Jan D <[email protected]> | 2010-07-02 14:19:53 +0200 |
| commit | f57e2426f0e8a6b251be71b6f62237fd286998ea (patch) | |
| tree | a8db36e415ea69b4196881b44122454317510f46 /src | |
| parent | 383e09700c9b3d175c506301d363be4597827db7 (diff) | |
Remove __P and P_ from .c and .m files and definition of P_
* lisp.h:
* atimer.h: Remove define for P_.
* alloc.c: Remove __P and P_ from .c and .m files.
* atimer.c:
* buffer.c:
* callint.c:
* category.c:
* charset.c:
* chartab.c:
* cm.c:
* coding.c:
* composite.c:
* data.c:
* dired.c:
* dispnew.c:
* doc.c:
* editfns.c:
* emacs.c:
* eval.c:
* fileio.c:
* filelock.c:
* fns.c:
* font.c:
* fontset.c:
* frame.c:
* ftfont.c:
* ftxfont.c:
* gmalloc.c:
* gtkutil.c:
* image.c:
* indent.c:
* intervals.c:
* keyboard.c:
* keymap.c:
* lread.c:
* marker.c:
* menu.c:
* minibuf.c:
* print.c:
* process.c:
* scroll.c:
* search.c:
* sound.c:
* strftime.c:
* syntax.c:
* sysdep.c:
* term.c:
* terminal.c:
* textprop.c:
* unexalpha.c:
* w32console.c:
* w32fns.c:
* w32font.c:
* w32menu.c:
* w32term.c:
* w32uniscribe.c:
* window.c:
* xdisp.c:
* xfaces.c:
* xfns.c:
* xfont.c:
* xftfont.c:
* xmenu.c:
* xselect.c:
* xterm.c: Likewise.
* ebrowse.c: Remove P_ and __P.
* etags.c:
* movemail.c:
* pop.c:
* update-game-score.c: Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 70 | ||||
| -rw-r--r-- | src/alloc.c | 92 | ||||
| -rw-r--r-- | src/atimer.c | 8 | ||||
| -rw-r--r-- | src/atimer.h | 7 | ||||
| -rw-r--r-- | src/buffer.c | 48 | ||||
| -rw-r--r-- | src/callint.c | 2 | ||||
| -rw-r--r-- | src/category.c | 2 | ||||
| -rw-r--r-- | src/charset.c | 18 | ||||
| -rw-r--r-- | src/chartab.c | 8 | ||||
| -rw-r--r-- | src/cm.c | 4 | ||||
| -rw-r--r-- | src/coding.c | 150 | ||||
| -rw-r--r-- | src/composite.c | 16 | ||||
| -rw-r--r-- | src/data.c | 6 | ||||
| -rw-r--r-- | src/dired.c | 4 | ||||
| -rw-r--r-- | src/dispnew.c | 132 | ||||
| -rw-r--r-- | src/doc.c | 4 | ||||
| -rw-r--r-- | src/editfns.c | 30 | ||||
| -rw-r--r-- | src/emacs.c | 10 | ||||
| -rw-r--r-- | src/eval.c | 14 | ||||
| -rw-r--r-- | src/fileio.c | 10 | ||||
| -rw-r--r-- | src/filelock.c | 2 | ||||
| -rw-r--r-- | src/fns.c | 50 | ||||
| -rw-r--r-- | src/font.c | 64 | ||||
| -rw-r--r-- | src/fontset.c | 30 | ||||
| -rw-r--r-- | src/frame.c | 6 | ||||
| -rw-r--r-- | src/ftfont.c | 56 | ||||
| -rw-r--r-- | src/ftxfont.c | 22 | ||||
| -rw-r--r-- | src/gmalloc.c | 20 | ||||
| -rw-r--r-- | src/gtkutil.c | 14 | ||||
| -rw-r--r-- | src/image.c | 202 | ||||
| -rw-r--r-- | src/indent.c | 6 | ||||
| -rw-r--r-- | src/intervals.c | 8 | ||||
| -rw-r--r-- | src/keyboard.c | 82 | ||||
| -rw-r--r-- | src/keymap.c | 36 | ||||
| -rw-r--r-- | src/lisp.h | 3 | ||||
| -rw-r--r-- | src/lread.c | 54 | ||||
| -rw-r--r-- | src/marker.c | 2 | ||||
| -rw-r--r-- | src/menu.c | 16 | ||||
| -rw-r--r-- | src/minibuf.c | 26 | ||||
| -rw-r--r-- | src/print.c | 2 | ||||
| -rw-r--r-- | src/process.c | 10 | ||||
| -rw-r--r-- | src/scroll.c | 16 | ||||
| -rw-r--r-- | src/search.c | 24 | ||||
| -rw-r--r-- | src/sound.c | 58 | ||||
| -rw-r--r-- | src/strftime.c | 20 | ||||
| -rw-r--r-- | src/syntax.c | 14 | ||||
| -rw-r--r-- | src/sysdep.c | 10 | ||||
| -rw-r--r-- | src/term.c | 36 | ||||
| -rw-r--r-- | src/terminal.c | 2 | ||||
| -rw-r--r-- | src/textprop.c | 2 | ||||
| -rw-r--r-- | src/unexalpha.c | 6 | ||||
| -rw-r--r-- | src/w32console.c | 4 | ||||
| -rw-r--r-- | src/w32fns.c | 56 | ||||
| -rw-r--r-- | src/w32font.c | 38 | ||||
| -rw-r--r-- | src/w32menu.c | 10 | ||||
| -rw-r--r-- | src/w32term.c | 126 | ||||
| -rw-r--r-- | src/w32uniscribe.c | 6 | ||||
| -rw-r--r-- | src/window.c | 66 | ||||
| -rw-r--r-- | src/xdisp.c | 306 | ||||
| -rw-r--r-- | src/xfaces.c | 90 | ||||
| -rw-r--r-- | src/xfns.c | 68 | ||||
| -rw-r--r-- | src/xfont.c | 30 | ||||
| -rw-r--r-- | src/xftfont.c | 34 | ||||
| -rw-r--r-- | src/xmenu.c | 22 | ||||
| -rw-r--r-- | src/xselect.c | 76 | ||||
| -rw-r--r-- | src/xterm.c | 186 |
66 files changed, 1355 insertions, 1297 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c951ed3255..b36953e23f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,75 @@ 2010-07-02 Jan Djärv <[email protected]> + * lisp.h: + * atimer.h: Remove define for P_. + + * alloc.c: Remove __P and P_ from .c and .m files. + * atimer.c: + * buffer.c: + * callint.c: + * category.c: + * charset.c: + * chartab.c: + * cm.c: + * coding.c: + * composite.c: + * data.c: + * dired.c: + * dispnew.c: + * doc.c: + * editfns.c: + * emacs.c: + * eval.c: + * fileio.c: + * filelock.c: + * fns.c: + * font.c: + * fontset.c: + * frame.c: + * ftfont.c: + * ftxfont.c: + * gmalloc.c: + * gtkutil.c: + * image.c: + * indent.c: + * intervals.c: + * keyboard.c: + * keymap.c: + * lread.c: + * marker.c: + * menu.c: + * minibuf.c: + * print.c: + * process.c: + * scroll.c: + * search.c: + * sound.c: + * strftime.c: + * syntax.c: + * sysdep.c: + * term.c: + * terminal.c: + * textprop.c: + * unexalpha.c: + * w32console.c: + * w32fns.c: + * w32font.c: + * w32menu.c: + * w32term.c: + * w32uniscribe.c: + * window.c: + * xdisp.c: + * xfaces.c: + * xfns.c: + * xfont.c: + * xftfont.c: + * xmenu.c: + * xselect.c: + * xterm.c: Likewise. + Remove P_ and __P macros. - * buffer.h: Remove P_ and __P macros. + * atimer.h: Remove P_ and __P macros. + * buffer.h: * category.h: * ccl.h: * character.h: diff --git a/src/alloc.c b/src/alloc.c index e0f07cc5f5..84b9007cdd 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -329,23 +329,23 @@ Lisp_Object Vpost_gc_hook, Qpost_gc_hook; Lisp_Object Vgc_elapsed; /* accumulated elapsed time in GC */ EMACS_INT gcs_done; /* accumulated GCs */ -static void mark_buffer P_ ((Lisp_Object)); -static void mark_terminals P_ ((void)); -extern void mark_kboards P_ ((void)); -extern void mark_ttys P_ ((void)); -extern void mark_backtrace P_ ((void)); -static void gc_sweep P_ ((void)); -static void mark_glyph_matrix P_ ((struct glyph_matrix *)); -static void mark_face_cache P_ ((struct face_cache *)); +static void mark_buffer (Lisp_Object); +static void mark_terminals (void); +extern void mark_kboards (void); +extern void mark_ttys (void); +extern void mark_backtrace (void); +static void gc_sweep (void); +static void mark_glyph_matrix (struct glyph_matrix *); +static void mark_face_cache (struct face_cache *); #ifdef HAVE_WINDOW_SYSTEM -extern void mark_fringe_data P_ ((void)); +extern void mark_fringe_data (void); #endif /* HAVE_WINDOW_SYSTEM */ -static struct Lisp_String *allocate_string P_ ((void)); -static void compact_small_strings P_ ((void)); -static void free_large_strings P_ ((void)); -static void sweep_strings P_ ((void)); +static struct Lisp_String *allocate_string (void); +static void compact_small_strings (void); +static void free_large_strings (void); +static void sweep_strings (void); extern int message_enable_multibyte; @@ -369,8 +369,8 @@ enum mem_type MEM_TYPE_VECTORLIKE }; -static POINTER_TYPE *lisp_align_malloc P_ ((size_t, enum mem_type)); -static POINTER_TYPE *lisp_malloc P_ ((size_t, enum mem_type)); +static POINTER_TYPE *lisp_align_malloc (size_t, enum mem_type); +static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); void refill_memory_reserve (); @@ -452,31 +452,31 @@ static void *min_heap_address, *max_heap_address; static struct mem_node mem_z; #define MEM_NIL &mem_z -static POINTER_TYPE *lisp_malloc P_ ((size_t, enum mem_type)); -static struct Lisp_Vector *allocate_vectorlike P_ ((EMACS_INT)); -static void lisp_free P_ ((POINTER_TYPE *)); -static void mark_stack P_ ((void)); -static int live_vector_p P_ ((struct mem_node *, void *)); -static int live_buffer_p P_ ((struct mem_node *, void *)); -static int live_string_p P_ ((struct mem_node *, void *)); -static int live_cons_p P_ ((struct mem_node *, void *)); -static int live_symbol_p P_ ((struct mem_node *, void *)); -static int live_float_p P_ ((struct mem_node *, void *)); -static int live_misc_p P_ ((struct mem_node *, void *)); -static void mark_maybe_object P_ ((Lisp_Object)); -static void mark_memory P_ ((void *, void *, int)); -static void mem_init P_ ((void)); -static struct mem_node *mem_insert P_ ((void *, void *, enum mem_type)); -static void mem_insert_fixup P_ ((struct mem_node *)); -static void mem_rotate_left P_ ((struct mem_node *)); -static void mem_rotate_right P_ ((struct mem_node *)); -static void mem_delete P_ ((struct mem_node *)); -static void mem_delete_fixup P_ ((struct mem_node *)); -static INLINE struct mem_node *mem_find P_ ((void *)); +static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); +static struct Lisp_Vector *allocate_vectorlike (EMACS_INT); +static void lisp_free (POINTER_TYPE *); +static void mark_stack (void); +static int live_vector_p (struct mem_node *, void *); +static int live_buffer_p (struct mem_node *, void *); +static int live_string_p (struct mem_node *, void *); +static int live_cons_p (struct mem_node *, void *); +static int live_symbol_p (struct mem_node *, void *); +static int live_float_p (struct mem_node *, void *); +static int live_misc_p (struct mem_node *, void *); +static void mark_maybe_object (Lisp_Object); +static void mark_memory (void *, void *, int); +static void mem_init (void); +static struct mem_node *mem_insert (void *, void *, enum mem_type); +static void mem_insert_fixup (struct mem_node *); +static void mem_rotate_left (struct mem_node *); +static void mem_rotate_right (struct mem_node *); +static void mem_delete (struct mem_node *); +static void mem_delete_fixup (struct mem_node *); +static INLINE struct mem_node *mem_find (void *); #if GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS -static void check_gcpros P_ ((void)); +static void check_gcpros (void); #endif #endif /* GC_MARK_STACK || GC_MALLOC_CHECK */ @@ -495,7 +495,7 @@ static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag}; static int staticidx = 0; -static POINTER_TYPE *pure_alloc P_ ((size_t, int)); +static POINTER_TYPE *pure_alloc (size_t, int); /* Value is SZ rounded up to the next multiple of ALIGNMENT. @@ -1164,14 +1164,14 @@ allocate_buffer () there's no need to block input around malloc. */ #ifndef DOUG_LEA_MALLOC -extern void * (*__malloc_hook) P_ ((size_t, const void *)); -extern void * (*__realloc_hook) P_ ((void *, size_t, const void *)); -extern void (*__free_hook) P_ ((void *, const void *)); +extern void * (*__malloc_hook) (size_t, const void *); +extern void * (*__realloc_hook) (void *, size_t, const void *); +extern void (*__free_hook) (void *, const void *); /* Else declared in malloc.h, perhaps with an extra arg. */ #endif /* DOUG_LEA_MALLOC */ -static void * (*old_malloc_hook) P_ ((size_t, const void *)); -static void * (*old_realloc_hook) P_ ((void *, size_t, const void*)); -static void (*old_free_hook) P_ ((void*, const void*)); +static void * (*old_malloc_hook) (size_t, const void *); +static void * (*old_realloc_hook) (void *, size_t, const void*); +static void (*old_free_hook) (void*, const void*); /* This function is used as the hook for free to call. */ @@ -1767,8 +1767,8 @@ init_strings () static int check_string_bytes_count; -static void check_string_bytes P_ ((int)); -static void check_sblock P_ ((struct sblock *)); +static void check_string_bytes (int); +static void check_sblock (struct sblock *); #define CHECK_STRING_BYTES(S) STRING_BYTES (S) diff --git a/src/atimer.c b/src/atimer.c index 556272d791..3ef51522c3 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -64,10 +64,10 @@ int pending_atimers; /* Function prototypes. */ -static void set_alarm P_ ((void)); -static void schedule_atimer P_ ((struct atimer *)); -static struct atimer *append_atimer_lists P_ ((struct atimer *, - struct atimer *)); +static void set_alarm (void); +static void schedule_atimer (struct atimer *); +static struct atimer *append_atimer_lists (struct atimer *, + struct atimer *); SIGTYPE alarm_signal_handler (); diff --git a/src/atimer.h b/src/atimer.h index e0f81a51d9..c2245d30e6 100644 --- a/src/atimer.h +++ b/src/atimer.h @@ -20,13 +20,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifndef EMACS_ATIMER_H #define EMACS_ATIMER_H -/* Declare the prototype for a general external function. */ -#if defined (PROTOTYPES) || defined (WINDOWSNT) -#define P_(proto) proto -#else -#define P_(proto) () -#endif - #include "systime.h" /* for EMACS_TIME */ /* Forward declaration. */ diff --git a/src/buffer.c b/src/buffer.c index 589266f40e..0dfad93b3e 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -106,13 +106,13 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS]; int last_per_buffer_idx; EXFUN (Fset_buffer, 1); -void set_buffer_internal P_ ((struct buffer *b)); -void set_buffer_internal_1 P_ ((struct buffer *b)); -static void call_overlay_mod_hooks P_ ((Lisp_Object list, Lisp_Object overlay, - int after, Lisp_Object arg1, - Lisp_Object arg2, Lisp_Object arg3)); -static void swap_out_buffer_local_variables P_ ((struct buffer *b)); -static void reset_buffer_local_variables P_ ((struct buffer *b, int permanent_too)); +void set_buffer_internal (struct buffer *b); +void set_buffer_internal_1 (struct buffer *b); +static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, + int after, Lisp_Object arg1, + Lisp_Object arg2, Lisp_Object arg3); +static void swap_out_buffer_local_variables (struct buffer *b); +static void reset_buffer_local_variables (struct buffer *b, int permanent_too); /* Alist of all buffer names vs the buffers. */ /* This used to be a variable, but is no longer, @@ -168,13 +168,13 @@ Lisp_Object Qmodification_hooks; Lisp_Object Qinsert_in_front_hooks; Lisp_Object Qinsert_behind_hooks; -static void alloc_buffer_text P_ ((struct buffer *, size_t)); -static void free_buffer_text P_ ((struct buffer *b)); -static struct Lisp_Overlay * copy_overlays P_ ((struct buffer *, struct Lisp_Overlay *)); -static void modify_overlay P_ ((struct buffer *, EMACS_INT, EMACS_INT)); -static Lisp_Object buffer_lisp_local_variables P_ ((struct buffer *)); +static void alloc_buffer_text (struct buffer *, size_t); +static void free_buffer_text (struct buffer *b); +static struct Lisp_Overlay * copy_overlays (struct buffer *, struct Lisp_Overlay *); +static void modify_overlay (struct buffer *, EMACS_INT, EMACS_INT); +static Lisp_Object buffer_lisp_local_variables (struct buffer *); -extern char * emacs_strerror P_ ((int)); +extern char * emacs_strerror (int); /* For debugging; temporary. See set_buffer_internal. */ /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ @@ -2175,7 +2175,7 @@ advance_to_char_boundary (byte_pos) } #ifdef REL_ALLOC -extern void r_alloc_reset_variable P_ ((POINTER_TYPE *, POINTER_TYPE *)); +extern void r_alloc_reset_variable (POINTER_TYPE *, POINTER_TYPE *); #endif /* REL_ALLOC */ DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, @@ -4693,13 +4693,13 @@ static int mmap_initialized_p; /* Function prototypes. */ -static int mmap_free_1 P_ ((struct mmap_region *)); -static int mmap_enlarge P_ ((struct mmap_region *, int)); -static struct mmap_region *mmap_find P_ ((POINTER_TYPE *, POINTER_TYPE *)); -static POINTER_TYPE *mmap_alloc P_ ((POINTER_TYPE **, size_t)); -static POINTER_TYPE *mmap_realloc P_ ((POINTER_TYPE **, size_t)); -static void mmap_free P_ ((POINTER_TYPE **ptr)); -static void mmap_init P_ ((void)); +static int mmap_free_1 (struct mmap_region *); +static int mmap_enlarge (struct mmap_region *, int); +static struct mmap_region *mmap_find (POINTER_TYPE *, POINTER_TYPE *); +static POINTER_TYPE *mmap_alloc (POINTER_TYPE **, size_t); +static POINTER_TYPE *mmap_realloc (POINTER_TYPE **, size_t); +static void mmap_free (POINTER_TYPE **ptr); +static void mmap_init (void); /* Return a region overlapping address range START...END, or null if @@ -5032,9 +5032,9 @@ mmap_init () ***********************************************************************/ #ifdef REL_ALLOC -extern POINTER_TYPE *r_alloc P_ ((POINTER_TYPE **, size_t)); -extern POINTER_TYPE *r_re_alloc P_ ((POINTER_TYPE **, size_t)); -extern void r_alloc_free P_ ((POINTER_TYPE **ptr)); +extern POINTER_TYPE *r_alloc (POINTER_TYPE **, size_t); +extern POINTER_TYPE *r_re_alloc (POINTER_TYPE **, size_t); +extern void r_alloc_free (POINTER_TYPE **ptr); #endif /* REL_ALLOC */ diff --git a/src/callint.c b/src/callint.c index a45f8a372b..45e5bd9ed9 100644 --- a/src/callint.c +++ b/src/callint.c @@ -30,7 +30,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "keymap.h" #ifdef HAVE_INDEX -extern char *index P_ ((const char *, int)); +extern char *index (const char *, int); #endif extern Lisp_Object Qcursor_in_echo_area; diff --git a/src/category.c b/src/category.c index b56d62b6b8..610df686da 100644 --- a/src/category.c +++ b/src/category.c @@ -59,7 +59,7 @@ Lisp_Object _temp_category_set; /* Category set staff. */ -static Lisp_Object hash_get_category_set P_ ((Lisp_Object, Lisp_Object)); +static Lisp_Object hash_get_category_set (Lisp_Object, Lisp_Object); static Lisp_Object hash_get_category_set (table, category_set) diff --git a/src/charset.c b/src/charset.c index f83fa99453..787d000d99 100644 --- a/src/charset.c +++ b/src/charset.c @@ -129,10 +129,10 @@ Lisp_Object Vcurrent_iso639_language; /* Defined in chartab.c */ extern void -map_char_table_for_charset P_ ((void (*c_function) (Lisp_Object, Lisp_Object), - Lisp_Object function, Lisp_Object table, - Lisp_Object arg, struct charset *charset, - unsigned from, unsigned to)); +map_char_table_for_charset (void (*c_function) (Lisp_Object, Lisp_Object), + Lisp_Object function, Lisp_Object table, + Lisp_Object arg, struct charset *charset, + unsigned from, unsigned to); #define CODE_POINT_TO_INDEX(charset, code) \ ((charset)->code_linear_p \ @@ -497,7 +497,7 @@ extern Lisp_Object Qfile_name_handler_alist; Note that this function uses `openp' to open MAPFILE but ignores `file-name-handler-alist' to avoid running any Lisp code. */ -extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object)); +extern void add_to_log (char *, Lisp_Object, Lisp_Object); static void load_charset_map_from_file (charset, mapfile, control_flag) @@ -684,9 +684,9 @@ DEFUN ("charsetp", Fcharsetp, Scharsetp, 1, 1, 0, } -void map_charset_for_dump P_ ((void (*c_function) (Lisp_Object, Lisp_Object), - Lisp_Object function, Lisp_Object arg, - unsigned from, unsigned to)); +void map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), + Lisp_Object function, Lisp_Object arg, + unsigned from, unsigned to); void map_charset_for_dump (c_function, function, arg, from, to) @@ -750,7 +750,7 @@ map_charset_for_dump (c_function, function, arg, from, to) void map_charset_chars (c_function, function, arg, charset, from, to) - void (*c_function) P_ ((Lisp_Object, Lisp_Object)); + void (*c_function) (Lisp_Object, Lisp_Object); Lisp_Object function, arg; struct charset *charset; unsigned from, to; diff --git a/src/chartab.c b/src/chartab.c index 2b547184b2..90ec660d67 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -725,7 +725,7 @@ equivalent and can be merged. It defaults to `equal'. */) static Lisp_Object map_sub_char_table (c_function, function, table, arg, val, range, default_val, parent) - void (*c_function) P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); + void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object); Lisp_Object function, table, arg, val, range, default_val, parent; { /* Pointer to the elements of TABLE. */ @@ -841,7 +841,7 @@ map_sub_char_table (c_function, function, table, arg, val, range, void map_char_table (c_function, function, table, arg) - void (*c_function) P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); + void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object); Lisp_Object function, table, arg; { Lisp_Object range, val; @@ -915,7 +915,7 @@ range of characters that have the same value. */) static void map_sub_char_table_for_charset (c_function, function, table, arg, range, charset, from, to) - void (*c_function) P_ ((Lisp_Object, Lisp_Object)); + void (*c_function) (Lisp_Object, Lisp_Object); Lisp_Object function, table, arg, range; struct charset *charset; unsigned from, to; @@ -1002,7 +1002,7 @@ map_sub_char_table_for_charset (c_function, function, table, arg, range, void map_char_table_for_charset (c_function, function, table, arg, charset, from, to) - void (*c_function) P_ ((Lisp_Object, Lisp_Object)); + void (*c_function) (Lisp_Object, Lisp_Object); Lisp_Object function, table, arg; struct charset *charset; unsigned from, to; @@ -33,8 +33,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* For now, don't try to include termcap.h. On some systems, configure finds a non-standard termcap.h that the main build won't find. */ -extern void tputs P_ ((const char *, int, int (*)(int))); -extern char *tgoto P_ ((const char *, int, int)); +extern void tputs (const char *, int, int (*)(int)); +extern char *tgoto (const char *, int, int); #define BIG 9999 /* 9999 good on VAXen. For 16 bit machines use about 2000.... */ diff --git a/src/coding.c b/src/coding.c index 6435fa1ddb..1730468ade 100644 --- a/src/coding.c +++ b/src/coding.c @@ -896,80 +896,80 @@ static struct coding_system coding_categories[coding_category_max]; /* Prototypes for static functions. */ -static void record_conversion_result P_ ((struct coding_system *coding, - enum coding_result_code result)); -static int detect_coding_utf_8 P_ ((struct coding_system *, - struct coding_detection_info *info)); -static void decode_coding_utf_8 P_ ((struct coding_system *)); -static int encode_coding_utf_8 P_ ((struct coding_system *)); - -static int detect_coding_utf_16 P_ ((struct coding_system *, - struct coding_detection_info *info)); -static void decode_coding_utf_16 P_ ((struct coding_system *)); -static int encode_coding_utf_16 P_ ((struct coding_system *)); - -static int detect_coding_iso_2022 P_ ((struct coding_system *, - struct coding_detection_info *info)); -static void decode_coding_iso_2022 P_ ((struct coding_system *)); -static int encode_coding_iso_2022 P_ ((struct coding_system *)); - -static int detect_coding_emacs_mule P_ ((struct coding_system *, - struct coding_detection_info *info)); -static void decode_coding_emacs_mule P_ ((struct coding_system *)); -static int encode_coding_emacs_mule P_ ((struct coding_system *)); - -static int detect_coding_sjis P_ ((struct coding_system *, - struct coding_detection_info *info)); -static void decode_coding_sjis P_ ((struct coding_system *)); -static int encode_coding_sjis P_ ((struct coding_system *)); - -static int detect_coding_big5 P_ ((struct coding_system *, - struct coding_detection_info *info)); -static void decode_coding_big5 P_ ((struct coding_system *)); -static int encode_coding_big5 P_ ((struct coding_system *)); - -static int detect_coding_ccl P_ ((struct coding_system *, - struct coding_detection_info *info)); -static void decode_coding_ccl P_ ((struct coding_system *)); -static int encode_coding_ccl P_ ((struct coding_system *)); - -static void decode_coding_raw_text P_ ((struct coding_system *)); -static int encode_coding_raw_text P_ ((struct coding_system *)); - -static void coding_set_source P_ ((struct coding_system *)); -static void coding_set_destination P_ ((struct coding_system *)); -static void coding_alloc_by_realloc P_ ((struct coding_system *, EMACS_INT)); -static void coding_alloc_by_making_gap P_ ((struct coding_system *, - EMACS_INT, EMACS_INT)); -static unsigned char *alloc_destination P_ ((struct coding_system *, - EMACS_INT, unsigned char *)); -static void setup_iso_safe_charsets P_ ((Lisp_Object)); -static unsigned char *encode_designation_at_bol P_ ((struct coding_system *, - int *, int *, - unsigned char *)); -static int detect_eol P_ ((const unsigned char *, - EMACS_INT, enum coding_category)); -static Lisp_Object adjust_coding_eol_type P_ ((struct coding_system *, int)); -static void decode_eol P_ ((struct coding_system *)); -static Lisp_Object get_translation_table P_ ((Lisp_Object, int, int *)); -static Lisp_Object get_translation P_ ((Lisp_Object, int *, int *)); -static int produce_chars P_ ((struct coding_system *, Lisp_Object, int)); -static INLINE void produce_charset P_ ((struct coding_system *, int *, - EMACS_INT)); -static void produce_annotation P_ ((struct coding_system *, EMACS_INT)); -static int decode_coding P_ ((struct coding_system *)); -static INLINE int *handle_composition_annotation P_ ((EMACS_INT, EMACS_INT, - struct coding_system *, - int *, EMACS_INT *)); -static INLINE int *handle_charset_annotation P_ ((EMACS_INT, EMACS_INT, - struct coding_system *, - int *, EMACS_INT *)); -static void consume_chars P_ ((struct coding_system *, Lisp_Object, int)); -static int encode_coding P_ ((struct coding_system *)); -static Lisp_Object make_conversion_work_buffer P_ ((int)); -static Lisp_Object code_conversion_restore P_ ((Lisp_Object)); -static INLINE int char_encodable_p P_ ((int, Lisp_Object)); -static Lisp_Object make_subsidiaries P_ ((Lisp_Object)); +static void record_conversion_result (struct coding_system *coding, + enum coding_result_code result); +static int detect_coding_utf_8 (struct coding_system *, + struct coding_detection_info *info); +static void decode_coding_utf_8 (struct coding_system *); +static int encode_coding_utf_8 (struct coding_system *); + +static int detect_coding_utf_16 (struct coding_system *, + struct coding_detection_info *info); +static void decode_coding_utf_16 (struct coding_system *); +static int encode_coding_utf_16 (struct coding_system *); + +static int detect_coding_iso_2022 (struct coding_system *, + struct coding_detection_info *info); +static void decode_coding_iso_2022 (struct coding_system *); +static int encode_coding_iso_2022 (struct coding_system *); + +static int detect_coding_emacs_mule (struct coding_system *, + struct coding_detection_info *info); +static void decode_coding_emacs_mule (struct coding_system *); +static int encode_coding_emacs_mule (struct coding_system *); + +static int detect_coding_sjis (struct coding_system *, + struct coding_detection_info *info); +static void decode_coding_sjis (struct coding_system *); +static int encode_coding_sjis (struct coding_system *); + +static int detect_coding_big5 (struct coding_system *, + struct coding_detection_info *info); +static void decode_coding_big5 (struct coding_system *); +static int encode_coding_big5 (struct coding_system *); + +static int detect_coding_ccl (struct coding_system *, + struct coding_detection_info *info); +static void decode_coding_ccl (struct coding_system *); +static int encode_coding_ccl (struct coding_system *); + +static void decode_coding_raw_text (struct coding_system *); +static int encode_coding_raw_text (struct coding_system *); + +static void coding_set_source (struct coding_system *); +static void coding_set_destination (struct coding_system *); +static void coding_alloc_by_realloc (struct coding_system *, EMACS_INT); +static void coding_alloc_by_making_gap (struct coding_system *, + EMACS_INT, EMACS_INT); +static unsigned char *alloc_destination (struct coding_system *, + EMACS_INT, unsigned char *); +static void setup_iso_safe_charsets (Lisp_Object); +static unsigned char *encode_designation_at_bol (struct coding_system *, + int *, int *, + unsigned char *); +static int detect_eol (const unsigned char *, + EMACS_INT, enum coding_category); +static Lisp_Object adjust_coding_eol_type (struct coding_system *, int); +static void decode_eol (struct coding_system *); +static Lisp_Object get_translation_table (Lisp_Object, int, int *); +static Lisp_Object get_translation (Lisp_Object, int *, int *); +static int produce_chars (struct coding_system *, Lisp_Object, int); +static INLINE void produce_charset (struct coding_system *, int *, + EMACS_INT); +static void produce_annotation (struct coding_system *, EMACS_INT); +static int decode_coding (struct coding_system *); +static INLINE int *handle_composition_annotation (EMACS_INT, EMACS_INT, + struct coding_system *, + int *, EMACS_INT *); +static INLINE int *handle_charset_annotation (EMACS_INT, EMACS_INT, + struct coding_system *, + int *, EMACS_INT *); +static void consume_chars (struct coding_system *, Lisp_Object, int); +static int encode_coding (struct coding_system *); +static Lisp_Object make_conversion_work_buffer (int); +static Lisp_Object code_conversion_restore (Lisp_Object); +static INLINE int char_encodable_p (int, Lisp_Object); +static Lisp_Object make_subsidiaries (Lisp_Object); static void record_conversion_result (struct coding_system *coding, @@ -3442,7 +3442,7 @@ detect_coding_iso_2022 (coding, detect_info) /* Finish the current composition as invalid. */ -static int finish_composition P_ ((int *, struct composition_status *)); +static int finish_composition (int *, struct composition_status *); static int finish_composition (charbuf, cmp_status) diff --git a/src/composite.c b/src/composite.c index cab57e824a..6b2fe6a652 100644 --- a/src/composite.c +++ b/src/composite.c @@ -651,9 +651,9 @@ compose_text (start, end, components, modification_func, string) } -static Lisp_Object autocmp_chars P_ ((Lisp_Object, EMACS_INT, EMACS_INT, - EMACS_INT, struct window *, - struct face *, Lisp_Object)); +static Lisp_Object autocmp_chars (Lisp_Object, EMACS_INT, EMACS_INT, + EMACS_INT, struct window *, + struct face *, Lisp_Object); /* Lisp glyph-string handlers */ @@ -664,7 +664,7 @@ static Lisp_Object autocmp_chars P_ ((Lisp_Object, EMACS_INT, EMACS_INT, static Lisp_Object gstring_hash_table; -static Lisp_Object gstring_lookup_cache P_ ((Lisp_Object)); +static Lisp_Object gstring_lookup_cache (Lisp_Object); static Lisp_Object gstring_lookup_cache (header) @@ -715,9 +715,9 @@ composition_gstring_from_id (id) return HASH_VALUE (h, id); } -static Lisp_Object fill_gstring_header P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, - Lisp_Object)); +static Lisp_Object fill_gstring_header (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, + Lisp_Object); int composition_gstring_p (gstring) @@ -869,7 +869,7 @@ fill_gstring_header (header, start, end, font_object, string) return header; } -extern void font_fill_lglyph_metrics P_ ((Lisp_Object, Lisp_Object)); +extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object); static void fill_gstring_body (gstring) diff --git a/src/data.c b/src/data.c index 93cc57e9f2..d44176d9b0 100644 --- a/src/data.c +++ b/src/data.c @@ -2057,7 +2057,7 @@ If the current binding is global (the default), the value is nil. */) /* This code is disabled now that we use the selected frame to return keyboard-local-values. */ #if 0 -extern struct terminal *get_terminal P_ ((Lisp_Object display, int)); +extern struct terminal *get_terminal (Lisp_Object display, int); DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, 2, 0, doc: /* Return the terminal-local value of SYMBOL on TERMINAL. @@ -2605,8 +2605,8 @@ enum arithop Amin }; -static Lisp_Object float_arith_driver P_ ((double, int, enum arithop, - int, Lisp_Object *)); +static Lisp_Object float_arith_driver (double, int, enum arithop, + int, Lisp_Object *); extern Lisp_Object fmod_float (); Lisp_Object diff --git a/src/dired.c b/src/dired.c index c7f4774b99..c2090aeda0 100644 --- a/src/dired.c +++ b/src/dired.c @@ -93,7 +93,7 @@ extern struct direct *readdir (); extern struct re_pattern_buffer *compile_pattern (); /* From filemode.c. Can't go in Lisp.h because of `stat'. */ -extern void filemodestring P_ ((struct stat *, char *)); +extern void filemodestring (struct stat *, char *); /* if system does not have symbolic links, it does not have lstat. In that case, use ordinary stat instead. */ @@ -115,7 +115,7 @@ Lisp_Object Qfile_name_all_completions; Lisp_Object Qfile_attributes; Lisp_Object Qfile_attributes_lessp; -static int scmp P_ ((unsigned char *, unsigned char *, int)); +static int scmp (unsigned char *, unsigned char *, int); #ifdef WINDOWSNT Lisp_Object diff --git a/src/dispnew.c b/src/dispnew.c index a8ba199543..74c41dfcd4 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -114,73 +114,73 @@ struct dim /* Function prototypes. */ -static struct glyph_matrix *save_current_matrix P_ ((struct frame *)); -static void restore_current_matrix P_ ((struct frame *, struct glyph_matrix *)); -static int showing_window_margins_p P_ ((struct window *)); -static void fake_current_matrices P_ ((Lisp_Object)); -static void redraw_overlapping_rows P_ ((struct window *, int)); -static void redraw_overlapped_rows P_ ((struct window *, int)); -static int count_blanks P_ ((struct glyph *, int)); -static int count_match P_ ((struct glyph *, struct glyph *, - struct glyph *, struct glyph *)); -static unsigned line_draw_cost P_ ((struct glyph_matrix *, int)); -static void update_frame_line P_ ((struct frame *, int)); +static struct glyph_matrix *save_current_matrix (struct frame *); +static void restore_current_matrix (struct frame *, struct glyph_matrix *); +static int showing_window_margins_p (struct window *); +static void fake_current_matrices (Lisp_Object); +static void redraw_overlapping_rows (struct window *, int); +static void redraw_overlapped_rows (struct window *, int); +static int count_blanks (struct glyph *, int); +static int count_match (struct glyph *, struct glyph *, + struct glyph *, struct glyph *); +static unsigned line_draw_cost (struct glyph_matrix *, int); +static void update_frame_line (struct frame *, int); static struct dim allocate_matrices_for_frame_redisplay - P_ ((Lisp_Object, int, int, int, int *)); -static void allocate_matrices_for_window_redisplay P_ ((struct window *)); -static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim)); -static void adjust_frame_glyphs P_ ((struct frame *)); -struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *)); -static void free_glyph_matrix P_ ((struct glyph_matrix *)); -static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *, - int, int, struct dim)); -static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); -static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *)); + (Lisp_Object, int, int, int, int *); +static void allocate_matrices_for_window_redisplay (struct window *); +static int realloc_glyph_pool (struct glyph_pool *, struct dim); +static void adjust_frame_glyphs (struct frame *); +struct glyph_matrix *new_glyph_matrix (struct glyph_pool *); +static void free_glyph_matrix (struct glyph_matrix *); +static void adjust_glyph_matrix (struct window *, struct glyph_matrix *, + int, int, struct dim); +static void change_frame_size_1 (struct frame *, int, int, int, int, int); +static void swap_glyph_pointers (struct glyph_row *, struct glyph_row *); #if GLYPH_DEBUG -static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *)); +static int glyph_row_slice_p (struct glyph_row *, struct glyph_row *); #endif -static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); -static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *, - struct window *)); -static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *, - struct window *)); -static struct glyph_pool *new_glyph_pool P_ ((void)); -static void free_glyph_pool P_ ((struct glyph_pool *)); -static void adjust_frame_glyphs_initially P_ ((void)); -static void adjust_frame_message_buffer P_ ((struct frame *)); -static void adjust_decode_mode_spec_buffer P_ ((struct frame *)); -static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *)); -static void build_frame_matrix P_ ((struct frame *)); -void clear_current_matrices P_ ((struct frame *)); -void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int, - int, int)); -static void clear_window_matrices P_ ((struct window *, int)); -static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int)); -static int scrolling_window P_ ((struct window *, int)); -static int update_window_line P_ ((struct window *, int, int *)); -static void update_marginal_area P_ ((struct window *, int, int)); -static int update_text_area P_ ((struct window *, int)); -static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *, - int)); -static void mirror_make_current P_ ((struct window *, int)); -void check_window_matrix_pointers P_ ((struct window *)); +static void fill_up_frame_row_with_spaces (struct glyph_row *, int); +static void build_frame_matrix_from_window_tree (struct glyph_matrix *, + struct window *); +static void build_frame_matrix_from_leaf_window (struct glyph_matrix *, + struct window *); +static struct glyph_pool *new_glyph_pool (void); +static void free_glyph_pool (struct glyph_pool *); +static void adjust_frame_glyphs_initially (void); +static void adjust_frame_message_buffer (struct frame *); +static void adjust_decode_mode_spec_buffer (struct frame *); +static void fill_up_glyph_row_with_spaces (struct glyph_row *); +static void build_frame_matrix (struct frame *); +void clear_current_matrices (struct frame *); +void scroll_glyph_matrix_range (struct glyph_matrix *, int, int, + int, int); +static void clear_window_matrices (struct window *, int); +static void fill_up_glyph_row_area_with_spaces (struct glyph_row *, int); +static int scrolling_window (struct window *, int); +static int update_window_line (struct window *, int, int *); +static void update_marginal_area (struct window *, int, int); +static int update_text_area (struct window *, int); +static void make_current (struct glyph_matrix *, struct glyph_matrix *, + int); +static void mirror_make_current (struct window *, int); +void check_window_matrix_pointers (struct window *); #if GLYPH_DEBUG -static void check_matrix_pointers P_ ((struct glyph_matrix *, - struct glyph_matrix *)); +static void check_matrix_pointers (struct glyph_matrix *, + struct glyph_matrix *); #endif -static void mirror_line_dance P_ ((struct window *, int, int, int *, char *)); -static int update_window_tree P_ ((struct window *, int)); -static int update_window P_ ((struct window *, int)); -static int update_frame_1 P_ ((struct frame *, int, int)); -static void set_window_cursor_after_update P_ ((struct window *)); -static int row_equal_p P_ ((struct window *, struct glyph_row *, - struct glyph_row *, int)); -static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *)); -static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *)); -static void reverse_rows P_ ((struct glyph_matrix *, int, int)); -static int margin_glyphs_to_reserve P_ ((struct window *, int, Lisp_Object)); -static void sync_window_with_frame_matrix_rows P_ ((struct window *)); -struct window *frame_row_to_window P_ ((struct window *, int)); +static void mirror_line_dance (struct window *, int, int, int *, char *); +static int update_window_tree (struct window *, int); +static int update_window (struct window *, int); +static int update_frame_1 (struct frame *, int, int); +static void set_window_cursor_after_update (struct window *); +static int row_equal_p (struct window *, struct glyph_row *, + struct glyph_row *, int); +static void adjust_frame_glyphs_for_window_redisplay (struct frame *); +static void adjust_frame_glyphs_for_frame_redisplay (struct frame *); +static void reverse_rows (struct glyph_matrix *, int, int); +static int margin_glyphs_to_reserve (struct window *, int, Lisp_Object); +static void sync_window_with_frame_matrix_rows (struct window *); +struct window *frame_row_to_window (struct window *, int); /* Non-zero means don't pause redisplay for pending input. (This is @@ -325,8 +325,8 @@ int fonts_changed_p; #if GLYPH_DEBUG -static int window_to_frame_vpos P_ ((struct window *, int)); -static int window_to_frame_hpos P_ ((struct window *, int)); +static int window_to_frame_vpos (struct window *, int); +static int window_to_frame_hpos (struct window *, int); #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) @@ -355,8 +355,8 @@ static int history_idx; static unsigned history_tick; -static void add_frame_display_history P_ ((struct frame *, int)); -static void add_window_display_history P_ ((struct window *, char *, int)); +static void add_frame_display_history (struct frame *, int); +static void add_window_display_history (struct window *, char *, int); /* Add to the redisplay history how window W has been displayed. MSG is a trace containing the information how W's glyph matrix @@ -46,7 +46,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "buildobj.h" #ifdef HAVE_INDEX -extern char *index P_ ((const char *, int)); +extern char *index (const char *, int); #endif Lisp_Object Vdoc_file_name; @@ -65,7 +65,7 @@ static char *get_doc_string_buffer; static int get_doc_string_buffer_size; static unsigned char *read_bytecode_pointer; -Lisp_Object Fsnarf_documentation P_ ((Lisp_Object)); +Lisp_Object Fsnarf_documentation (Lisp_Object); /* readchar in lread.c calls back here to fetch the next byte. If UNREADFLAG is 1, we unread a byte. */ diff --git a/src/editfns.c b/src/editfns.c index ea279a462f..ac1d152ccd 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -86,38 +86,38 @@ extern char **environ; (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE) #endif -extern size_t emacs_strftimeu P_ ((char *, size_t, const char *, - const struct tm *, int)); +extern size_t emacs_strftimeu (char *, size_t, const char *, + const struct tm *, int); #ifdef WINDOWSNT extern Lisp_Object w32_get_internal_run_time (); #endif -static int tm_diff P_ ((struct tm *, struct tm *)); -static void find_field P_ ((Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *)); -static void update_buffer_properties P_ ((int, int)); -static Lisp_Object region_limit P_ ((int)); -int lisp_time_argument P_ ((Lisp_Object, time_t *, int *)); -static size_t emacs_memftimeu P_ ((char *, size_t, const char *, - size_t, const struct tm *, int)); +static int tm_diff (struct tm *, struct tm *); +static void find_field (Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *); +static void update_buffer_properties (int, int); +static Lisp_Object region_limit (int); +int lisp_time_argument (Lisp_Object, time_t *, int *); +static size_t emacs_memftimeu (char *, size_t, const char *, + size_t, const struct tm *, int); static void general_insert_function (void (*) (const unsigned char *, EMACS_INT), void (*) (Lisp_Object, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, int), int, int, Lisp_Object *); -static Lisp_Object subst_char_in_region_unwind P_ ((Lisp_Object)); -static Lisp_Object subst_char_in_region_unwind_1 P_ ((Lisp_Object)); -static void transpose_markers P_ ((int, int, int, int, int, int, int, int)); +static Lisp_Object subst_char_in_region_unwind (Lisp_Object); +static Lisp_Object subst_char_in_region_unwind_1 (Lisp_Object); +static void transpose_markers (int, int, int, int, int, int, int, int); #ifdef HAVE_INDEX -extern char *index P_ ((const char *, int)); +extern char *index (const char *, int); #endif Lisp_Object Vbuffer_access_fontify_functions; Lisp_Object Qbuffer_access_fontify_functions; Lisp_Object Vbuffer_access_fontified_property; -Lisp_Object Fuser_full_name P_ ((Lisp_Object)); +Lisp_Object Fuser_full_name (Lisp_Object); /* Non-nil means don't stop at field boundary in text motion commands. */ @@ -2953,7 +2953,7 @@ Both characters must have the same length of multi-byte form. */) } -static Lisp_Object check_translation P_ ((int, int, int, Lisp_Object)); +static Lisp_Object check_translation (int, int, int, Lisp_Object); /* Helper function for Ftranslate_region_internal. diff --git a/src/emacs.c b/src/emacs.c index 7e778e2e5f..d31a5f16f7 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -90,10 +90,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; const char emacs_version[] = "24.0.50"; -extern void malloc_warning P_ ((char *)); -extern void set_time_zone_rule P_ ((char *)); +extern void malloc_warning (char *); +extern void set_time_zone_rule (char *); #ifdef HAVE_INDEX -extern char *index P_ ((const char *, int)); +extern char *index (const char *, int); #endif /* Make these values available in GDB, which doesn't see macros. */ @@ -361,7 +361,7 @@ int fatal_error_in_progress; /* If non-null, call this function from fatal_error_signal before committing suicide. */ -void (*fatal_error_signal_hook) P_ ((void)); +void (*fatal_error_signal_hook) (void); #ifdef FORWARD_SIGNAL_TO_MAIN_THREAD /* When compiled with GTK and running under Gnome, @@ -1202,7 +1202,7 @@ main (int argc, char **argv) #endif #if defined (HAVE_GTK_AND_PTHREAD) && !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC) { - extern void malloc_enable_thread P_ ((void)); + extern void malloc_enable_thread (void); malloc_enable_thread (); } diff --git a/src/eval.c b/src/eval.c index 199c470573..239ee40ab9 100644 --- a/src/eval.c +++ b/src/eval.c @@ -170,8 +170,8 @@ extern Lisp_Object Qrisky_local_variable; extern Lisp_Object Qfunction; -static Lisp_Object funcall_lambda P_ ((Lisp_Object, int, Lisp_Object*)); -static void unwind_to_catch P_ ((struct catchtag *, Lisp_Object)) NO_RETURN; +static Lisp_Object funcall_lambda (Lisp_Object, int, Lisp_Object*); +static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; #if __GNUC__ /* "gcc -O3" enables automatic function inlining, which optimizes out @@ -1660,8 +1660,8 @@ internal_condition_case_n (Lisp_Object (*bfun) (int, Lisp_Object*), } -static Lisp_Object find_handler_clause P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object)); +static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object); DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0, doc: /* Signal an error. Args are ERROR-SYMBOL and associated DATA. @@ -2574,8 +2574,8 @@ usage: (apply FUNCTION &rest ARGUMENTS) */) /* Run hook variables in various ways. */ enum run_hooks_condition {to_completion, until_success, until_failure}; -static Lisp_Object run_hook_with_args P_ ((int, Lisp_Object *, - enum run_hooks_condition)); +static Lisp_Object run_hook_with_args (int, Lisp_Object *, + enum run_hooks_condition); DEFUN ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0, doc: /* Run each hook in HOOKS. @@ -3424,7 +3424,7 @@ specbind (symbol, value) void record_unwind_protect (function, arg) - Lisp_Object (*function) P_ ((Lisp_Object)); + Lisp_Object (*function) (Lisp_Object); Lisp_Object arg; { eassert (!handling_signal); diff --git a/src/fileio.c b/src/fileio.c index 8c2ee45c07..af477792ec 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -240,9 +240,9 @@ Lisp_Object Qfile_name_history; Lisp_Object Qcar_less_than_car; -static int a_write P_ ((int, Lisp_Object, int, int, - Lisp_Object *, struct coding_system *)); -static int e_write P_ ((int, Lisp_Object, int, int, struct coding_system *)); +static int a_write (int, Lisp_Object, int, int, + Lisp_Object *, struct coding_system *); +static int e_write (int, Lisp_Object, int, int, struct coding_system *); void @@ -3101,7 +3101,7 @@ The value is an integer. */) return value; } -extern int lisp_time_argument P_ ((Lisp_Object, time_t *, int *)); +extern int lisp_time_argument (Lisp_Object, time_t *, int *); DEFUN ("set-file-times", Fset_file_times, Sset_file_times, 1, 2, 0, doc: /* Set times of file FILENAME to TIME. @@ -4445,7 +4445,7 @@ variable `last-coding-system-used' to the coding system actually used. */) RETURN_UNGCPRO (unbind_to (count, val)); } -static Lisp_Object build_annotations P_ ((Lisp_Object, Lisp_Object)); +static Lisp_Object build_annotations (Lisp_Object, Lisp_Object); static Lisp_Object build_annotations_unwind (arg) diff --git a/src/filelock.c b/src/filelock.c index b11338c58b..69e15a5384 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -122,7 +122,7 @@ static int boot_time_initialized; extern Lisp_Object Vshell_file_name; #ifdef BOOT_TIME -static void get_boot_time_1 P_ ((char *, int)); +static void get_boot_time_1 (char *, int); #endif static time_t @@ -74,10 +74,10 @@ Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper; extern Lisp_Object Qinput_method_function; -static int internal_equal P_ ((Lisp_Object , Lisp_Object, int, int)); +static int internal_equal (Lisp_Object , Lisp_Object, int, int); extern long get_random (); -extern void seed_random P_ ((long)); +extern void seed_random (long); #ifndef HAVE_UNISTD_H extern long time (); @@ -383,9 +383,9 @@ Symbols are also allowed; their print names are used instead. */) /* "gcc -O3" enables automatic function inlining, which optimizes out the arguments for the invocations of this function, whereas it expects these values on the stack. */ -static Lisp_Object concat P_ ((int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special)) __attribute__((noinline)); +static Lisp_Object concat (int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special) __attribute__((noinline)); #else /* !__GNUC__ */ -static Lisp_Object concat P_ ((int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special)); +static Lisp_Object concat (int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special); #endif /* ARGSUSED */ @@ -3224,8 +3224,8 @@ static const short base64_char_to_value[128] = base64 characters. */ -static int base64_encode_1 P_ ((const char *, char *, int, int, int)); -static int base64_decode_1 P_ ((const char *, char *, int, int, int *)); +static int base64_encode_1 (const char *, char *, int, int, int); +static int base64_decode_1 (const char *, char *, int, int, int *); DEFUN ("base64-encode-region", Fbase64_encode_region, Sbase64_encode_region, 2, 3, "r", @@ -3652,25 +3652,25 @@ Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value; /* Function prototypes. */ -static struct Lisp_Hash_Table *check_hash_table P_ ((Lisp_Object)); -static int get_key_arg P_ ((Lisp_Object, int, Lisp_Object *, char *)); -static void maybe_resize_hash_table P_ ((struct Lisp_Hash_Table *)); -static int cmpfn_eql P_ ((struct Lisp_Hash_Table *, Lisp_Object, unsigned, - Lisp_Object, unsigned)); -static int cmpfn_equal P_ ((struct Lisp_Hash_Table *, Lisp_Object, unsigned, - Lisp_Object, unsigned)); -static int cmpfn_user_defined P_ ((struct Lisp_Hash_Table *, Lisp_Object, - unsigned, Lisp_Object, unsigned)); -static unsigned hashfn_eq P_ ((struct Lisp_Hash_Table *, Lisp_Object)); -static unsigned hashfn_eql P_ ((struct Lisp_Hash_Table *, Lisp_Object)); -static unsigned hashfn_equal P_ ((struct Lisp_Hash_Table *, Lisp_Object)); -static unsigned hashfn_user_defined P_ ((struct Lisp_Hash_Table *, - Lisp_Object)); -static unsigned sxhash_string P_ ((unsigned char *, int)); -static unsigned sxhash_list P_ ((Lisp_Object, int)); -static unsigned sxhash_vector P_ ((Lisp_Object, int)); -static unsigned sxhash_bool_vector P_ ((Lisp_Object)); -static int sweep_weak_table P_ ((struct Lisp_Hash_Table *, int)); +static struct Lisp_Hash_Table *check_hash_table (Lisp_Object); +static int get_key_arg (Lisp_Object, int, Lisp_Object *, char *); +static void maybe_resize_hash_table (struct Lisp_Hash_Table *); +static int cmpfn_eql (struct Lisp_Hash_Table *, Lisp_Object, unsigned, + Lisp_Object, unsigned); +static int cmpfn_equal (struct Lisp_Hash_Table *, Lisp_Object, unsigned, + Lisp_Object, unsigned); +static int cmpfn_user_defined (struct Lisp_Hash_Table *, Lisp_Object, + unsigned, Lisp_Object, unsigned); +static unsigned hashfn_eq (struct Lisp_Hash_Table *, Lisp_Object); +static unsigned hashfn_eql (struct Lisp_Hash_Table *, Lisp_Object); +static unsigned hashfn_equal (struct Lisp_Hash_Table *, Lisp_Object); +static unsigned hashfn_user_defined (struct Lisp_Hash_Table *, + Lisp_Object); +static unsigned sxhash_string (unsigned char *, int); +static unsigned sxhash_list (Lisp_Object, int); +static unsigned sxhash_vector (Lisp_Object, int); +static unsigned sxhash_bool_vector (Lisp_Object); +static int sweep_weak_table (struct Lisp_Hash_Table *, int); diff --git a/src/font.c b/src/font.c index f9c2381fa7..b92b44a38b 100644 --- a/src/font.c +++ b/src/font.c @@ -229,10 +229,10 @@ font_make_object (size, entity, pixelsize) -static int font_pixel_size P_ ((FRAME_PTR f, Lisp_Object)); -static Lisp_Object font_open_entity P_ ((FRAME_PTR, Lisp_Object, int)); -static Lisp_Object font_matching_entity P_ ((FRAME_PTR, Lisp_Object *, - Lisp_Object)); +static int font_pixel_size (FRAME_PTR f, Lisp_Object); +static Lisp_Object font_open_entity (FRAME_PTR, Lisp_Object, int); +static Lisp_Object font_matching_entity (FRAME_PTR, Lisp_Object *, + Lisp_Object); /* Number of registered font drivers. */ static int num_font_drivers; @@ -416,7 +416,7 @@ font_style_symbolic (font, prop, for_face) extern Lisp_Object Vface_alternative_font_family_alist; -extern Lisp_Object find_font_encoding P_ ((Lisp_Object)); +extern Lisp_Object find_font_encoding (Lisp_Object); /* Return ENCODING or a cons of ENCODING and REPERTORY of the font @@ -508,12 +508,12 @@ font_registry_charsets (registry, encoding, repertory) /* Font property value validaters. See the comment of font_property_table for the meaning of the arguments. */ -static Lisp_Object font_prop_validate P_ ((int, Lisp_Object, Lisp_Object)); -static Lisp_Object font_prop_validate_symbol P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object font_prop_validate_style P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object font_prop_validate_non_neg P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object font_prop_validate_spacing P_ ((Lisp_Object, Lisp_Object)); -static int get_font_prop_index P_ ((Lisp_Object)); +static Lisp_Object font_prop_validate (int, Lisp_Object, Lisp_Object); +static Lisp_Object font_prop_validate_symbol (Lisp_Object, Lisp_Object); +static Lisp_Object font_prop_validate_style (Lisp_Object, Lisp_Object); +static Lisp_Object font_prop_validate_non_neg (Lisp_Object, Lisp_Object); +static Lisp_Object font_prop_validate_spacing (Lisp_Object, Lisp_Object); +static int get_font_prop_index (Lisp_Object); static Lisp_Object font_prop_validate_symbol (prop, val) @@ -638,7 +638,7 @@ struct /* Function to validate PROP's value VAL, or NULL if any value is ok. The value is VAL or its regularized value if VAL is valid, and Qerror if not. */ - Lisp_Object (*validater) P_ ((Lisp_Object prop, Lisp_Object val)); + Lisp_Object (*validater) (Lisp_Object prop, Lisp_Object val); } font_property_table[] = { { &QCtype, font_prop_validate_symbol }, { &QCfoundry, font_prop_validate_symbol }, @@ -740,9 +740,9 @@ font_put_extra (font, prop, val) /* Font name parser and unparser */ -static int parse_matrix P_ ((char *)); -static int font_expand_wildcards P_ ((Lisp_Object *, int)); -static int font_parse_name P_ ((char *, Lisp_Object)); +static int parse_matrix (char *); +static int font_expand_wildcards (Lisp_Object *, int); +static int font_parse_name (char *, Lisp_Object); /* An enumerator for each field of an XLFD font name. */ enum xlfd_field_index @@ -2220,10 +2220,10 @@ font_otf_Anchor (anchor) /* Font sorting */ -static unsigned font_score P_ ((Lisp_Object, Lisp_Object *)); -static int font_compare P_ ((const void *, const void *)); -static Lisp_Object font_sort_entities P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, int)); +static unsigned font_score (Lisp_Object, Lisp_Object *); +static int font_compare (const void *, const void *); +static Lisp_Object font_sort_entities (Lisp_Object, Lisp_Object, + Lisp_Object, int); /* Return a rescaling ratio of FONT_ENTITY. */ extern Lisp_Object Vface_font_rescale_alist; @@ -2701,11 +2701,11 @@ font_match_p (spec, font) is a number frames sharing this cache, and FONT-CACHE-DATA is a cons (FONT-SPEC FONT-ENTITY ...). */ -static void font_prepare_cache P_ ((FRAME_PTR, struct font_driver *)); -static void font_finish_cache P_ ((FRAME_PTR, struct font_driver *)); -static Lisp_Object font_get_cache P_ ((FRAME_PTR, struct font_driver *)); -static void font_clear_cache P_ ((FRAME_PTR, Lisp_Object, - struct font_driver *)); +static void font_prepare_cache (FRAME_PTR, struct font_driver *); +static void font_finish_cache (FRAME_PTR, struct font_driver *); +static Lisp_Object font_get_cache (FRAME_PTR, struct font_driver *); +static void font_clear_cache (FRAME_PTR, Lisp_Object, + struct font_driver *); static void font_prepare_cache (f, driver) @@ -5249,14 +5249,14 @@ font_deferred_log (action, arg, result) ASET (Vfont_log_deferred, 2, result); } -extern void syms_of_ftfont P_ (()); -extern void syms_of_xfont P_ (()); -extern void syms_of_xftfont P_ (()); -extern void syms_of_ftxfont P_ (()); -extern void syms_of_bdffont P_ (()); -extern void syms_of_w32font P_ (()); -extern void syms_of_atmfont P_ (()); -extern void syms_of_nsfont P_ (()); +extern void syms_of_ftfont (); +extern void syms_of_xfont (); +extern void syms_of_xftfont (); +extern void syms_of_ftxfont (); +extern void syms_of_bdffont (); +extern void syms_of_w32font (); +extern void syms_of_atmfont (); +extern void syms_of_nsfont (); void syms_of_font () diff --git a/src/fontset.c b/src/fontset.c index e4fd9d7278..8403583855 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -203,23 +203,23 @@ Lisp_Object Vvertical_centering_font_regexp; Lisp_Object Votf_script_alist; /* Check if any window system is used now. */ -void (*check_window_system_func) P_ ((void)); +void (*check_window_system_func) (void); /* Prototype declarations for static functions. */ -static Lisp_Object fontset_add P_ ((Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object)); -static Lisp_Object fontset_find_font P_ ((Lisp_Object, int, struct face *, - int, int)); -static void reorder_font_vector P_ ((Lisp_Object, struct font *)); -static Lisp_Object fontset_font P_ ((Lisp_Object, int, struct face *, int)); -static Lisp_Object make_fontset P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); -static Lisp_Object fontset_pattern_regexp P_ ((Lisp_Object)); -static void accumulate_script_ranges P_ ((Lisp_Object, Lisp_Object, - Lisp_Object)); -Lisp_Object find_font_encoding P_ ((Lisp_Object)); - -static void set_fontset_font P_ ((Lisp_Object, Lisp_Object)); +static Lisp_Object fontset_add (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object); +static Lisp_Object fontset_find_font (Lisp_Object, int, struct face *, + int, int); +static void reorder_font_vector (Lisp_Object, struct font *); +static Lisp_Object fontset_font (Lisp_Object, int, struct face *, int); +static Lisp_Object make_fontset (Lisp_Object, Lisp_Object, Lisp_Object); +static Lisp_Object fontset_pattern_regexp (Lisp_Object); +static void accumulate_script_ranges (Lisp_Object, Lisp_Object, + Lisp_Object); +Lisp_Object find_font_encoding (Lisp_Object); + +static void set_fontset_font (Lisp_Object, Lisp_Object); #ifdef FONTSET_DEBUG @@ -1440,7 +1440,7 @@ set_fontset_font (arg, range) } extern Lisp_Object QCfamily, QCregistry; -static void update_auto_fontset_alist P_ ((Lisp_Object, Lisp_Object)); +static void update_auto_fontset_alist (Lisp_Object, Lisp_Object); DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 5, 0, diff --git a/src/frame.c b/src/frame.c index c323c61be6..3199d35004 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1823,7 +1823,7 @@ before calling this function on it, like this. return Qnil; } -static void make_frame_visible_1 P_ ((Lisp_Object)); +static void make_frame_visible_1 (Lisp_Object); DEFUN ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible, 0, 1, "", @@ -3824,8 +3824,8 @@ validate_x_resource_name () } -extern char *x_get_string_resource P_ ((XrmDatabase, char *, char *)); -extern Display_Info *check_x_display_info P_ ((Lisp_Object)); +extern char *x_get_string_resource (XrmDatabase, char *, char *); +extern Display_Info *check_x_display_info (Lisp_Object); /* Get specified attribute from resource database RDB. diff --git a/src/ftfont.c b/src/ftfont.c index 33a96143fd..a75296cc7b 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -80,16 +80,16 @@ enum ftfont_cache_for FTFONT_CACHE_FOR_ENTITY }; -static Lisp_Object ftfont_pattern_entity P_ ((FcPattern *, Lisp_Object)); +static Lisp_Object ftfont_pattern_entity (FcPattern *, Lisp_Object); -static Lisp_Object ftfont_resolve_generic_family P_ ((Lisp_Object, - FcPattern *)); -static Lisp_Object ftfont_lookup_cache P_ ((Lisp_Object, - enum ftfont_cache_for)); +static Lisp_Object ftfont_resolve_generic_family (Lisp_Object, + FcPattern *); +static Lisp_Object ftfont_lookup_cache (Lisp_Object, + enum ftfont_cache_for); -static void ftfont_filter_properties P_ ((Lisp_Object font, Lisp_Object alist)); +static void ftfont_filter_properties (Lisp_Object font, Lisp_Object alist); -Lisp_Object ftfont_font_format P_ ((FcPattern *, Lisp_Object)); +Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object); #define SYMBOL_FcChar8(SYM) (FcChar8 *) SDATA (SYMBOL_NAME (SYM)) @@ -486,26 +486,26 @@ ftfont_get_otf (ftfont_info) } #endif /* HAVE_LIBOTF */ -static Lisp_Object ftfont_get_cache P_ ((FRAME_PTR)); -static Lisp_Object ftfont_list P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object ftfont_match P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object ftfont_list_family P_ ((Lisp_Object)); -static Lisp_Object ftfont_open P_ ((FRAME_PTR, Lisp_Object, int)); -static void ftfont_close P_ ((FRAME_PTR, struct font *)); -static int ftfont_has_char P_ ((Lisp_Object, int)); -static unsigned ftfont_encode_char P_ ((struct font *, int)); -static int ftfont_text_extents P_ ((struct font *, unsigned *, int, - struct font_metrics *)); -static int ftfont_get_bitmap P_ ((struct font *, unsigned, - struct font_bitmap *, int)); -static int ftfont_anchor_point P_ ((struct font *, unsigned, int, - int *, int *)); -static Lisp_Object ftfont_otf_capability P_ ((struct font *)); -static Lisp_Object ftfont_shape P_ ((Lisp_Object)); +static Lisp_Object ftfont_get_cache (FRAME_PTR); +static Lisp_Object ftfont_list (Lisp_Object, Lisp_Object); +static Lisp_Object ftfont_match (Lisp_Object, Lisp_Object); +static Lisp_Object ftfont_list_family (Lisp_Object); +static Lisp_Object ftfont_open (FRAME_PTR, Lisp_Object, int); +static void ftfont_close (FRAME_PTR, struct font *); +static int ftfont_has_char (Lisp_Object, int); +static unsigned ftfont_encode_char (struct font *, int); +static int ftfont_text_extents (struct font *, unsigned *, int, + struct font_metrics *); +static int ftfont_get_bitmap (struct font *, unsigned, + struct font_bitmap *, int); +static int ftfont_anchor_point (struct font *, unsigned, int, + int *, int *); +static Lisp_Object ftfont_otf_capability (struct font *); +static Lisp_Object ftfont_shape (Lisp_Object); #ifdef HAVE_OTF_GET_VARIATION_GLYPHS -static int ftfont_variation_glyphs P_ ((struct font *, int c, - unsigned variations[256])); +static int ftfont_variation_glyphs (struct font *, int c, + unsigned variations[256]); #endif /* HAVE_OTF_GET_VARIATION_GLYPHS */ struct font_driver ftfont_driver = @@ -705,9 +705,9 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec) return spec; } -static FcPattern *ftfont_spec_pattern P_ ((Lisp_Object, char *, - struct OpenTypeSpec **, - char **langname)); +static FcPattern *ftfont_spec_pattern (Lisp_Object, char *, + struct OpenTypeSpec **, + char **langname); static FcPattern * ftfont_spec_pattern (spec, otlayout, otspec, langname) diff --git a/src/ftxfont.c b/src/ftxfont.c index 847522a2f9..e81a538004 100644 --- a/src/ftxfont.c +++ b/src/ftxfont.c @@ -39,12 +39,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ static Lisp_Object Qftx; /* Prototypes for helper function. */ -static GC *ftxfont_get_gcs P_ ((FRAME_PTR, unsigned long, unsigned long)); -static int ftxfont_draw_bitmap P_ ((FRAME_PTR, GC, GC *, struct font *, - unsigned, int, int, XPoint *, int, int *, - int)); -static void ftxfont_draw_backgrond P_ ((FRAME_PTR, struct font *, GC, - int, int, int)); +static GC *ftxfont_get_gcs (FRAME_PTR, unsigned long, unsigned long); +static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *, + unsigned, int, int, XPoint *, int, int *, + int); +static void ftxfont_draw_backgrond (FRAME_PTR, struct font *, GC, + int, int, int); struct ftxfont_frame_data { @@ -241,11 +241,11 @@ ftxfont_draw_backgrond (f, font, gc, x, y, width) } /* Prototypes for font-driver methods. */ -static Lisp_Object ftxfont_list P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object ftxfont_match P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object ftxfont_open P_ ((FRAME_PTR, Lisp_Object, int)); -static void ftxfont_close P_ ((FRAME_PTR, struct font *)); -static int ftxfont_draw P_ ((struct glyph_string *, int, int, int, int, int)); +static Lisp_Object ftxfont_list (Lisp_Object, Lisp_Object); +static Lisp_Object ftxfont_match (Lisp_Object, Lisp_Object); +static Lisp_Object ftxfont_open (FRAME_PTR, Lisp_Object, int); +static void ftxfont_close (FRAME_PTR, struct font *); +static int ftxfont_draw (struct glyph_string *, int, int, int, int, int); struct font_driver ftxfont_driver; diff --git a/src/gmalloc.c b/src/gmalloc.c index a3f533bd5e..8314798b17 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -1969,12 +1969,12 @@ Fifth Floor, Boston, MA 02110-1301, USA. #endif /* Old hook values. */ -static void (*old_free_hook) __P ((__ptr_t ptr)); -static __ptr_t (*old_malloc_hook) __P ((__malloc_size_t size)); -static __ptr_t (*old_realloc_hook) __P ((__ptr_t ptr, __malloc_size_t size)); +static void (*old_free_hook) (__ptr_t ptr); +static __ptr_t (*old_malloc_hook) (__malloc_size_t size); +static __ptr_t (*old_realloc_hook) (__ptr_t ptr, __malloc_size_t size); /* Function to call when something awful happens. */ -static void (*abortfunc) __P ((enum mcheck_status)); +static void (*abortfunc) (enum mcheck_status); /* Arbitrary magical numbers. */ #define MAGICWORD 0xfedabeeb @@ -1992,7 +1992,7 @@ struct hdr #if defined(_LIBC) || defined(STDC_HEADERS) || defined(USG) #define flood memset #else -static void flood __P ((__ptr_t, int, __malloc_size_t)); +static void flood (__ptr_t, int, __malloc_size_t); static void flood (ptr, val, size) __ptr_t ptr; @@ -2005,7 +2005,7 @@ flood (ptr, val, size) } #endif -static enum mcheck_status checkhdr __P ((const struct hdr *)); +static enum mcheck_status checkhdr (const struct hdr *); static enum mcheck_status checkhdr (hdr) const struct hdr *hdr; @@ -2031,7 +2031,7 @@ checkhdr (hdr) return status; } -static void freehook __P ((__ptr_t)); +static void freehook (__ptr_t); static void freehook (ptr) __ptr_t ptr; @@ -2053,7 +2053,7 @@ freehook (ptr) __free_hook = freehook; } -static __ptr_t mallochook __P ((__malloc_size_t)); +static __ptr_t mallochook (__malloc_size_t); static __ptr_t mallochook (size) __malloc_size_t size; @@ -2073,7 +2073,7 @@ mallochook (size) return (__ptr_t) (hdr + 1); } -static __ptr_t reallochook __P ((__ptr_t, __malloc_size_t)); +static __ptr_t reallochook (__ptr_t, __malloc_size_t); static __ptr_t reallochook (ptr, size) __ptr_t ptr; @@ -2146,7 +2146,7 @@ static int mcheck_used = 0; int mcheck (func) - void (*func) __P ((enum mcheck_status)); + void (*func) (enum mcheck_status); { abortfunc = (func != NULL) ? func : &mabort; diff --git a/src/gtkutil.c b/src/gtkutil.c index 6a75aa473e..63de2b02fe 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1319,7 +1319,7 @@ xg_uses_old_file_dialog () } -typedef char * (*xg_get_file_func) P_ ((GtkWidget *)); +typedef char * (*xg_get_file_func) (GtkWidget *); /* Return the selected file for file chooser dialog W. The returned string must be free:d. */ @@ -2087,9 +2087,9 @@ xg_create_one_menuitem (item, f, select_cb, highlight_cb, cl_data, group) return w; } -static GtkWidget *create_menus P_ ((widget_value *, FRAME_PTR, GCallback, - GCallback, GCallback, int, int, int, - GtkWidget *, xg_menu_cb_data *, char *)); +static GtkWidget *create_menus (widget_value *, FRAME_PTR, GCallback, + GCallback, GCallback, int, int, int, + GtkWidget *, xg_menu_cb_data *, char *); /* Create a full menu tree specified by DATA. F is the frame the created menu belongs to. @@ -3466,9 +3466,9 @@ xg_tool_bar_proxy_callback (w, client_data) static gboolean -xg_tool_bar_help_callback P_ ((GtkWidget *w, - GdkEventCrossing *event, - gpointer client_data)); +xg_tool_bar_help_callback (GtkWidget *w, + GdkEventCrossing *event, + gpointer client_data); /* This callback is called when a help is to be shown for an item in the detached tool bar when the detached tool bar it is not expanded. */ diff --git a/src/image.c b/src/image.c index b9620e1094..821246eac0 100644 --- a/src/image.c +++ b/src/image.c @@ -127,16 +127,16 @@ typedef struct ns_bitmap_record Bitmap_Record; Lisp_Object Vx_bitmap_file_path; -static void x_disable_image P_ ((struct frame *, struct image *)); -static void x_edge_detection P_ ((struct frame *, struct image *, Lisp_Object, - Lisp_Object)); +static void x_disable_image (struct frame *, struct image *); +static void x_edge_detection (struct frame *, struct image *, Lisp_Object, + Lisp_Object); -static void init_color_table P_ ((void)); -static unsigned long lookup_rgb_color P_ ((struct frame *f, int r, int g, int b)); +static void init_color_table (void); +static unsigned long lookup_rgb_color (struct frame *f, int r, int g, int b); #ifdef COLOR_TABLE_SUPPORT -static void free_color_table P_ ((void)); -static unsigned long *colors_in_color_table P_ ((int *n)); -static unsigned long lookup_pixel_color P_ ((struct frame *f, unsigned long p)); +static void free_color_table (void); +static unsigned long *colors_in_color_table (int *n); +static unsigned long lookup_pixel_color (struct frame *f, unsigned long p); #endif /* Code to deal with bitmaps. Bitmaps are referenced by their bitmap @@ -471,16 +471,16 @@ x_destroy_all_bitmaps (dpyinfo) /* Useful functions defined in the section `Image type independent image structures' below. */ -static unsigned long four_corners_best P_ ((XImagePtr ximg, - int *corners, - unsigned long width, - unsigned long height)); +static unsigned long four_corners_best (XImagePtr ximg, + int *corners, + unsigned long width, + unsigned long height); -static int x_create_x_image_and_pixmap P_ ((struct frame *f, int width, int height, - int depth, XImagePtr *ximg, - Pixmap *pixmap)); +static int x_create_x_image_and_pixmap (struct frame *f, int width, int height, + int depth, XImagePtr *ximg, + Pixmap *pixmap); -static void x_destroy_x_image P_ ((XImagePtr ximg)); +static void x_destroy_x_image (XImagePtr ximg); /* Create a mask of a bitmap. Note is this not a perfect mask. @@ -619,13 +619,13 @@ Lisp_Object Vimage_cache_eviction_delay; /* Function prototypes. */ -static Lisp_Object define_image_type P_ ((struct image_type *type, int loaded)); -static struct image_type *lookup_image_type P_ ((Lisp_Object symbol)); -static void image_error P_ ((char *format, Lisp_Object, Lisp_Object)); -static void x_laplace P_ ((struct frame *, struct image *)); -static void x_emboss P_ ((struct frame *, struct image *)); -static int x_build_heuristic_mask P_ ((struct frame *, struct image *, - Lisp_Object)); +static Lisp_Object define_image_type (struct image_type *type, int loaded); +static struct image_type *lookup_image_type (Lisp_Object symbol); +static void image_error (char *format, Lisp_Object, Lisp_Object); +static void x_laplace (struct frame *, struct image *); +static void x_emboss (struct frame *, struct image *); +static int x_build_heuristic_mask (struct frame *, struct image *, + Lisp_Object); #define CACHE_IMAGE_TYPE(type, status) \ do { Vimage_type_cache = Fcons (Fcons (type, status), Vimage_type_cache); } while (0) @@ -776,9 +776,9 @@ struct image_keyword }; -static int parse_image_spec P_ ((Lisp_Object, struct image_keyword *, - int, Lisp_Object)); -static Lisp_Object image_spec_value P_ ((Lisp_Object, Lisp_Object, int *)); +static int parse_image_spec (Lisp_Object, struct image_keyword *, + int, Lisp_Object); +static Lisp_Object image_spec_value (Lisp_Object, Lisp_Object, int *); /* Parse image spec SPEC according to KEYWORDS. A valid image spec @@ -1037,9 +1037,9 @@ or omitted means use the selected frame. */) Image type independent image structures ***********************************************************************/ -static struct image *make_image P_ ((Lisp_Object spec, unsigned hash)); -static void free_image P_ ((struct frame *f, struct image *img)); -static int check_image_size P_ ((struct frame *f, int width, int height)); +static struct image *make_image (Lisp_Object spec, unsigned hash); +static void free_image (struct frame *f, struct image *img); +static int check_image_size (struct frame *f, int width, int height); #define MAX_IMAGE_SIZE 6.0 Lisp_Object Vmax_image_size; @@ -1371,13 +1371,13 @@ image_background_transparent (img, f, mask) Helper functions for X image types ***********************************************************************/ -static void x_clear_image_1 P_ ((struct frame *, struct image *, int, - int, int)); -static void x_clear_image P_ ((struct frame *f, struct image *img)); -static unsigned long x_alloc_image_color P_ ((struct frame *f, - struct image *img, - Lisp_Object color_name, - unsigned long dflt)); +static void x_clear_image_1 (struct frame *, struct image *, int, + int, int); +static void x_clear_image (struct frame *f, struct image *img); +static unsigned long x_alloc_image_color (struct frame *f, + struct image *img, + Lisp_Object color_name, + unsigned long dflt); /* Clear X resources of image IMG on frame F. PIXMAP_P non-zero means @@ -1472,9 +1472,9 @@ x_alloc_image_color (f, img, color_name, dflt) Image Cache ***********************************************************************/ -static struct image *search_image_cache P_ ((struct frame *, Lisp_Object, unsigned)); -static void cache_image P_ ((struct frame *f, struct image *img)); -static void postprocess_image P_ ((struct frame *, struct image *)); +static struct image *search_image_cache (struct frame *, Lisp_Object, unsigned); +static void cache_image (struct frame *f, struct image *img); +static void postprocess_image (struct frame *, struct image *); /* Return a new, initialized image cache that is allocated from the heap. Call free_image_cache to free an image cache. */ @@ -2033,10 +2033,10 @@ w32_delayed_load (Lisp_Object libraries, Lisp_Object type) #endif /* HAVE_NTGUI */ -static int x_create_x_image_and_pixmap P_ ((struct frame *, int, int, int, - XImagePtr *, Pixmap *)); -static void x_destroy_x_image P_ ((XImagePtr)); -static void x_put_x_image P_ ((struct frame *, XImagePtr, Pixmap, int, int)); +static int x_create_x_image_and_pixmap (struct frame *, int, int, int, + XImagePtr *, Pixmap *); +static void x_destroy_x_image (XImagePtr); +static void x_put_x_image (struct frame *, XImagePtr, Pixmap, int, int); /* Create an XImage and a pixmap of size WIDTH x HEIGHT for use on @@ -2253,7 +2253,7 @@ x_put_x_image (f, ximg, pixmap, width, height) File Handling ***********************************************************************/ -static unsigned char *slurp_file P_ ((char *, int *)); +static unsigned char *slurp_file (char *, int *); /* Find image file FILE. Look in data-directory/images, then @@ -2333,15 +2333,15 @@ slurp_file (file, size) XBM images ***********************************************************************/ -static int xbm_scan P_ ((unsigned char **, unsigned char *, char *, int *)); -static int xbm_load P_ ((struct frame *f, struct image *img)); -static int xbm_load_image P_ ((struct frame *f, struct image *img, - unsigned char *, unsigned char *)); -static int xbm_image_p P_ ((Lisp_Object object)); -static int xbm_read_bitmap_data P_ ((struct frame *f, - unsigned char *, unsigned char *, - int *, int *, unsigned char **, int)); -static int xbm_file_p P_ ((Lisp_Object)); +static int xbm_scan (unsigned char **, unsigned char *, char *, int *); +static int xbm_load (struct frame *f, struct image *img); +static int xbm_load_image (struct frame *f, struct image *img, + unsigned char *, unsigned char *); +static int xbm_image_p (Lisp_Object object); +static int xbm_read_bitmap_data (struct frame *f, + unsigned char *, unsigned char *, + int *, int *, unsigned char **, int); +static int xbm_file_p (Lisp_Object); /* Indices of image specification fields in xbm_format, below. */ @@ -3114,9 +3114,9 @@ xbm_load (f, img) #if defined (HAVE_XPM) || defined (HAVE_NS) -static int xpm_image_p P_ ((Lisp_Object object)); -static int xpm_load P_ ((struct frame *f, struct image *img)); -static int xpm_valid_color_symbols_p P_ ((Lisp_Object)); +static int xpm_image_p (Lisp_Object object); +static int xpm_load (struct frame *f, struct image *img); +static int xpm_valid_color_symbols_p (Lisp_Object); #endif /* HAVE_XPM || HAVE_NS */ @@ -3207,12 +3207,12 @@ static struct image_type xpm_type = #ifdef ALLOC_XPM_COLORS -static void xpm_init_color_cache P_ ((struct frame *, XpmAttributes *)); -static void xpm_free_color_cache P_ ((void)); -static int xpm_lookup_color P_ ((struct frame *, char *, XColor *)); -static int xpm_color_bucket P_ ((char *)); -static struct xpm_cached_color *xpm_cache_color P_ ((struct frame *, char *, - XColor *, int)); +static void xpm_init_color_cache (struct frame *, XpmAttributes *); +static void xpm_free_color_cache (void); +static int xpm_lookup_color (struct frame *, char *, XColor *); +static int xpm_color_bucket (char *); +static struct xpm_cached_color *xpm_cache_color (struct frame *, char *, + XColor *, int); /* An entry in a hash table used to cache color definitions of named colors. This cache is necessary to speed up XPM image loading in @@ -3752,25 +3752,25 @@ xpm_load (f, img) /* XPM support functions for NS where libxpm is not available. Only XPM version 3 (without any extensions) is supported. */ -static int xpm_scan P_ ((const unsigned char **, const unsigned char *, - const unsigned char **, int *)); +static int xpm_scan (const unsigned char **, const unsigned char *, + const unsigned char **, int *); static Lisp_Object xpm_make_color_table_v - P_ ((void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object), - Lisp_Object (**) (Lisp_Object, const unsigned char *, int))); -static void xpm_put_color_table_v P_ ((Lisp_Object, const unsigned char *, - int, Lisp_Object)); -static Lisp_Object xpm_get_color_table_v P_ ((Lisp_Object, - const unsigned char *, int)); + (void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object), + Lisp_Object (**) (Lisp_Object, const unsigned char *, int)); +static void xpm_put_color_table_v (Lisp_Object, const unsigned char *, + int, Lisp_Object); +static Lisp_Object xpm_get_color_table_v (Lisp_Object, + const unsigned char *, int); static Lisp_Object xpm_make_color_table_h - P_ ((void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object), - Lisp_Object (**) (Lisp_Object, const unsigned char *, int))); -static void xpm_put_color_table_h P_ ((Lisp_Object, const unsigned char *, - int, Lisp_Object)); -static Lisp_Object xpm_get_color_table_h P_ ((Lisp_Object, - const unsigned char *, int)); -static int xpm_str_to_color_key P_ ((const char *)); -static int xpm_load_image P_ ((struct frame *, struct image *, - const unsigned char *, const unsigned char *)); + (void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object), + Lisp_Object (**) (Lisp_Object, const unsigned char *, int)); +static void xpm_put_color_table_h (Lisp_Object, const unsigned char *, + int, Lisp_Object); +static Lisp_Object xpm_get_color_table_h (Lisp_Object, + const unsigned char *, int); +static int xpm_str_to_color_key (const char *); +static int xpm_load_image (struct frame *, struct image *, + const unsigned char *, const unsigned char *); /* Tokens returned from xpm_scan. */ @@ -4515,9 +4515,9 @@ init_color_table () Algorithms ***********************************************************************/ -static XColor *x_to_xcolors P_ ((struct frame *, struct image *, int)); -static void x_from_xcolors P_ ((struct frame *, struct image *, XColor *)); -static void x_detect_edges P_ ((struct frame *, struct image *, int[9], int)); +static XColor *x_to_xcolors (struct frame *, struct image *, int); +static void x_from_xcolors (struct frame *, struct image *, XColor *); +static void x_detect_edges (struct frame *, struct image *, int[9], int); #ifdef HAVE_NTGUI static void XPutPixel (XImagePtr , int, int, COLORREF); @@ -5087,9 +5087,9 @@ x_build_heuristic_mask (f, img, how) PBM (mono, gray, color) ***********************************************************************/ -static int pbm_image_p P_ ((Lisp_Object object)); -static int pbm_load P_ ((struct frame *f, struct image *img)); -static int pbm_scan_number P_ ((unsigned char **, unsigned char *)); +static int pbm_image_p (Lisp_Object object); +static int pbm_load (struct frame *f, struct image *img); +static int pbm_scan_number (unsigned char **, unsigned char *); /* The symbol `pbm' identifying images of this type. */ @@ -5511,8 +5511,8 @@ pbm_load (f, img) /* Function prototypes. */ -static int png_image_p P_ ((Lisp_Object object)); -static int png_load P_ ((struct frame *f, struct image *img)); +static int png_image_p (Lisp_Object object); +static int png_load (struct frame *f, struct image *img); /* The symbol `png' identifying images of this type. */ @@ -6113,8 +6113,8 @@ png_load (struct frame *f, struct image *img) #if defined (HAVE_JPEG) || defined (HAVE_NS) -static int jpeg_image_p P_ ((Lisp_Object object)); -static int jpeg_load P_ ((struct frame *f, struct image *img)); +static int jpeg_image_p (Lisp_Object object); +static int jpeg_load (struct frame *f, struct image *img); /* The symbol `jpeg' identifying images of this type. */ @@ -6685,8 +6685,8 @@ jpeg_load (struct frame *f, struct image *img) #if defined (HAVE_TIFF) || defined (HAVE_NS) -static int tiff_image_p P_ ((Lisp_Object object)); -static int tiff_load P_ ((struct frame *f, struct image *img)); +static int tiff_image_p (Lisp_Object object); +static int tiff_load (struct frame *f, struct image *img); /* The symbol `tiff' identifying images of this type. */ @@ -7136,9 +7136,9 @@ tiff_load (struct frame *f, struct image *img) #if defined (HAVE_GIF) || defined (HAVE_NS) -static int gif_image_p P_ ((Lisp_Object object)); -static int gif_load P_ ((struct frame *f, struct image *img)); -static void gif_clear_image P_ ((struct frame *f, struct image *img)); +static int gif_image_p (Lisp_Object object); +static int gif_load (struct frame *f, struct image *img); +static void gif_clear_image (struct frame *f, struct image *img); /* The symbol `gif' identifying images of this type. */ @@ -7576,11 +7576,11 @@ gif_load (struct frame *f, struct image *img) /* Function prototypes. */ -static int svg_image_p P_ ((Lisp_Object object)); -static int svg_load P_ ((struct frame *f, struct image *img)); +static int svg_image_p (Lisp_Object object); +static int svg_load (struct frame *f, struct image *img); -static int svg_load_image P_ ((struct frame *, struct image *, - unsigned char *, unsigned int)); +static int svg_load_image (struct frame *, struct image *, + unsigned char *, unsigned int); /* The symbol `svg' identifying images of this type. */ @@ -7982,9 +7982,9 @@ Lisp_Object Qpostscript; #ifdef HAVE_GHOSTSCRIPT -static int gs_image_p P_ ((Lisp_Object object)); -static int gs_load P_ ((struct frame *f, struct image *img)); -static void gs_clear_image P_ ((struct frame *f, struct image *img)); +static int gs_image_p (Lisp_Object object); +static int gs_load (struct frame *f, struct image *img); +static void gs_clear_image (struct frame *f, struct image *img); /* Keyword symbols. */ diff --git a/src/indent.c b/src/indent.c index b64eae1c42..de0026fe10 100644 --- a/src/indent.c +++ b/src/indent.c @@ -61,8 +61,8 @@ EMACS_INT last_known_column_point; static int last_known_column_modified; -static double current_column_1 P_ ((void)); -static double position_indentation P_ ((int)); +static double current_column_1 (void); +static double position_indentation (int); /* Cache of beginning of line found by the last call of current_column. */ @@ -867,7 +867,7 @@ The return value is COLUMN. */) } -static double position_indentation P_ ((int)); +static double position_indentation (int); DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation, 0, 0, 0, diff --git a/src/intervals.c b/src/intervals.c index 9836f76348..4f12d711bf 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -53,8 +53,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set)) Lisp_Object merge_properties_sticky (); -static INTERVAL reproduce_tree P_ ((INTERVAL, INTERVAL)); -static INTERVAL reproduce_tree_obj P_ ((INTERVAL, Lisp_Object)); +static INTERVAL reproduce_tree (INTERVAL, INTERVAL); +static INTERVAL reproduce_tree_obj (INTERVAL, Lisp_Object); /* Utility functions for intervals. */ @@ -208,7 +208,7 @@ intervals_equal (i0, i1) void traverse_intervals_noorder (tree, function, arg) INTERVAL tree; - void (* function) P_ ((INTERVAL, Lisp_Object)); + void (* function) (INTERVAL, Lisp_Object); Lisp_Object arg; { /* Minimize stack usage. */ @@ -232,7 +232,7 @@ void traverse_intervals (tree, position, function, arg) INTERVAL tree; int position; - void (* function) P_ ((INTERVAL, Lisp_Object)); + void (* function) (INTERVAL, Lisp_Object); Lisp_Object arg; { while (!NULL_INTERVAL_P (tree)) diff --git a/src/keyboard.c b/src/keyboard.c index 63372d600e..d7e01af0bc 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -613,39 +613,39 @@ Lisp_Object Venable_disabled_menus_and_buttons; /* Function for init_keyboard to call with no args (if nonzero). */ void (*keyboard_init_hook) (); -static int read_avail_input P_ ((int)); -static void get_input_pending P_ ((int *, int)); -static int readable_events P_ ((int)); -static Lisp_Object read_char_x_menu_prompt P_ ((int, Lisp_Object *, - Lisp_Object, int *)); +static int read_avail_input (int); +static void get_input_pending (int *, int); +static int readable_events (int); +static Lisp_Object read_char_x_menu_prompt (int, Lisp_Object *, + Lisp_Object, int *); static Lisp_Object read_char_x_menu_prompt (); -static Lisp_Object read_char_minibuf_menu_prompt P_ ((int, int, - Lisp_Object *)); -static Lisp_Object make_lispy_event P_ ((struct input_event *)); +static Lisp_Object read_char_minibuf_menu_prompt (int, int, + Lisp_Object *); +static Lisp_Object make_lispy_event (struct input_event *); #if defined (HAVE_MOUSE) || defined (HAVE_GPM) -static Lisp_Object make_lispy_movement P_ ((struct frame *, Lisp_Object, - enum scroll_bar_part, - Lisp_Object, Lisp_Object, - unsigned long)); -#endif -static Lisp_Object modify_event_symbol P_ ((int, unsigned, Lisp_Object, - Lisp_Object, char **, - Lisp_Object *, unsigned)); -static Lisp_Object make_lispy_switch_frame P_ ((Lisp_Object)); -static void save_getcjmp P_ ((jmp_buf)); +static Lisp_Object make_lispy_movement (struct frame *, Lisp_Object, + enum scroll_bar_part, + Lisp_Object, Lisp_Object, + unsigned long); +#endif +static Lisp_Object modify_event_symbol (int, unsigned, Lisp_Object, + Lisp_Object, char **, + Lisp_Object *, unsigned); +static Lisp_Object make_lispy_switch_frame (Lisp_Object); +static void save_getcjmp (jmp_buf); static void save_getcjmp (); -static void restore_getcjmp P_ ((jmp_buf)); -static Lisp_Object apply_modifiers P_ ((int, Lisp_Object)); -static void clear_event P_ ((struct input_event *)); -static Lisp_Object restore_kboard_configuration P_ ((Lisp_Object)); -static SIGTYPE interrupt_signal P_ ((int signalnum)); -static void handle_interrupt P_ ((void)); -static void timer_start_idle P_ ((void)); -static void timer_stop_idle P_ ((void)); -static void timer_resume_idle P_ ((void)); -static SIGTYPE handle_user_signal P_ ((int)); -static char *find_user_signal_name P_ ((int)); -static int store_user_signal_events P_ ((void)); +static void restore_getcjmp (jmp_buf); +static Lisp_Object apply_modifiers (int, Lisp_Object); +static void clear_event (struct input_event *); +static Lisp_Object restore_kboard_configuration (Lisp_Object); +static SIGTYPE interrupt_signal (int signalnum); +static void handle_interrupt (void); +static void timer_start_idle (void); +static void timer_stop_idle (void); +static void timer_resume_idle (void); +static SIGTYPE handle_user_signal (int); +static char *find_user_signal_name (int); +static int store_user_signal_events (void); /* Nonzero means don't try to suspend even if the operating system seems to support it. */ @@ -1499,10 +1499,10 @@ some_mouse_moved () /* This is the actual command reading loop, sans error-handling encapsulation. */ -static int read_key_sequence P_ ((Lisp_Object *, int, Lisp_Object, - int, int, int)); -void safe_run_hooks P_ ((Lisp_Object)); -static void adjust_point_for_property P_ ((int, int)); +static int read_key_sequence (Lisp_Object *, int, Lisp_Object, + int, int, int); +void safe_run_hooks (Lisp_Object); +static void adjust_point_for_property (int, int); /* Cancel hourglass from protect_unwind. ARG is not used. */ @@ -1862,7 +1862,7 @@ extern Lisp_Object Qcomposition, Qdisplay; LAST_PT is the last position of point. */ extern Lisp_Object Qafter_string, Qbefore_string; -extern Lisp_Object get_pos_property P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); +extern Lisp_Object get_pos_property (Lisp_Object, Lisp_Object, Lisp_Object); static void adjust_point_for_property (last_pt, modified) @@ -7509,7 +7509,7 @@ store_user_signal_events () } -static void menu_bar_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, void*)); +static void menu_bar_item (Lisp_Object, Lisp_Object, Lisp_Object, void*); static Lisp_Object menu_bar_one_keymap_changed_items; /* These variables hold the vector under construction within @@ -8077,10 +8077,10 @@ Lisp_Object Qrtl; /* Function prototypes. */ -static void init_tool_bar_items P_ ((Lisp_Object)); -static void process_tool_bar_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, void*)); -static int parse_tool_bar_item P_ ((Lisp_Object, Lisp_Object)); -static void append_tool_bar_item P_ ((void)); +static void init_tool_bar_items (Lisp_Object); +static void process_tool_bar_item (Lisp_Object, Lisp_Object, Lisp_Object, void*); +static int parse_tool_bar_item (Lisp_Object, Lisp_Object); +static void append_tool_bar_item (void); /* Return a vector of tool bar items for keymaps currently in effect. @@ -10876,7 +10876,7 @@ On such systems, Emacs starts a subshell instead of suspending. */) reset_all_sys_modes (); /* sys_suspend can get an error if it tries to fork a subshell and the system resources aren't available for that. */ - record_unwind_protect ((Lisp_Object (*) P_ ((Lisp_Object))) init_all_sys_modes, + record_unwind_protect ((Lisp_Object (*) (Lisp_Object)) init_all_sys_modes, Qnil); stuff_buffered_input (stuffstring); if (cannot_suspend) diff --git a/src/keymap.c b/src/keymap.c index c3a9d9e5cc..3aeeb1afc0 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -115,20 +115,20 @@ static Lisp_Object where_is_cache; /* Which keymaps are reverse-stored in the cache. */ static Lisp_Object where_is_cache_keymaps; -static Lisp_Object store_in_keymap P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); -static void fix_submap_inheritance P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); - -static Lisp_Object define_as_prefix P_ ((Lisp_Object, Lisp_Object)); -static void describe_command P_ ((Lisp_Object, Lisp_Object)); -static void describe_translation P_ ((Lisp_Object, Lisp_Object)); -static void describe_map P_ ((Lisp_Object, Lisp_Object, - void (*) P_ ((Lisp_Object, Lisp_Object)), - int, Lisp_Object, Lisp_Object*, int, int)); -static void describe_vector P_ ((Lisp_Object, Lisp_Object, Lisp_Object, - void (*) (Lisp_Object, Lisp_Object), int, - Lisp_Object, Lisp_Object, int *, - int, int, int)); -static void silly_event_symbol_error P_ ((Lisp_Object)); +static Lisp_Object store_in_keymap (Lisp_Object, Lisp_Object, Lisp_Object); +static void fix_submap_inheritance (Lisp_Object, Lisp_Object, Lisp_Object); + +static Lisp_Object define_as_prefix (Lisp_Object, Lisp_Object); +static void describe_command (Lisp_Object, Lisp_Object); +static void describe_translation (Lisp_Object, Lisp_Object); +static void describe_map (Lisp_Object, Lisp_Object, + void (*) (Lisp_Object, Lisp_Object), + int, Lisp_Object, Lisp_Object*, int, int); +static void describe_vector (Lisp_Object, Lisp_Object, Lisp_Object, + void (*) (Lisp_Object, Lisp_Object), int, + Lisp_Object, Lisp_Object, int *, + int, int, int); +static void silly_event_symbol_error (Lisp_Object); /* Keymap object support - constructors and predicates. */ @@ -2643,8 +2643,8 @@ preferred_sequence_p (seq) /* where-is - finding a command in a set of keymaps. */ -static void where_is_internal_1 P_ ((Lisp_Object key, Lisp_Object binding, - Lisp_Object args, void *data)); +static void where_is_internal_1 (Lisp_Object key, Lisp_Object binding, + Lisp_Object args, void *data); /* Like Flookup_key, but uses a list of keymaps SHADOW instead of a single map. Returns the first non-nil binding found in any of those maps. @@ -3440,7 +3440,7 @@ describe_map (map, prefix, elt_describer, partial, shadow, seen, nomenu, mention_shadow) register Lisp_Object map; Lisp_Object prefix; - void (*elt_describer) P_ ((Lisp_Object, Lisp_Object)); + void (*elt_describer) (Lisp_Object, Lisp_Object); int partial; Lisp_Object shadow; Lisp_Object *seen; @@ -3692,7 +3692,7 @@ describe_vector (vector, prefix, args, elt_describer, mention_shadow) register Lisp_Object vector; Lisp_Object prefix, args; - void (*elt_describer) P_ ((Lisp_Object, Lisp_Object)); + void (*elt_describer) (Lisp_Object, Lisp_Object); int partial; Lisp_Object shadow; Lisp_Object entire_map; diff --git a/src/lisp.h b/src/lisp.h index f2867a53e6..2b25e153d3 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -21,9 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifndef EMACS_LISP_H #define EMACS_LISP_H -/* Declare the prototype for a general external function. */ -#define P_(proto) proto - /* Use the configure flag --enable-checking[=LIST] to enable various types of run time checks for Lisp objects. */ diff --git a/src/lread.c b/src/lread.c index c73f7f32e5..16efd7114e 100644 --- a/src/lread.c +++ b/src/lread.c @@ -219,18 +219,18 @@ int force_load_messages; static Lisp_Object Vbytecomp_version_regexp; -static int read_emacs_mule_char P_ ((int, int (*) (int, Lisp_Object), - Lisp_Object)); +static int read_emacs_mule_char (int, int (*) (int, Lisp_Object), + Lisp_Object); -static void readevalloop P_ ((Lisp_Object, FILE*, Lisp_Object, - Lisp_Object (*) (), int, - Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object)); -static Lisp_Object load_unwind P_ ((Lisp_Object)); -static Lisp_Object load_descriptor_unwind P_ ((Lisp_Object)); +static void readevalloop (Lisp_Object, FILE*, Lisp_Object, + Lisp_Object (*) (), int, + Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object); +static Lisp_Object load_unwind (Lisp_Object); +static Lisp_Object load_descriptor_unwind (Lisp_Object); -static void invalid_syntax P_ ((const char *, int)) NO_RETURN; -static void end_of_file_error P_ (()) NO_RETURN; +static void invalid_syntax (const char *, int) NO_RETURN; +static void end_of_file_error () NO_RETURN; /* Functions that read one byte from the current source READCHARFUN @@ -239,9 +239,9 @@ static void end_of_file_error P_ (()) NO_RETURN; is 0 or positive, it unreads C, and the return value is not interesting. */ -static int readbyte_for_lambda P_ ((int, Lisp_Object)); -static int readbyte_from_file P_ ((int, Lisp_Object)); -static int readbyte_from_string P_ ((int, Lisp_Object)); +static int readbyte_for_lambda (int, Lisp_Object); +static int readbyte_from_file (int, Lisp_Object); +static int readbyte_from_string (int, Lisp_Object); /* Handle unreading and rereading of characters. Write READCHAR to read a character, @@ -268,7 +268,7 @@ readchar (readcharfun, multibyte) { Lisp_Object tem; register int c; - int (*readbyte) P_ ((int, Lisp_Object)); + int (*readbyte) (int, Lisp_Object); unsigned char buf[MAX_MULTIBYTE_LENGTH]; int i, len; int emacs_mule_encoding = 0; @@ -575,7 +575,7 @@ extern char emacs_mule_bytes[256]; static int read_emacs_mule_char (c, readbyte, readcharfun) int c; - int (*readbyte) P_ ((int, Lisp_Object)); + int (*readbyte) (int, Lisp_Object); Lisp_Object readcharfun; { /* Emacs-mule coding uses at most 4-byte for one character. */ @@ -635,19 +635,19 @@ read_emacs_mule_char (c, readbyte, readcharfun) } -static Lisp_Object read_internal_start P_ ((Lisp_Object, Lisp_Object, - Lisp_Object)); -static Lisp_Object read0 P_ ((Lisp_Object)); -static Lisp_Object read1 P_ ((Lisp_Object, int *, int)); +static Lisp_Object read_internal_start (Lisp_Object, Lisp_Object, + Lisp_Object); +static Lisp_Object read0 (Lisp_Object); +static Lisp_Object read1 (Lisp_Object, int *, int); -static Lisp_Object read_list P_ ((int, Lisp_Object)); -static Lisp_Object read_vector P_ ((Lisp_Object, int)); +static Lisp_Object read_list (int, Lisp_Object); +static Lisp_Object read_vector (Lisp_Object, int); -static Lisp_Object substitute_object_recurse P_ ((Lisp_Object, Lisp_Object, - Lisp_Object)); -static void substitute_object_in_subtree P_ ((Lisp_Object, - Lisp_Object)); -static void substitute_in_interval P_ ((INTERVAL, Lisp_Object)); +static Lisp_Object substitute_object_recurse (Lisp_Object, Lisp_Object, + Lisp_Object); +static void substitute_object_in_subtree (Lisp_Object, + Lisp_Object); +static void substitute_in_interval (INTERVAL, Lisp_Object); /* Get a character from the tty. */ @@ -3873,7 +3873,7 @@ hash_string (ptr, len) void map_obarray (obarray, fn, arg) Lisp_Object obarray; - void (*fn) P_ ((Lisp_Object, Lisp_Object)); + void (*fn) (Lisp_Object, Lisp_Object); Lisp_Object arg; { register int i; diff --git a/src/marker.c b/src/marker.c index b3381f9c36..354111d308 100644 --- a/src/marker.c +++ b/src/marker.c @@ -32,7 +32,7 @@ static int cached_bytepos; static struct buffer *cached_buffer; static int cached_modiff; -static void byte_char_debug_check P_ ((struct buffer *, int, int)); +static void byte_char_debug_check (struct buffer *, int, int); /* Nonzero means enable debugging checks on byte/char correspondences. */ diff --git a/src/menu.c b/src/menu.c index ca00c06a98..55b1acb3fb 100644 --- a/src/menu.c +++ b/src/menu.c @@ -272,8 +272,8 @@ struct skp int notbuttons; }; -static void single_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, - void *)); +static void single_menu_item (Lisp_Object, Lisp_Object, Lisp_Object, + void *); /* This is a recursive subroutine of keymap_panes. It handles one keymap, KEYMAP. @@ -1164,12 +1164,12 @@ no quit occurs and `x-popup-menu' returns nil. */) Lisp_Object bar_window; enum scroll_bar_part part; unsigned long time; - void (*mouse_position_hook) P_ ((struct frame **, int, - Lisp_Object *, - enum scroll_bar_part *, - Lisp_Object *, - Lisp_Object *, - unsigned long *)) = + void (*mouse_position_hook) (struct frame **, int, + Lisp_Object *, + enum scroll_bar_part *, + Lisp_Object *, + Lisp_Object *, + unsigned long *) = FRAME_TERMINAL (new_f)->mouse_position_hook; if (mouse_position_hook) diff --git a/src/minibuf.c b/src/minibuf.c index 539a953f7e..412d2550df 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -220,19 +220,19 @@ without invoking the usual minibuffer commands. */) /* Actual minibuffer invocation. */ -static Lisp_Object read_minibuf_unwind P_ ((Lisp_Object)); -static Lisp_Object run_exit_minibuf_hook P_ ((Lisp_Object)); -static Lisp_Object read_minibuf P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, - int, Lisp_Object, - Lisp_Object, Lisp_Object, - int, int)); -static Lisp_Object read_minibuf_noninteractive P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, - int, Lisp_Object, - Lisp_Object, Lisp_Object, - int, int)); -static Lisp_Object string_to_object P_ ((Lisp_Object, Lisp_Object)); +static Lisp_Object read_minibuf_unwind (Lisp_Object); +static Lisp_Object run_exit_minibuf_hook (Lisp_Object); +static Lisp_Object read_minibuf (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, + int, Lisp_Object, + Lisp_Object, Lisp_Object, + int, int); +static Lisp_Object read_minibuf_noninteractive (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, + int, Lisp_Object, + Lisp_Object, Lisp_Object, + int, int); +static Lisp_Object string_to_object (Lisp_Object, Lisp_Object); /* Read a Lisp object from VAL and return it. If VAL is an empty diff --git a/src/print.c b/src/print.c index 6d403e00fe..dedd58b99e 100644 --- a/src/print.c +++ b/src/print.c @@ -618,7 +618,7 @@ temp_output_buffer_setup (bufname) Lisp_Object internal_with_output_to_temp_buffer (bufname, function, args) const char *bufname; - Lisp_Object (*function) P_ ((Lisp_Object)); + Lisp_Object (*function) (Lisp_Object); Lisp_Object args; { int count = SPECPDL_INDEX (); diff --git a/src/process.c b/src/process.c index 24f31220d0..255803c92f 100644 --- a/src/process.c +++ b/src/process.c @@ -285,11 +285,11 @@ static Lisp_Object Vprocess_adaptive_read_buffering; #include "sysselect.h" -static int keyboard_bit_set P_ ((SELECT_TYPE *)); -static void deactivate_process P_ ((Lisp_Object)); -static void status_notify P_ ((struct Lisp_Process *)); -static int read_process_output P_ ((Lisp_Object, int)); -static void create_pty P_ ((Lisp_Object)); +static int keyboard_bit_set (SELECT_TYPE *); +static void deactivate_process (Lisp_Object); +static void status_notify (struct Lisp_Process *); +static int read_process_output (Lisp_Object, int); +static void create_pty (Lisp_Object); /* If we support a window system, turn on the code to poll periodically to detect C-g. It isn't actually used when doing interrupt input. */ diff --git a/src/scroll.c b/src/scroll.c index e2d3656dc4..5363ec3be4 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -58,14 +58,14 @@ struct matrix_elt unsigned char writecount; }; -static void do_direct_scrolling P_ ((struct frame *, - struct glyph_matrix *, - struct matrix_elt *, - int, int)); -static void do_scrolling P_ ((struct frame *, - struct glyph_matrix *, - struct matrix_elt *, - int, int)); +static void do_direct_scrolling (struct frame *, + struct glyph_matrix *, + struct matrix_elt *, + int, int); +static void do_scrolling (struct frame *, + struct glyph_matrix *, + struct matrix_elt *, + int, int); /* Determine, in matrix[i,j], the cost of updating the first j old diff --git a/src/search.c b/src/search.c index 736a89258f..69db94e9f1 100644 --- a/src/search.c +++ b/src/search.c @@ -98,18 +98,18 @@ Lisp_Object Vsearch_spaces_regexp; only. */ Lisp_Object Vinhibit_changing_match_data; -static void set_search_regs P_ ((EMACS_INT, EMACS_INT)); -static void save_search_regs P_ ((void)); -static EMACS_INT simple_search P_ ((int, unsigned char *, int, int, - Lisp_Object, EMACS_INT, EMACS_INT, - EMACS_INT, EMACS_INT)); -static EMACS_INT boyer_moore P_ ((int, unsigned char *, int, int, - Lisp_Object, Lisp_Object, - EMACS_INT, EMACS_INT, - EMACS_INT, EMACS_INT, int)); -static EMACS_INT search_buffer P_ ((Lisp_Object, EMACS_INT, EMACS_INT, - EMACS_INT, EMACS_INT, int, int, - Lisp_Object, Lisp_Object, int)); +static void set_search_regs (EMACS_INT, EMACS_INT); +static void save_search_regs (void); +static EMACS_INT simple_search (int, unsigned char *, int, int, + Lisp_Object, EMACS_INT, EMACS_INT, + EMACS_INT, EMACS_INT); +static EMACS_INT boyer_moore (int, unsigned char *, int, int, + Lisp_Object, Lisp_Object, + EMACS_INT, EMACS_INT, + EMACS_INT, EMACS_INT, int); +static EMACS_INT search_buffer (Lisp_Object, EMACS_INT, EMACS_INT, + EMACS_INT, EMACS_INT, int, int, + Lisp_Object, Lisp_Object, int); static void matcher_overflow () NO_RETURN; static void diff --git a/src/sound.c b/src/sound.c index af6daf2e26..b362fc8819 100644 --- a/src/sound.c +++ b/src/sound.c @@ -115,10 +115,10 @@ enum sound_attr SOUND_ATTR_SENTINEL }; -static void alsa_sound_perror P_ ((char *, int)) NO_RETURN; -static void sound_perror P_ ((char *)) NO_RETURN; -static void sound_warning P_ ((char *)); -static int parse_sound P_ ((Lisp_Object, Lisp_Object *)); +static void alsa_sound_perror (char *, int) NO_RETURN; +static void sound_perror (char *) NO_RETURN; +static void sound_warning (char *); +static int parse_sound (Lisp_Object, Lisp_Object *); /* END: Common Definitions */ @@ -225,25 +225,25 @@ struct sound_device int channels; /* Open device SD. */ - void (* open) P_ ((struct sound_device *sd)); + void (* open) (struct sound_device *sd); /* Close device SD. */ - void (* close) P_ ((struct sound_device *sd)); + void (* close) (struct sound_device *sd); /* Configure SD accoring to device-dependent parameters. */ - void (* configure) P_ ((struct sound_device *device)); + void (* configure) (struct sound_device *device); /* Choose a device-dependent format for outputting sound S. */ - void (* choose_format) P_ ((struct sound_device *sd, - struct sound *s)); + void (* choose_format) (struct sound_device *sd, + struct sound *s); /* Return a preferred data size in bytes to be sent to write (below) each time. 2048 is used if this is NULL. */ - int (* period_size) P_ ((struct sound_device *sd)); + int (* period_size) (struct sound_device *sd); /* Write NYBTES bytes from BUFFER to device SD. */ - void (* write) P_ ((struct sound_device *sd, const char *buffer, - int nbytes)); + void (* write) (struct sound_device *sd, const char *buffer, + int nbytes); /* A place for devices to store additional data. */ void *data; @@ -279,7 +279,7 @@ struct sound Lisp_Object data; /* Play sound file S on device SD. */ - void (* play) P_ ((struct sound *s, struct sound_device *sd)); + void (* play) (struct sound *s, struct sound_device *sd); }; /* These are set during `play-sound-internal' so that sound_cleanup has @@ -290,30 +290,30 @@ struct sound *current_sound; /* Function prototypes. */ -static void vox_open P_ ((struct sound_device *)); -static void vox_configure P_ ((struct sound_device *)); -static void vox_close P_ ((struct sound_device *sd)); -static void vox_choose_format P_ ((struct sound_device *, struct sound *)); -static int vox_init P_ ((struct sound_device *)); -static void vox_write P_ ((struct sound_device *, const char *, int)); -static void find_sound_type P_ ((struct sound *)); -static u_int32_t le2hl P_ ((u_int32_t)); -static u_int16_t le2hs P_ ((u_int16_t)); -static u_int32_t be2hl P_ ((u_int32_t)); -static int wav_init P_ ((struct sound *)); -static void wav_play P_ ((struct sound *, struct sound_device *)); -static int au_init P_ ((struct sound *)); -static void au_play P_ ((struct sound *, struct sound_device *)); +static void vox_open (struct sound_device *); +static void vox_configure (struct sound_device *); +static void vox_close (struct sound_device *sd); +static void vox_choose_format (struct sound_device *, struct sound *); +static int vox_init (struct sound_device *); +static void vox_write (struct sound_device *, const char *, int); +static void find_sound_type (struct sound *); +static u_int32_t le2hl (u_int32_t); +static u_int16_t le2hs (u_int16_t); +static u_int32_t be2hl (u_int32_t); +static int wav_init (struct sound *); +static void wav_play (struct sound *, struct sound_device *); +static int au_init (struct sound *); +static void au_play (struct sound *, struct sound_device *); #if 0 /* Currently not used. */ -static u_int16_t be2hs P_ ((u_int16_t)); +static u_int16_t be2hs (u_int16_t); #endif /* END: Non Windows Definitions */ #else /* WINDOWSNT */ /* BEGIN: Windows Specific Definitions */ -static int do_play_sound P_ ((const char *, unsigned long)); +static int do_play_sound (const char *, unsigned long); /* END: Windows Specific Definitions */ #endif /* WINDOWSNT */ diff --git a/src/strftime.c b/src/strftime.c index 7a9506e55d..e96d8a9233 100644 --- a/src/strftime.c +++ b/src/strftime.c @@ -187,7 +187,7 @@ extern char *tzname[]; Similarly for localtime_r. */ # if ! HAVE_TM_GMTOFF -static struct tm *my_strftime_gmtime_r __P ((const time_t *, struct tm *)); +static struct tm *my_strftime_gmtime_r (const time_t *, struct tm *); static struct tm * my_strftime_gmtime_r (t, tp) const time_t *t; @@ -200,7 +200,7 @@ my_strftime_gmtime_r (t, tp) return tp; } -static struct tm *my_strftime_localtime_r __P ((const time_t *, struct tm *)); +static struct tm *my_strftime_localtime_r (const time_t *, struct tm *); static struct tm * my_strftime_localtime_r (t, tp) const time_t *t; @@ -371,8 +371,8 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */ more reliable way to accept other sets of digits. */ #define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9) -static CHAR_T *memcpy_lowcase __P ((CHAR_T *dest, const CHAR_T *src, - size_t len LOCALE_PARAM_PROTO)); +static CHAR_T *memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, + size_t len LOCALE_PARAM_PROTO); static CHAR_T * memcpy_lowcase (dest, src, len LOCALE_PARAM) @@ -386,8 +386,8 @@ memcpy_lowcase (dest, src, len LOCALE_PARAM) return dest; } -static CHAR_T *memcpy_uppcase __P ((CHAR_T *dest, const CHAR_T *src, - size_t len LOCALE_PARAM_PROTO)); +static CHAR_T *memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, + size_t len LOCALE_PARAM_PROTO); static CHAR_T * memcpy_uppcase (dest, src, len LOCALE_PARAM) @@ -406,7 +406,7 @@ memcpy_uppcase (dest, src, len LOCALE_PARAM) /* Yield the difference between *A and *B, measured in seconds, ignoring leap seconds. */ # define tm_diff ftime_tm_diff -static int tm_diff __P ((const struct tm *, const struct tm *)); +static int tm_diff (const struct tm *, const struct tm *); static int tm_diff (a, b) const struct tm *a; @@ -440,7 +440,7 @@ tm_diff (a, b) #define ISO_WEEK_START_WDAY 1 /* Monday */ #define ISO_WEEK1_WDAY 4 /* Thursday */ #define YDAY_MINIMUM (-366) -static int iso_week_days __P ((int, int)); +static int iso_week_days (int, int); #ifdef __GNUC__ __inline__ #endif @@ -499,8 +499,8 @@ static CHAR_T const month_name[][10] = #if !defined _LIBC && !defined(WINDOWSNT) && HAVE_TZNAME && HAVE_TZSET /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime. Work around this bug by copying *tp before it might be munged. */ - size_t _strftime_copytm __P ((char *, size_t, const char *, - const struct tm * extra_args_spec_iso)); + size_t _strftime_copytm (char *, size_t, const char *, + const struct tm * extra_args_spec_iso); size_t my_strftime (s, maxsize, format, tp extra_args) CHAR_T *s; diff --git a/src/syntax.c b/src/syntax.c index 4741fa260d..4cead52f95 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -98,13 +98,13 @@ static EMACS_INT find_start_begv; static int find_start_modiff; -static Lisp_Object skip_chars P_ ((int, Lisp_Object, Lisp_Object, int)); -static Lisp_Object skip_syntaxes P_ ((int, Lisp_Object, Lisp_Object)); -static Lisp_Object scan_lists P_ ((EMACS_INT, EMACS_INT, EMACS_INT, int)); -static void scan_sexps_forward P_ ((struct lisp_parse_state *, - EMACS_INT, EMACS_INT, EMACS_INT, int, - int, Lisp_Object, int)); -static int in_classes P_ ((int, Lisp_Object)); +static Lisp_Object skip_chars (int, Lisp_Object, Lisp_Object, int); +static Lisp_Object skip_syntaxes (int, Lisp_Object, Lisp_Object); +static Lisp_Object scan_lists (EMACS_INT, EMACS_INT, EMACS_INT, int); +static void scan_sexps_forward (struct lisp_parse_state *, + EMACS_INT, EMACS_INT, EMACS_INT, int, + int, Lisp_Object, int); +static int in_classes (int, Lisp_Object); struct gl_state_s gl_state; /* Global state of syntax parser. */ diff --git a/src/sysdep.c b/src/sysdep.c index e311d181c9..a026cd014a 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -169,7 +169,7 @@ static const int baud_convert[] = int emacs_ospeed; -void croak P_ ((char *)) NO_RETURN; +void croak (char *) NO_RETURN; /* Temporary used by `sigblock' when defined in terms of signprocmask. */ @@ -561,11 +561,11 @@ child_setup_tty (out) struct save_signal { int code; - SIGTYPE (*handler) P_ ((int)); + SIGTYPE (*handler) (int); }; -static void save_signal_handlers P_ ((struct save_signal *)); -static void restore_signal_handlers P_ ((struct save_signal *)); +static void save_signal_handlers (struct save_signal *); +static void restore_signal_handlers (struct save_signal *); /* Suspend the Emacs process; give terminal to its superior. */ @@ -725,7 +725,7 @@ save_signal_handlers (saved_handlers) while (saved_handlers->code) { saved_handlers->handler - = (SIGTYPE (*) P_ ((int))) signal (saved_handlers->code, SIG_IGN); + = (SIGTYPE (*) (int)) signal (saved_handlers->code, SIG_IGN); saved_handlers++; } } diff --git a/src/term.c b/src/term.c index fad6e3c80d..64e329ec60 100644 --- a/src/term.c +++ b/src/term.c @@ -66,10 +66,10 @@ static int been_here = -1; /* For now, don't try to include termcap.h. On some systems, configure finds a non-standard termcap.h that the main build won't find. */ -extern void tputs P_ ((const char *, int, int (*)(int))); -extern int tgetent P_ ((char *, const char *)); -extern int tgetflag P_ ((char *id)); -extern int tgetnum P_ ((char *id)); +extern void tputs (const char *, int, int (*)(int)); +extern int tgetent (char *, const char *); +extern int tgetflag (char *id); +extern int tgetnum (char *id); #include "cm.h" #ifdef HAVE_X_WINDOWS @@ -91,16 +91,16 @@ extern int tgetnum P_ ((char *id)); #define DEV_TTY "/dev/tty" #endif -static void tty_set_scroll_region P_ ((struct frame *f, int start, int stop)); -static void turn_on_face P_ ((struct frame *, int face_id)); -static void turn_off_face P_ ((struct frame *, int face_id)); -static void tty_show_cursor P_ ((struct tty_display_info *)); -static void tty_hide_cursor P_ ((struct tty_display_info *)); -static void tty_background_highlight P_ ((struct tty_display_info *tty)); -static void clear_tty_hooks P_ ((struct terminal *terminal)); -static void set_tty_hooks P_ ((struct terminal *terminal)); -static void dissociate_if_controlling_tty P_ ((int fd)); -static void delete_tty P_ ((struct terminal *)); +static void tty_set_scroll_region (struct frame *f, int start, int stop); +static void turn_on_face (struct frame *, int face_id); +static void turn_off_face (struct frame *, int face_id); +static void tty_show_cursor (struct tty_display_info *); +static void tty_hide_cursor (struct tty_display_info *); +static void tty_background_highlight (struct tty_display_info *tty); +static void clear_tty_hooks (struct terminal *terminal); +static void set_tty_hooks (struct terminal *terminal); +static void dissociate_if_controlling_tty (int fd); +static void delete_tty (struct terminal *); #define OUTPUT(tty, a) \ emacs_tputs ((tty), a, \ @@ -1517,10 +1517,10 @@ term_get_fkeys_1 () #define produce_composite_glyph produce_composite_glyph_term #endif -static void append_glyph P_ ((struct it *)); -static void produce_stretch_glyph P_ ((struct it *)); -static void append_composite_glyph P_ ((struct it *)); -static void produce_composite_glyph P_ ((struct it *)); +static void append_glyph (struct it *); +static void produce_stretch_glyph (struct it *); +static void append_composite_glyph (struct it *); +static void produce_composite_glyph (struct it *); /* Append glyphs to IT's glyph_row. Called from produce_glyphs for terminal frames if IT->glyph_row != NULL. IT->char_to_display is diff --git a/src/terminal.c b/src/terminal.c index 45d918a2bd..7693bc3ad4 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -40,7 +40,7 @@ struct terminal *initial_terminal; /* Function to use to ring the bell. */ Lisp_Object Vring_bell_function; -static void delete_initial_terminal P_ ((struct terminal *)); +static void delete_initial_terminal (struct terminal *); diff --git a/src/textprop.c b/src/textprop.c index 83d09cce55..7e2f2b8f4d 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -78,7 +78,7 @@ Lisp_Object Vtext_property_default_nonsticky; Lisp_Object interval_insert_behind_hooks; Lisp_Object interval_insert_in_front_hooks; -static void text_read_only P_ ((Lisp_Object)) NO_RETURN; +static void text_read_only (Lisp_Object) NO_RETURN; /* Signal a `text-read-only' error. This function makes it easier diff --git a/src/unexalpha.c b/src/unexalpha.c index 13c1def571..196742a19a 100644 --- a/src/unexalpha.c +++ b/src/unexalpha.c @@ -81,10 +81,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define _SBSS ".sbss" #endif /* __NetBSD__ || __OpenBSD__ */ -static void fatal_unexec __P ((char *, char *)); -static void mark_x __P ((char *)); +static void fatal_unexec (char *, char *); +static void mark_x (char *); -static void update_dynamic_symbols __P ((char *, char *, int, struct aouthdr)); +static void update_dynamic_symbols (char *, char *, int, struct aouthdr); #define READ(_fd, _buffer, _size, _error_message, _error_arg) \ errno = EEOF; \ diff --git a/src/w32console.c b/src/w32console.c index dcebe466e3..34715ccfd5 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -286,8 +286,8 @@ w32con_insert_glyphs (struct frame *f, register struct glyph *start, register in } } -extern unsigned char *encode_terminal_code P_ ((struct glyph *, int, - struct coding_system *)); +extern unsigned char *encode_terminal_code (struct glyph *, int, + struct coding_system *); static void w32con_write_glyphs (struct frame *f, register struct glyph *string, diff --git a/src/w32fns.c b/src/w32fns.c index f498539a56..f371bd36fa 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -74,10 +74,10 @@ void globals_of_w32fns (); extern void free_frame_menubar (); extern double atof (); -extern int w32_console_toggle_lock_key P_ ((int, Lisp_Object)); -extern void w32_menu_display_help P_ ((HWND, HMENU, UINT, UINT)); -extern void w32_free_menu_strings P_ ((HWND)); -extern const char *map_w32_filename P_ ((const char *, const char **)); +extern int w32_console_toggle_lock_key (int, Lisp_Object); +extern void w32_menu_display_help (HWND, HMENU, UINT, UINT); +extern void w32_free_menu_strings (HWND); +extern const char *map_w32_filename (const char *, const char **); extern int quit_char; @@ -320,8 +320,8 @@ extern void syms_of_w32uniscribe (); extern int uniscribe_available; /* Function prototypes for hourglass support. */ -static void w32_show_hourglass P_ ((struct frame *)); -static void w32_hide_hourglass P_ ((void)); +static void w32_show_hourglass (struct frame *); +static void w32_hide_hourglass (void); @@ -420,26 +420,26 @@ x_window_to_frame (dpyinfo, wdesc) } -static Lisp_Object unwind_create_frame P_ ((Lisp_Object)); -static Lisp_Object unwind_create_tip_frame P_ ((Lisp_Object)); -static void my_create_window P_ ((struct frame *)); -static void my_create_tip_window P_ ((struct frame *)); +static Lisp_Object unwind_create_frame (Lisp_Object); +static Lisp_Object unwind_create_tip_frame (Lisp_Object); +static void my_create_window (struct frame *); +static void my_create_tip_window (struct frame *); /* TODO: Native Input Method support; see x_create_im. */ -void x_set_foreground_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_background_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_mouse_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_cursor_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_border_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); -static void x_edge_detection P_ ((struct frame *, struct image *, Lisp_Object, - Lisp_Object)); +void x_set_foreground_color (struct frame *, Lisp_Object, Lisp_Object); +void x_set_background_color (struct frame *, Lisp_Object, Lisp_Object); +void x_set_mouse_color (struct frame *, Lisp_Object, Lisp_Object); +void x_set_cursor_color (struct frame *, Lisp_Object, Lisp_Object); +void x_set_border_color (struct frame *, Lisp_Object, Lisp_Object); +void x_set_cursor_type (struct frame *, Lisp_Object, Lisp_Object); +void x_set_icon_type (struct frame *, Lisp_Object, Lisp_Object); +void x_set_icon_name (struct frame *, Lisp_Object, Lisp_Object); +void x_explicitly_set_name (struct frame *, Lisp_Object, Lisp_Object); +void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); +void x_set_title (struct frame *, Lisp_Object, Lisp_Object); +void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object); +static void x_edge_detection (struct frame *, struct image *, Lisp_Object, + Lisp_Object); @@ -5360,10 +5360,10 @@ w32_hide_hourglass () Tool tips ***********************************************************************/ -static Lisp_Object x_create_tip_frame P_ ((struct w32_display_info *, - Lisp_Object, Lisp_Object)); -static void compute_tip_xy P_ ((struct frame *, Lisp_Object, Lisp_Object, - Lisp_Object, int, int, int *, int *)); +static Lisp_Object x_create_tip_frame (struct w32_display_info *, + Lisp_Object, Lisp_Object); +static void compute_tip_xy (struct frame *, Lisp_Object, Lisp_Object, + Lisp_Object, int, int, int *, int *); /* The frame of a currently visible tooltip. */ diff --git a/src/w32font.c b/src/w32font.c index e93dbca2dd..ab56eb9e4d 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -106,28 +106,28 @@ static Lisp_Object Vw32_charset_info_alist; /* Font spacing symbols - defined in font.c. */ extern Lisp_Object Qc, Qp, Qm; -static void fill_in_logfont P_ ((FRAME_PTR, LOGFONT *, Lisp_Object)); +static void fill_in_logfont (FRAME_PTR, LOGFONT *, Lisp_Object); -static BYTE w32_antialias_type P_ ((Lisp_Object)); -static Lisp_Object lispy_antialias_type P_ ((BYTE)); +static BYTE w32_antialias_type (Lisp_Object); +static Lisp_Object lispy_antialias_type (BYTE); -static Lisp_Object font_supported_scripts P_ ((FONTSIGNATURE *)); -static int w32font_full_name P_ ((LOGFONT *, Lisp_Object, int, char *, int)); -static void compute_metrics P_ ((HDC, struct w32font_info *, unsigned int, - struct w32_metric_cache *)); +static Lisp_Object font_supported_scripts (FONTSIGNATURE *); +static int w32font_full_name (LOGFONT *, Lisp_Object, int, char *, int); +static void compute_metrics (HDC, struct w32font_info *, unsigned int, + struct w32_metric_cache *); -static Lisp_Object w32_registry P_ ((LONG, DWORD)); +static Lisp_Object w32_registry (LONG, DWORD); /* EnumFontFamiliesEx callbacks. */ -static int CALLBACK add_font_entity_to_list P_ ((ENUMLOGFONTEX *, +static int CALLBACK add_font_entity_to_list (ENUMLOGFONTEX *, + NEWTEXTMETRICEX *, + DWORD, LPARAM); +static int CALLBACK add_one_font_entity_to_list (ENUMLOGFONTEX *, NEWTEXTMETRICEX *, - DWORD, LPARAM)); -static int CALLBACK add_one_font_entity_to_list P_ ((ENUMLOGFONTEX *, - NEWTEXTMETRICEX *, - DWORD, LPARAM)); -static int CALLBACK add_font_name_to_list P_ ((ENUMLOGFONTEX *, - NEWTEXTMETRICEX *, - DWORD, LPARAM)); + DWORD, LPARAM); +static int CALLBACK add_font_name_to_list (ENUMLOGFONTEX *, + NEWTEXTMETRICEX *, + DWORD, LPARAM); /* struct passed in as LPARAM arg to EnumFontFamiliesEx, for keeping track of what we really want. */ @@ -149,7 +149,7 @@ struct font_callback_data /* Handles the problem that EnumFontFamiliesEx will not return all style variations if the font name is not specified. */ -static void list_all_matching_fonts P_ ((struct font_callback_data *)); +static void list_all_matching_fonts (struct font_callback_data *); static int @@ -971,8 +971,8 @@ add_font_name_to_list (logical_font, physical_font, font_type, list_object) return 1; } -static int w32_decode_weight P_ ((int)); -static int w32_encode_weight P_ ((int)); +static int w32_decode_weight (int); +static int w32_encode_weight (int); /* Convert an enumerated Windows font to an Emacs font entity. */ static Lisp_Object diff --git a/src/w32menu.c b/src/w32menu.c index 73fba8108c..2c8a5308d3 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -90,16 +90,16 @@ extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; extern Lisp_Object Qmenu_bar_update_hook; -void set_frame_menubar P_ ((FRAME_PTR, int, int)); +void set_frame_menubar (FRAME_PTR, int, int); #ifdef HAVE_DIALOGS -static Lisp_Object w32_dialog_show P_ ((FRAME_PTR, int, Lisp_Object, char**)); +static Lisp_Object w32_dialog_show (FRAME_PTR, int, Lisp_Object, char**); #else -static int is_simple_dialog P_ ((Lisp_Object)); -static Lisp_Object simple_dialog_show P_ ((FRAME_PTR, Lisp_Object, Lisp_Object)); +static int is_simple_dialog (Lisp_Object); +static Lisp_Object simple_dialog_show (FRAME_PTR, Lisp_Object, Lisp_Object); #endif -void w32_free_menu_strings P_((HWND)); +void w32_free_menu_strings (HWND); /* This is set nonzero after the user activates the menu bar, and set diff --git a/src/w32term.c b/src/w32term.c index 0b71b7e02b..1acb77e7b1 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -234,43 +234,43 @@ extern EMACS_INT extra_keyboard_modifiers; /* Keyboard code page - may be changed by language-change events. */ static int keyboard_codepage; -static void x_update_window_end P_ ((struct window *, int, int)); -static void w32_handle_tool_bar_click P_ ((struct frame *, - struct input_event *)); -static void w32_define_cursor P_ ((Window, Cursor)); - -void x_lower_frame P_ ((struct frame *)); -void x_scroll_bar_clear P_ ((struct frame *)); -void x_wm_set_size_hint P_ ((struct frame *, long, int)); -void x_raise_frame P_ ((struct frame *)); -void x_set_window_size P_ ((struct frame *, int, int, int)); -void x_wm_set_window_state P_ ((struct frame *, int)); -void x_wm_set_icon_pixmap P_ ((struct frame *, int)); -static void w32_initialize P_ ((void)); -static void x_update_end P_ ((struct frame *)); -static void w32_frame_up_to_date P_ ((struct frame *)); -static void w32_set_terminal_modes P_ ((struct terminal *)); -static void w32_reset_terminal_modes P_ ((struct terminal *)); -static void x_clear_frame P_ ((struct frame *)); -static void frame_highlight P_ ((struct frame *)); -static void frame_unhighlight P_ ((struct frame *)); -static void x_new_focus_frame P_ ((struct w32_display_info *, - struct frame *)); -static void x_focus_changed P_ ((int, int, struct w32_display_info *, - struct frame *, struct input_event *)); -static void w32_detect_focus_change P_ ((struct w32_display_info *, - W32Msg *, struct input_event *)); -static void w32_frame_rehighlight P_ ((struct frame *)); -static void x_frame_rehighlight P_ ((struct w32_display_info *)); -static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *)); -static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int, - enum text_cursor_kinds)); -static void w32_clip_to_row P_ ((struct window *, struct glyph_row *, int, HDC)); -static BOOL my_show_window P_ ((struct frame *, HWND, int)); -static void my_set_window_pos P_ ((HWND, HWND, int, int, int, int, UINT)); -static void my_set_focus P_ ((struct frame *, HWND)); -static void my_set_foreground_window P_ ((HWND)); -static void my_destroy_window P_ ((struct frame *, HWND)); +static void x_update_window_end (struct window *, int, int); +static void w32_handle_tool_bar_click (struct frame *, + struct input_event *); +static void w32_define_cursor (Window, Cursor); + +void x_lower_frame (struct frame *); +void x_scroll_bar_clear (struct frame *); +void x_wm_set_size_hint (struct frame *, long, int); +void x_raise_frame (struct frame *); +void x_set_window_size (struct frame *, int, int, int); +void x_wm_set_window_state (struct frame *, int); +void x_wm_set_icon_pixmap (struct frame *, int); +static void w32_initialize (void); +static void x_update_end (struct frame *); +static void w32_frame_up_to_date (struct frame *); +static void w32_set_terminal_modes (struct terminal *); +static void w32_reset_terminal_modes (struct terminal *); +static void x_clear_frame (struct frame *); +static void frame_highlight (struct frame *); +static void frame_unhighlight (struct frame *); +static void x_new_focus_frame (struct w32_display_info *, + struct frame *); +static void x_focus_changed (int, int, struct w32_display_info *, + struct frame *, struct input_event *); +static void w32_detect_focus_change (struct w32_display_info *, + W32Msg *, struct input_event *); +static void w32_frame_rehighlight (struct frame *); +static void x_frame_rehighlight (struct w32_display_info *); +static void x_draw_hollow_cursor (struct window *, struct glyph_row *); +static void x_draw_bar_cursor (struct window *, struct glyph_row *, int, + enum text_cursor_kinds); +static void w32_clip_to_row (struct window *, struct glyph_row *, int, HDC); +static BOOL my_show_window (struct frame *, HWND, int); +static void my_set_window_pos (HWND, HWND, int, int, int, int, UINT); +static void my_set_focus (struct frame *, HWND); +static void my_set_foreground_window (HWND); +static void my_destroy_window (struct frame *, HWND); static Lisp_Object Qvendor_specific_keysyms; @@ -947,32 +947,32 @@ w32_reset_terminal_modes (struct terminal *term) /* Function prototypes of this page. */ -static void x_set_glyph_string_clipping P_ ((struct glyph_string *)); -static void x_set_glyph_string_gc P_ ((struct glyph_string *)); -static void x_draw_glyph_string_background P_ ((struct glyph_string *, - int)); -static void x_draw_glyph_string_foreground P_ ((struct glyph_string *)); -static void x_draw_composite_glyph_string_foreground P_ ((struct glyph_string *)); -static void x_draw_glyph_string_box P_ ((struct glyph_string *)); -static void x_draw_glyph_string P_ ((struct glyph_string *)); -static void x_set_cursor_gc P_ ((struct glyph_string *)); -static void x_set_mode_line_face_gc P_ ((struct glyph_string *)); -static void x_set_mouse_face_gc P_ ((struct glyph_string *)); +static void x_set_glyph_string_clipping (struct glyph_string *); +static void x_set_glyph_string_gc (struct glyph_string *); +static void x_draw_glyph_string_background (struct glyph_string *, + int); +static void x_draw_glyph_string_foreground (struct glyph_string *); +static void x_draw_composite_glyph_string_foreground (struct glyph_string *); +static void x_draw_glyph_string_box (struct glyph_string *); +static void x_draw_glyph_string (struct glyph_string *); +static void x_set_cursor_gc (struct glyph_string *); +static void x_set_mode_line_face_gc (struct glyph_string *); +static void x_set_mouse_face_gc (struct glyph_string *); static int w32_alloc_lighter_color (struct frame *, COLORREF *, double, int); -static void w32_setup_relief_color P_ ((struct frame *, struct relief *, - double, int, COLORREF)); -static void x_setup_relief_colors P_ ((struct glyph_string *)); -static void x_draw_image_glyph_string P_ ((struct glyph_string *)); -static void x_draw_image_relief P_ ((struct glyph_string *)); -static void x_draw_image_foreground P_ ((struct glyph_string *)); -static void w32_draw_image_foreground_1 P_ ((struct glyph_string *, HBITMAP)); -static void x_clear_glyph_string_rect P_ ((struct glyph_string *, int, - int, int, int)); -static void w32_draw_relief_rect P_ ((struct frame *, int, int, int, int, - int, int, int, int, int, int, - RECT *)); -static void w32_draw_box_rect P_ ((struct glyph_string *, int, int, int, int, - int, int, int, RECT *)); +static void w32_setup_relief_color (struct frame *, struct relief *, + double, int, COLORREF); +static void x_setup_relief_colors (struct glyph_string *); +static void x_draw_image_glyph_string (struct glyph_string *); +static void x_draw_image_relief (struct glyph_string *); +static void x_draw_image_foreground (struct glyph_string *); +static void w32_draw_image_foreground_1 (struct glyph_string *, HBITMAP); +static void x_clear_glyph_string_rect (struct glyph_string *, int, + int, int, int); +static void w32_draw_relief_rect (struct frame *, int, int, int, int, + int, int, int, int, int, int, + RECT *); +static void w32_draw_box_rect (struct glyph_string *, int, int, int, int, + int, int, int, RECT *); /* Set S->gc to a suitable GC for drawing glyph string S in cursor @@ -3170,7 +3170,7 @@ note_mouse_movement (frame, msg) static struct scroll_bar *x_window_to_scroll_bar (); static void x_scroll_bar_report_motion (); -static void x_check_fullscreen P_ ((struct frame *)); +static void x_check_fullscreen (struct frame *); static void redo_mouse_highlight () diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index cfdf629cee..9b5bd141d7 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -57,9 +57,9 @@ extern int initialized; extern struct font_driver uniscribe_font_driver; /* EnumFontFamiliesEx callback. */ -static int CALLBACK add_opentype_font_name_to_list P_ ((ENUMLOGFONTEX *, - NEWTEXTMETRICEX *, - DWORD, LPARAM)); +static int CALLBACK add_opentype_font_name_to_list (ENUMLOGFONTEX *, + NEWTEXTMETRICEX *, + DWORD, LPARAM); /* Used by uniscribe_otf_capability. */ static Lisp_Object otf_features (HDC context, char *table); diff --git a/src/window.c b/src/window.c index d77c620869..950b993649 100644 --- a/src/window.c +++ b/src/window.c @@ -59,32 +59,32 @@ Lisp_Object Qwindow_size_fixed; extern Lisp_Object Qleft_margin, Qright_margin; -static int displayed_window_lines P_ ((struct window *)); -static struct window *decode_window P_ ((Lisp_Object)); -static int count_windows P_ ((struct window *)); -static int get_leaf_windows P_ ((struct window *, struct window **, int)); -static void window_scroll P_ ((Lisp_Object, int, int, int)); -static void window_scroll_pixel_based P_ ((Lisp_Object, int, int, int)); -static void window_scroll_line_based P_ ((Lisp_Object, int, int, int)); -static int window_min_size_1 P_ ((struct window *, int, int)); -static int window_min_size_2 P_ ((struct window *, int, int)); -static int window_min_size P_ ((struct window *, int, int, int, int *)); -static void size_window P_ ((Lisp_Object, int, int, int, int, int)); -static int freeze_window_start P_ ((struct window *, void *)); -static int window_fixed_size_p P_ ((struct window *, int, int)); -static void enlarge_window P_ ((Lisp_Object, int, int)); -static Lisp_Object window_list P_ ((void)); -static int add_window_to_list P_ ((struct window *, void *)); -static int candidate_window_p P_ ((Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object)); -static Lisp_Object next_window P_ ((Lisp_Object, Lisp_Object, - Lisp_Object, int)); -static void decode_next_window_args P_ ((Lisp_Object *, Lisp_Object *, - Lisp_Object *)); -static int foreach_window_1 P_ ((struct window *, - int (* fn) (struct window *, void *), - void *)); -static Lisp_Object window_list_1 P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); +static int displayed_window_lines (struct window *); +static struct window *decode_window (Lisp_Object); +static int count_windows (struct window *); +static int get_leaf_windows (struct window *, struct window **, int); +static void window_scroll (Lisp_Object, int, int, int); +static void window_scroll_pixel_based (Lisp_Object, int, int, int); +static void window_scroll_line_based (Lisp_Object, int, int, int); +static int window_min_size_1 (struct window *, int, int); +static int window_min_size_2 (struct window *, int, int); +static int window_min_size (struct window *, int, int, int, int *); +static void size_window (Lisp_Object, int, int, int, int, int); +static int freeze_window_start (struct window *, void *); +static int window_fixed_size_p (struct window *, int, int); +static void enlarge_window (Lisp_Object, int, int); +static Lisp_Object window_list (void); +static int add_window_to_list (struct window *, void *); +static int candidate_window_p (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object); +static Lisp_Object next_window (Lisp_Object, Lisp_Object, + Lisp_Object, int); +static void decode_next_window_args (Lisp_Object *, Lisp_Object *, + Lisp_Object *); +static int foreach_window_1 (struct window *, + int (* fn) (struct window *, void *), + void *); +static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object); /* This is the window in which the terminal's cursor should be left when nothing is being done with it. This must @@ -4126,9 +4126,9 @@ enlarge_window (window, delta, horiz_flag) struct window *p; Lisp_Object *sizep; int maximum; - int (*sizefun) P_ ((Lisp_Object)) + int (*sizefun) (Lisp_Object) = horiz_flag ? window_width : window_height; - void (*setsizefun) P_ ((Lisp_Object, int, int)) + void (*setsizefun) (Lisp_Object, int, int) = (horiz_flag ? set_window_width : set_window_height); /* Give up if this window cannot be resized. */ @@ -4554,7 +4554,7 @@ are not deleted; instead, we signal an error. */) Resizing Mini-Windows ***********************************************************************/ -static void shrink_window_lowest_first P_ ((struct window *, int)); +static void shrink_window_lowest_first (struct window *, int); enum save_restore_action { @@ -4563,8 +4563,8 @@ enum save_restore_action RESTORE_ORIG_SIZES }; -static int save_restore_orig_size P_ ((struct window *, - enum save_restore_action)); +static int save_restore_orig_size (struct window *, + enum save_restore_action); /* Shrink windows rooted in window W to HEIGHT. Take the space needed from lowest windows first. */ @@ -7012,7 +7012,7 @@ If PIXELS-P is non-nil, the return value is VSCROLL. */) void foreach_window (f, fn, user_data) struct frame *f; - int (* fn) P_ ((struct window *, void *)); + int (* fn) (struct window *, void *); void *user_data; { /* delete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */ @@ -7029,7 +7029,7 @@ foreach_window (f, fn, user_data) static int foreach_window_1 (w, fn, user_data) struct window *w; - int (* fn) P_ ((struct window *, void *)); + int (* fn) (struct window *, void *); void *user_data; { int cont; diff --git a/src/xdisp.c b/src/xdisp.c index 795e13e6f1..cea8c62581 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -270,7 +270,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ || defined(HAVE_NS) || defined (USE_GTK) -extern void set_frame_menubar P_ ((struct frame *f, int, int)); +extern void set_frame_menubar (struct frame *f, int, int); extern int pending_menu_activation; #endif @@ -831,15 +831,15 @@ struct props /* A handler function called to set up iterator IT from the property at IT's current position. Value is used to steer handle_stop. */ - enum prop_handled (*handler) P_ ((struct it *it)); + enum prop_handled (*handler) (struct it *it); }; -static enum prop_handled handle_face_prop P_ ((struct it *)); -static enum prop_handled handle_invisible_prop P_ ((struct it *)); -static enum prop_handled handle_display_prop P_ ((struct it *)); -static enum prop_handled handle_composition_prop P_ ((struct it *)); -static enum prop_handled handle_overlay_change P_ ((struct it *)); -static enum prop_handled handle_fontified_prop P_ ((struct it *)); +static enum prop_handled handle_face_prop (struct it *); +static enum prop_handled handle_invisible_prop (struct it *); +static enum prop_handled handle_display_prop (struct it *); +static enum prop_handled handle_composition_prop (struct it *); +static enum prop_handled handle_overlay_change (struct it *); +static enum prop_handled handle_fontified_prop (struct it *); /* Properties handled by iterators. */ @@ -949,149 +949,149 @@ Lisp_Object Vhourglass_delay; /* Function prototypes. */ -static void setup_for_ellipsis P_ ((struct it *, int)); -static void mark_window_display_accurate_1 P_ ((struct window *, int)); -static int single_display_spec_string_p P_ ((Lisp_Object, Lisp_Object)); -static int display_prop_string_p P_ ((Lisp_Object, Lisp_Object)); -static int cursor_row_p P_ ((struct window *, struct glyph_row *)); -static int redisplay_mode_lines P_ ((Lisp_Object, int)); -static char *decode_mode_spec_coding P_ ((Lisp_Object, char *, int)); - -static Lisp_Object get_it_property P_ ((struct it *it, Lisp_Object prop)); - -static void handle_line_prefix P_ ((struct it *)); - -static void pint2str P_ ((char *, int, int)); -static void pint2hrstr P_ ((char *, int, int)); -static struct text_pos run_window_scroll_functions P_ ((Lisp_Object, - struct text_pos)); -static void reconsider_clip_changes P_ ((struct window *, struct buffer *)); -static int text_outside_line_unchanged_p P_ ((struct window *, int, int)); -static void store_mode_line_noprop_char P_ ((char)); -static int store_mode_line_noprop P_ ((const unsigned char *, int, int)); -static void x_consider_frame_title P_ ((Lisp_Object)); -static void handle_stop P_ ((struct it *)); -static void handle_stop_backwards P_ ((struct it *, EMACS_INT)); -static int tool_bar_lines_needed P_ ((struct frame *, int *)); -static int single_display_spec_intangible_p P_ ((Lisp_Object)); -static void ensure_echo_area_buffers P_ ((void)); -static Lisp_Object unwind_with_echo_area_buffer P_ ((Lisp_Object)); -static Lisp_Object with_echo_area_buffer_unwind_data P_ ((struct window *)); -static int with_echo_area_buffer P_ ((struct window *, int, - int (*) (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT), - EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); -static void clear_garbaged_frames P_ ((void)); -static int current_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); -static int truncate_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); -static int set_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); -static int display_echo_area P_ ((struct window *)); -static int display_echo_area_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); -static int resize_mini_window_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); -static Lisp_Object unwind_redisplay P_ ((Lisp_Object)); -static int string_char_and_length P_ ((const unsigned char *, int *)); -static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object, - struct text_pos)); -static int compute_window_start_on_continuation_line P_ ((struct window *)); -static Lisp_Object safe_eval_handler P_ ((Lisp_Object)); -static void insert_left_trunc_glyphs P_ ((struct it *)); -static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *, - Lisp_Object)); -static void extend_face_to_end_of_line P_ ((struct it *)); -static int append_space_for_newline P_ ((struct it *, int)); -static int cursor_row_fully_visible_p P_ ((struct window *, int, int)); -static int try_scrolling P_ ((Lisp_Object, int, EMACS_INT, EMACS_INT, int, int)); -static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *)); -static int trailing_whitespace_p P_ ((int)); -static int message_log_check_duplicate P_ ((int, int, int, int)); -static void push_it P_ ((struct it *)); -static void pop_it P_ ((struct it *)); -static void sync_frame_with_window_matrix_rows P_ ((struct window *)); -static void select_frame_for_redisplay P_ ((Lisp_Object)); -static void redisplay_internal P_ ((int)); -static int echo_area_display P_ ((int)); -static void redisplay_windows P_ ((Lisp_Object)); -static void redisplay_window P_ ((Lisp_Object, int)); +static void setup_for_ellipsis (struct it *, int); +static void mark_window_display_accurate_1 (struct window *, int); +static int single_display_spec_string_p (Lisp_Object, Lisp_Object); +static int display_prop_string_p (Lisp_Object, Lisp_Object); +static int cursor_row_p (struct window *, struct glyph_row *); +static int redisplay_mode_lines (Lisp_Object, int); +static char *decode_mode_spec_coding (Lisp_Object, char *, int); + +static Lisp_Object get_it_property (struct it *it, Lisp_Object prop); + +static void handle_line_prefix (struct it *); + +static void pint2str (char *, int, int); +static void pint2hrstr (char *, int, int); +static struct text_pos run_window_scroll_functions (Lisp_Object, + struct text_pos); +static void reconsider_clip_changes (struct window *, struct buffer *); +static int text_outside_line_unchanged_p (struct window *, int, int); +static void store_mode_line_noprop_char (char); +static int store_mode_line_noprop (const unsigned char *, int, int); +static void x_consider_frame_title (Lisp_Object); +static void handle_stop (struct it *); +static void handle_stop_backwards (struct it *, EMACS_INT); +static int tool_bar_lines_needed (struct frame *, int *); +static int single_display_spec_intangible_p (Lisp_Object); +static void ensure_echo_area_buffers (void); +static Lisp_Object unwind_with_echo_area_buffer (Lisp_Object); +static Lisp_Object with_echo_area_buffer_unwind_data (struct window *); +static int with_echo_area_buffer (struct window *, int, + int (*) (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT), + EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT); +static void clear_garbaged_frames (void); +static int current_message_1 (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT); +static int truncate_message_1 (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT); +static int set_message_1 (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT); +static int display_echo_area (struct window *); +static int display_echo_area_1 (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT); +static int resize_mini_window_1 (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT); +static Lisp_Object unwind_redisplay (Lisp_Object); +static int string_char_and_length (const unsigned char *, int *); +static struct text_pos display_prop_end (struct it *, Lisp_Object, + struct text_pos); +static int compute_window_start_on_continuation_line (struct window *); +static Lisp_Object safe_eval_handler (Lisp_Object); +static void insert_left_trunc_glyphs (struct it *); +static struct glyph_row *get_overlay_arrow_glyph_row (struct window *, + Lisp_Object); +static void extend_face_to_end_of_line (struct it *); +static int append_space_for_newline (struct it *, int); +static int cursor_row_fully_visible_p (struct window *, int, int); +static int try_scrolling (Lisp_Object, int, EMACS_INT, EMACS_INT, int, int); +static int try_cursor_movement (Lisp_Object, struct text_pos, int *); +static int trailing_whitespace_p (int); +static int message_log_check_duplicate (int, int, int, int); +static void push_it (struct it *); +static void pop_it (struct it *); +static void sync_frame_with_window_matrix_rows (struct window *); +static void select_frame_for_redisplay (Lisp_Object); +static void redisplay_internal (int); +static int echo_area_display (int); +static void redisplay_windows (Lisp_Object); +static void redisplay_window (Lisp_Object, int); static Lisp_Object redisplay_window_error (); -static Lisp_Object redisplay_window_0 P_ ((Lisp_Object)); -static Lisp_Object redisplay_window_1 P_ ((Lisp_Object)); -static int update_menu_bar P_ ((struct frame *, int, int)); -static int try_window_reusing_current_matrix P_ ((struct window *)); -static int try_window_id P_ ((struct window *)); -static int display_line P_ ((struct it *)); -static int display_mode_lines P_ ((struct window *)); -static int display_mode_line P_ ((struct window *, enum face_id, Lisp_Object)); -static int display_mode_element P_ ((struct it *, int, int, int, Lisp_Object, Lisp_Object, int)); -static int store_mode_line_string P_ ((char *, Lisp_Object, int, int, int, Lisp_Object)); -static char *decode_mode_spec P_ ((struct window *, int, int, int, - Lisp_Object *)); -static void display_menu_bar P_ ((struct window *)); -static int display_count_lines P_ ((int, int, int, int, int *)); -static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object, - EMACS_INT, EMACS_INT, struct it *, int, int, int, int)); -static void compute_line_metrics P_ ((struct it *)); -static void run_redisplay_end_trigger_hook P_ ((struct it *)); -static int get_overlay_strings P_ ((struct it *, int)); -static int get_overlay_strings_1 P_ ((struct it *, int, int)); -static void next_overlay_string P_ ((struct it *)); -static void reseat P_ ((struct it *, struct text_pos, int)); -static void reseat_1 P_ ((struct it *, struct text_pos, int)); -static void back_to_previous_visible_line_start P_ ((struct it *)); -void reseat_at_previous_visible_line_start P_ ((struct it *)); -static void reseat_at_next_visible_line_start P_ ((struct it *, int)); -static int next_element_from_ellipsis P_ ((struct it *)); -static int next_element_from_display_vector P_ ((struct it *)); -static int next_element_from_string P_ ((struct it *)); -static int next_element_from_c_string P_ ((struct it *)); -static int next_element_from_buffer P_ ((struct it *)); -static int next_element_from_composition P_ ((struct it *)); -static int next_element_from_image P_ ((struct it *)); -static int next_element_from_stretch P_ ((struct it *)); -static void load_overlay_strings P_ ((struct it *, int)); -static int init_from_display_pos P_ ((struct it *, struct window *, - struct display_pos *)); -static void reseat_to_string P_ ((struct it *, unsigned char *, - Lisp_Object, int, int, int, int)); +static Lisp_Object redisplay_window_0 (Lisp_Object); +static Lisp_Object redisplay_window_1 (Lisp_Object); +static int update_menu_bar (struct frame *, int, int); +static int try_window_reusing_current_matrix (struct window *); +static int try_window_id (struct window *); +static int display_line (struct it *); +static int display_mode_lines (struct window *); +static int display_mode_line (struct window *, enum face_id, Lisp_Object); +static int display_mode_element (struct it *, int, int, int, Lisp_Object, Lisp_Object, int); +static int store_mode_line_string (char *, Lisp_Object, int, int, int, Lisp_Object); +static char *decode_mode_spec (struct window *, int, int, int, + Lisp_Object *); +static void display_menu_bar (struct window *); +static int display_count_lines (int, int, int, int, int *); +static int display_string (unsigned char *, Lisp_Object, Lisp_Object, + EMACS_INT, EMACS_INT, struct it *, int, int, int, int); +static void compute_line_metrics (struct it *); +static void run_redisplay_end_trigger_hook (struct it *); +static int get_overlay_strings (struct it *, int); +static int get_overlay_strings_1 (struct it *, int, int); +static void next_overlay_string (struct it *); +static void reseat (struct it *, struct text_pos, int); +static void reseat_1 (struct it *, struct text_pos, int); +static void back_to_previous_visible_line_start (struct it *); +void reseat_at_previous_visible_line_start (struct it *); +static void reseat_at_next_visible_line_start (struct it *, int); +static int next_element_from_ellipsis (struct it *); +static int next_element_from_display_vector (struct it *); +static int next_element_from_string (struct it *); +static int next_element_from_c_string (struct it *); +static int next_element_from_buffer (struct it *); +static int next_element_from_composition (struct it *); +static int next_element_from_image (struct it *); +static int next_element_from_stretch (struct it *); +static void load_overlay_strings (struct it *, int); +static int init_from_display_pos (struct it *, struct window *, + struct display_pos *); +static void reseat_to_string (struct it *, unsigned char *, + Lisp_Object, int, int, int, int); static enum move_it_result move_it_in_display_line_to (struct it *, EMACS_INT, int, enum move_operation_enum); -void move_it_vertically_backward P_ ((struct it *, int)); -static void init_to_row_start P_ ((struct it *, struct window *, - struct glyph_row *)); -static int init_to_row_end P_ ((struct it *, struct window *, - struct glyph_row *)); -static void back_to_previous_line_start P_ ((struct it *)); -static int forward_to_next_line_start P_ ((struct it *, int *)); -static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos, - Lisp_Object, int)); -static struct text_pos string_pos P_ ((int, Lisp_Object)); -static struct text_pos c_string_pos P_ ((int, unsigned char *, int)); -static int number_of_chars P_ ((unsigned char *, int)); -static void compute_stop_pos P_ ((struct it *)); -static void compute_string_pos P_ ((struct text_pos *, struct text_pos, - Lisp_Object)); -static int face_before_or_after_it_pos P_ ((struct it *, int)); -static EMACS_INT next_overlay_change P_ ((EMACS_INT)); -static int handle_single_display_spec P_ ((struct it *, Lisp_Object, - Lisp_Object, Lisp_Object, - struct text_pos *, int)); -static int underlying_face_id P_ ((struct it *)); -static int in_ellipses_for_invisible_text_p P_ ((struct display_pos *, - struct window *)); +void move_it_vertically_backward (struct it *, int); +static void init_to_row_start (struct it *, struct window *, + struct glyph_row *); +static int init_to_row_end (struct it *, struct window *, + struct glyph_row *); +static void back_to_previous_line_start (struct it *); +static int forward_to_next_line_start (struct it *, int *); +static struct text_pos string_pos_nchars_ahead (struct text_pos, + Lisp_Object, int); +static struct text_pos string_pos (int, Lisp_Object); +static struct text_pos c_string_pos (int, unsigned char *, int); +static int number_of_chars (unsigned char *, int); +static void compute_stop_pos (struct it *); +static void compute_string_pos (struct text_pos *, struct text_pos, + Lisp_Object); +static int face_before_or_after_it_pos (struct it *, int); +static EMACS_INT next_overlay_change (EMACS_INT); +static int handle_single_display_spec (struct it *, Lisp_Object, + Lisp_Object, Lisp_Object, + struct text_pos *, int); +static int underlying_face_id (struct it *); +static int in_ellipses_for_invisible_text_p (struct display_pos *, + struct window *); #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1) #define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0) #ifdef HAVE_WINDOW_SYSTEM -static void update_tool_bar P_ ((struct frame *, int)); -static void build_desired_tool_bar_string P_ ((struct frame *f)); -static int redisplay_tool_bar P_ ((struct frame *)); -static void display_tool_bar_line P_ ((struct it *, int)); -static void notice_overwritten_cursor P_ ((struct window *, - enum glyph_row_area, - int, int, int, int)); -static void append_stretch_glyph P_ ((struct it *, Lisp_Object, - int, int, int)); +static void update_tool_bar (struct frame *, int); +static void build_desired_tool_bar_string (struct frame *f); +static int redisplay_tool_bar (struct frame *); +static void display_tool_bar_line (struct it *, int); +static void notice_overwritten_cursor (struct window *, + enum glyph_row_area, + int, int, int, int); +static void append_stretch_glyph (struct it *, Lisp_Object, + int, int, int); @@ -5839,7 +5839,7 @@ reseat_to_string (it, s, string, charpos, precision, field_width, multibyte) /* Map enum it_method value to corresponding next_element_from_* function. */ -static int (* get_next_element[NUM_IT_METHODS]) P_ ((struct it *it)) = +static int (* get_next_element[NUM_IT_METHODS]) (struct it *it) = { next_element_from_buffer, next_element_from_display_vector, @@ -8813,7 +8813,7 @@ static int with_echo_area_buffer (w, which, fn, a1, a2, a3, a4) struct window *w; int which; - int (*fn) P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); + int (*fn) (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT); EMACS_INT a1; Lisp_Object a2; EMACS_INT a3, a4; @@ -11204,8 +11204,8 @@ note_tool_bar_highlight (f, x, y) Horizontal scrolling ************************************************************************/ -static int hscroll_window_tree P_ ((Lisp_Object)); -static int hscroll_windows P_ ((Lisp_Object)); +static int hscroll_window_tree (Lisp_Object); +static int hscroll_windows (Lisp_Object); /* For all leaf windows in the window tree rooted at WINDOW, set their hscroll value so that PT is (i) visible in the window, and (ii) so @@ -15384,12 +15384,12 @@ try_window_reusing_current_matrix (w) Window redisplay reusing current matrix when buffer has changed ************************************************************************/ -static struct glyph_row *find_last_unchanged_at_beg_row P_ ((struct window *)); -static struct glyph_row *find_first_unchanged_at_end_row P_ ((struct window *, - int *, int *)); +static struct glyph_row *find_last_unchanged_at_beg_row (struct window *); +static struct glyph_row *find_first_unchanged_at_end_row (struct window *, + int *, int *); static struct glyph_row * -find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *, - struct glyph_row *)); +find_last_row_displaying_text (struct glyph_matrix *, struct it *, + struct glyph_row *); /* Return the last row in MATRIX displaying text. If row START is @@ -16447,9 +16447,9 @@ try_window_id (w) #if GLYPH_DEBUG -void dump_glyph_row P_ ((struct glyph_row *, int, int)); -void dump_glyph_matrix P_ ((struct glyph_matrix *, int)); -void dump_glyph P_ ((struct glyph_row *, struct glyph *, int)); +void dump_glyph_row (struct glyph_row *, int, int); +void dump_glyph_matrix (struct glyph_matrix *, int); +void dump_glyph (struct glyph_row *, struct glyph *, int); /* Dump the contents of glyph matrix MATRIX on stderr. diff --git a/src/xfaces.c b/src/xfaces.c index 6bde1c121d..714b07c080 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -510,56 +510,56 @@ int menu_face_changed_default; struct table_entry; struct named_merge_point; -static void map_tty_color P_ ((struct frame *, struct face *, - enum lface_attribute_index, int *)); -static Lisp_Object resolve_face_name P_ ((Lisp_Object, int)); -static int may_use_scalable_font_p P_ ((const char *)); -static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object)); -static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, - int, struct named_merge_point *)); -static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *)); -static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int)); -static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *)); -static void free_face_colors P_ ((struct frame *, struct face *)); -static int face_color_gray_p P_ ((struct frame *, char *)); -static struct face *realize_face P_ ((struct face_cache *, Lisp_Object *, - int)); -static struct face *realize_non_ascii_face P_ ((struct frame *, Lisp_Object, - struct face *)); -static struct face *realize_x_face P_ ((struct face_cache *, Lisp_Object *)); -static struct face *realize_tty_face P_ ((struct face_cache *, Lisp_Object *)); -static int realize_basic_faces P_ ((struct frame *)); -static int realize_default_face P_ ((struct frame *)); -static void realize_named_face P_ ((struct frame *, Lisp_Object, int)); -static int lface_fully_specified_p P_ ((Lisp_Object *)); -static int lface_equal_p P_ ((Lisp_Object *, Lisp_Object *)); -static unsigned hash_string_case_insensitive P_ ((Lisp_Object)); -static unsigned lface_hash P_ ((Lisp_Object *)); -static int lface_same_font_attributes_p P_ ((Lisp_Object *, Lisp_Object *)); -static struct face_cache *make_face_cache P_ ((struct frame *)); -static void clear_face_gcs P_ ((struct face_cache *)); -static void free_face_cache P_ ((struct face_cache *)); -static int face_fontset P_ ((Lisp_Object *)); -static void merge_face_vectors P_ ((struct frame *, Lisp_Object *, Lisp_Object*, - struct named_merge_point *)); -static int merge_face_ref P_ ((struct frame *, Lisp_Object, Lisp_Object *, - int, struct named_merge_point *)); -static int set_lface_from_font P_ ((struct frame *, Lisp_Object, Lisp_Object, - int)); -static Lisp_Object lface_from_face_name P_ ((struct frame *, Lisp_Object, int)); -static struct face *make_realized_face P_ ((Lisp_Object *)); -static void cache_face P_ ((struct face_cache *, struct face *, unsigned)); -static void uncache_face P_ ((struct face_cache *, struct face *)); +static void map_tty_color (struct frame *, struct face *, + enum lface_attribute_index, int *); +static Lisp_Object resolve_face_name (Lisp_Object, int); +static int may_use_scalable_font_p (const char *); +static void set_font_frame_param (Lisp_Object, Lisp_Object); +static int get_lface_attributes (struct frame *, Lisp_Object, Lisp_Object *, + int, struct named_merge_point *); +static int load_pixmap (struct frame *, Lisp_Object, unsigned *, unsigned *); +static struct frame *frame_or_selected_frame (Lisp_Object, int); +static void load_face_colors (struct frame *, struct face *, Lisp_Object *); +static void free_face_colors (struct frame *, struct face *); +static int face_color_gray_p (struct frame *, char *); +static struct face *realize_face (struct face_cache *, Lisp_Object *, + int); +static struct face *realize_non_ascii_face (struct frame *, Lisp_Object, + struct face *); +static struct face *realize_x_face (struct face_cache *, Lisp_Object *); +static struct face *realize_tty_face (struct face_cache *, Lisp_Object *); +static int realize_basic_faces (struct frame *); +static int realize_default_face (struct frame *); +static void realize_named_face (struct frame *, Lisp_Object, int); +static int lface_fully_specified_p (Lisp_Object *); +static int lface_equal_p (Lisp_Object *, Lisp_Object *); +static unsigned hash_string_case_insensitive (Lisp_Object); +static unsigned lface_hash (Lisp_Object *); +static int lface_same_font_attributes_p (Lisp_Object *, Lisp_Object *); +static struct face_cache *make_face_cache (struct frame *); +static void clear_face_gcs (struct face_cache *); +static void free_face_cache (struct face_cache *); +static int face_fontset (Lisp_Object *); +static void merge_face_vectors (struct frame *, Lisp_Object *, Lisp_Object*, + struct named_merge_point *); +static int merge_face_ref (struct frame *, Lisp_Object, Lisp_Object *, + int, struct named_merge_point *); +static int set_lface_from_font (struct frame *, Lisp_Object, Lisp_Object, + int); +static Lisp_Object lface_from_face_name (struct frame *, Lisp_Object, int); +static struct face *make_realized_face (Lisp_Object *); +static void cache_face (struct face_cache *, struct face *, unsigned); +static void uncache_face (struct face_cache *, struct face *); #ifdef HAVE_WINDOW_SYSTEM -static GC x_create_gc P_ ((struct frame *, unsigned long, XGCValues *)); -static void x_free_gc P_ ((struct frame *, GC)); +static GC x_create_gc (struct frame *, unsigned long, XGCValues *); +static void x_free_gc (struct frame *, GC); #ifdef USE_X_TOOLKIT -static void x_update_menu_appearance P_ ((struct frame *)); +static void x_update_menu_appearance (struct frame *); -extern void free_frame_menubar P_ ((struct frame *)); +extern void free_frame_menubar (struct frame *); #endif /* USE_X_TOOLKIT */ #endif /* HAVE_WINDOW_SYSTEM */ @@ -3778,7 +3778,7 @@ x_update_menu_appearance (f) { #if defined HAVE_X_I18N extern char *xic_create_fontsetname - P_ ((char *base_fontname, Bool motif)); + (char *base_fontname, Bool motif); char *fontsetname = xic_create_fontsetname (SDATA (xlfd), motif); #else char *fontsetname = (char *) SDATA (xlfd); diff --git a/src/xfns.c b/src/xfns.c index ea592417d1..74ddce6cf5 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -499,33 +499,33 @@ x_top_window_to_frame (dpyinfo, wdesc) -static void x_default_font_parameter P_ ((struct frame *, Lisp_Object)); - -static Lisp_Object unwind_create_frame P_ ((Lisp_Object)); -static Lisp_Object unwind_create_tip_frame P_ ((Lisp_Object)); - -void x_set_foreground_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); -static void x_set_wait_for_wm P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_background_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_mouse_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_cursor_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_border_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); -void x_set_scroll_bar_foreground P_ ((struct frame *, Lisp_Object, - Lisp_Object)); -void x_set_scroll_bar_background P_ ((struct frame *, Lisp_Object, - Lisp_Object)); -static Lisp_Object x_default_scroll_bar_color_parameter P_ ((struct frame *, - Lisp_Object, - Lisp_Object, - char *, char *, - int)); +static void x_default_font_parameter (struct frame *, Lisp_Object); + +static Lisp_Object unwind_create_frame (Lisp_Object); +static Lisp_Object unwind_create_tip_frame (Lisp_Object); + +void x_set_foreground_color (struct frame *, Lisp_Object, Lisp_Object); +static void x_set_wait_for_wm (struct frame *, Lisp_Object, Lisp_Object); +void x_set_background_color (struct frame *, Lisp_Object, Lisp_Object); +void x_set_mouse_color (struct frame *, Lisp_Object, Lisp_Object); +void x_set_cursor_color (struct frame *, Lisp_Object, Lisp_Object); +void x_set_border_color (struct frame *, Lisp_Object, Lisp_Object); +void x_set_cursor_type (struct frame *, Lisp_Object, Lisp_Object); +void x_set_icon_type (struct frame *, Lisp_Object, Lisp_Object); +void x_set_icon_name (struct frame *, Lisp_Object, Lisp_Object); +void x_explicitly_set_name (struct frame *, Lisp_Object, Lisp_Object); +void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); +void x_set_title (struct frame *, Lisp_Object, Lisp_Object); +void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object); +void x_set_scroll_bar_foreground (struct frame *, Lisp_Object, + Lisp_Object); +void x_set_scroll_bar_background (struct frame *, Lisp_Object, + Lisp_Object); +static Lisp_Object x_default_scroll_bar_color_parameter (struct frame *, + Lisp_Object, + Lisp_Object, + char *, char *, + int); /* Store the screen positions of frame F into XPTR and YPTR. @@ -1938,8 +1938,8 @@ hack_wm_protocols (f, widget) #ifdef HAVE_X_I18N -static XFontSet xic_create_xfontset P_ ((struct frame *)); -static XIMStyle best_xim_style P_ ((XIMStyles *, XIMStyles *)); +static XFontSet xic_create_xfontset (struct frame *); +static XIMStyle best_xim_style (XIMStyles *, XIMStyles *); /* Supported XIM styles, ordered by preference. */ @@ -4665,10 +4665,10 @@ hide_hourglass () Tool tips ***********************************************************************/ -static Lisp_Object x_create_tip_frame P_ ((struct x_display_info *, - Lisp_Object, Lisp_Object)); -static void compute_tip_xy P_ ((struct frame *, Lisp_Object, Lisp_Object, - Lisp_Object, int, int, int *, int *)); +static Lisp_Object x_create_tip_frame (struct x_display_info *, + Lisp_Object, Lisp_Object); +static void compute_tip_xy (struct frame *, Lisp_Object, Lisp_Object, + Lisp_Object, int, int, int *, int *); /* The frame of a currently visible tooltip. */ @@ -5341,7 +5341,7 @@ Value is t if tooltip was open, nil otherwise. */) { struct frame *f = SELECTED_FRAME (); Widget w = f->output_data.x->menubar_widget; - extern void xlwmenu_redisplay P_ ((Widget)); + extern void xlwmenu_redisplay (Widget); if (!DoesSaveUnders (FRAME_X_DISPLAY_INFO (f)->screen) && w != NULL) diff --git a/src/xfont.c b/src/xfont.c index d8fe40eaa9..8a1d960343 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -47,9 +47,9 @@ struct xfont_info }; /* Prototypes of support functions. */ -extern void x_clear_errors P_ ((Display *)); +extern void x_clear_errors (Display *); -static XCharStruct *xfont_get_pcm P_ ((XFontStruct *, XChar2b *)); +static XCharStruct *xfont_get_pcm (XFontStruct *, XChar2b *); /* Get metrics of character CHAR2B in XFONT. Value is null if CHAR2B is not contained in the font. */ @@ -119,19 +119,19 @@ xfont_get_pcm (xfont, char2b) ? NULL : pcm); } -static Lisp_Object xfont_get_cache P_ ((FRAME_PTR)); -static Lisp_Object xfont_list P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object xfont_match P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object xfont_list_family P_ ((Lisp_Object)); -static Lisp_Object xfont_open P_ ((FRAME_PTR, Lisp_Object, int)); -static void xfont_close P_ ((FRAME_PTR, struct font *)); -static int xfont_prepare_face P_ ((FRAME_PTR, struct face *)); -static int xfont_has_char P_ ((Lisp_Object, int)); -static unsigned xfont_encode_char P_ ((struct font *, int)); -static int xfont_text_extents P_ ((struct font *, unsigned *, int, - struct font_metrics *)); -static int xfont_draw P_ ((struct glyph_string *, int, int, int, int, int)); -static int xfont_check P_ ((FRAME_PTR, struct font *)); +static Lisp_Object xfont_get_cache (FRAME_PTR); +static Lisp_Object xfont_list (Lisp_Object, Lisp_Object); +static Lisp_Object xfont_match (Lisp_Object, Lisp_Object); +static Lisp_Object xfont_list_family (Lisp_Object); +static Lisp_Object xfont_open (FRAME_PTR, Lisp_Object, int); +static void xfont_close (FRAME_PTR, struct font *); +static int xfont_prepare_face (FRAME_PTR, struct face *); +static int xfont_has_char (Lisp_Object, int); +static unsigned xfont_encode_char (struct font *, int); +static int xfont_text_extents (struct font *, unsigned *, int, + struct font_metrics *); +static int xfont_draw (struct glyph_string *, int, int, int, int, int); +static int xfont_check (FRAME_PTR, struct font *); struct font_driver xfont_driver = { diff --git a/src/xftfont.c b/src/xftfont.c index 197cc9c1f5..8aeb6397f0 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -70,9 +70,9 @@ struct xftface_info XftColor xft_bg; /* color for face->background */ }; -static void xftfont_get_colors P_ ((FRAME_PTR, struct face *, GC gc, - struct xftface_info *, - XftColor *fg, XftColor *bg)); +static void xftfont_get_colors (FRAME_PTR, struct face *, GC gc, + struct xftface_info *, + XftColor *fg, XftColor *bg); /* Setup foreground and background colors of GC into FG and BG. If @@ -141,18 +141,18 @@ xftfont_get_colors (f, face, gc, xftface_info, fg, bg) } -static Lisp_Object xftfont_list P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object xftfont_match P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object xftfont_open P_ ((FRAME_PTR, Lisp_Object, int)); -static void xftfont_close P_ ((FRAME_PTR, struct font *)); -static int xftfont_prepare_face P_ ((FRAME_PTR, struct face *)); -static void xftfont_done_face P_ ((FRAME_PTR, struct face *)); -static int xftfont_has_char P_ ((Lisp_Object, int)); -static unsigned xftfont_encode_char P_ ((struct font *, int)); -static int xftfont_text_extents P_ ((struct font *, unsigned *, int, - struct font_metrics *)); -static int xftfont_draw P_ ((struct glyph_string *, int, int, int, int, int)); -static int xftfont_end_for_frame P_ ((FRAME_PTR f)); +static Lisp_Object xftfont_list (Lisp_Object, Lisp_Object); +static Lisp_Object xftfont_match (Lisp_Object, Lisp_Object); +static Lisp_Object xftfont_open (FRAME_PTR, Lisp_Object, int); +static void xftfont_close (FRAME_PTR, struct font *); +static int xftfont_prepare_face (FRAME_PTR, struct face *); +static void xftfont_done_face (FRAME_PTR, struct face *); +static int xftfont_has_char (Lisp_Object, int); +static unsigned xftfont_encode_char (struct font *, int); +static int xftfont_text_extents (struct font *, unsigned *, int, + struct font_metrics *); +static int xftfont_draw (struct glyph_string *, int, int, int, int, int); +static int xftfont_end_for_frame (FRAME_PTR f); struct font_driver xftfont_driver; @@ -180,8 +180,8 @@ xftfont_match (frame, spec) return entity; } -extern Lisp_Object ftfont_font_format P_ ((FcPattern *, Lisp_Object)); -extern FcCharSet *ftfont_get_fc_charset P_ ((Lisp_Object)); +extern Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object); +extern FcCharSet *ftfont_get_fc_charset (Lisp_Object); extern Lisp_Object QCantialias; static FcChar8 ascii_printable[95]; diff --git a/src/xmenu.c b/src/xmenu.c index 53b6b8de48..189bcbf9a2 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -122,22 +122,22 @@ extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; extern Lisp_Object Qmenu_bar_update_hook; #ifdef USE_X_TOOLKIT -extern void set_frame_menubar P_ ((FRAME_PTR, int, int)); +extern void set_frame_menubar (FRAME_PTR, int, int); extern XtAppContext Xt_app_con; -static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, Lisp_Object, - char **)); -static void popup_get_selection P_ ((XEvent *, struct x_display_info *, - LWLIB_ID, int)); +static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object, + char **); +static void popup_get_selection (XEvent *, struct x_display_info *, + LWLIB_ID, int); #endif /* USE_X_TOOLKIT */ #ifdef USE_GTK -extern void set_frame_menubar P_ ((FRAME_PTR, int, int)); -static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, Lisp_Object, - char **)); +extern void set_frame_menubar (FRAME_PTR, int, int); +static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object, + char **); #endif -static int update_frame_menubar P_ ((struct frame *)); +static int update_frame_menubar (struct frame *); /* Flag which when set indicates a dialog or menu has been posted by Xt on behalf of one of the widget sets. */ @@ -147,8 +147,8 @@ static int next_menubar_widget_id; /* For NS and NTGUI, these prototypes are defined in keyboard.h. */ #if defined (USE_X_TOOLKIT) || defined (USE_GTK) -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 /* This is set nonzero after the user activates the menu bar, and set diff --git a/src/xselect.c b/src/xselect.c index e202773685..459e533512 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -45,44 +45,44 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ struct prop_location; -static Lisp_Object x_atom_to_symbol P_ ((Display *dpy, Atom atom)); -static Atom symbol_to_x_atom P_ ((struct x_display_info *, Display *, - Lisp_Object)); -static void x_own_selection P_ ((Lisp_Object, Lisp_Object)); -static Lisp_Object x_get_local_selection P_ ((Lisp_Object, Lisp_Object, int)); -static void x_decline_selection_request P_ ((struct input_event *)); -static Lisp_Object x_selection_request_lisp_error P_ ((Lisp_Object)); -static Lisp_Object queue_selection_requests_unwind P_ ((Lisp_Object)); -static Lisp_Object some_frame_on_display P_ ((struct x_display_info *)); -static Lisp_Object x_catch_errors_unwind P_ ((Lisp_Object)); -static void x_reply_selection_request P_ ((struct input_event *, int, - unsigned char *, int, Atom)); -static int waiting_for_other_props_on_window P_ ((Display *, Window)); -static struct prop_location *expect_property_change P_ ((Display *, Window, - Atom, int)); -static void unexpect_property_change P_ ((struct prop_location *)); -static Lisp_Object wait_for_property_change_unwind P_ ((Lisp_Object)); -static void wait_for_property_change P_ ((struct prop_location *)); -static Lisp_Object x_get_foreign_selection P_ ((Lisp_Object, - Lisp_Object, - Lisp_Object)); -static void x_get_window_property P_ ((Display *, Window, Atom, - unsigned char **, int *, - Atom *, int *, unsigned long *, int)); -static void receive_incremental_selection P_ ((Display *, Window, Atom, - Lisp_Object, unsigned, - unsigned char **, int *, - Atom *, int *, unsigned long *)); -static Lisp_Object x_get_window_property_as_lisp_data P_ ((Display *, - Window, Atom, - Lisp_Object, Atom)); -static Lisp_Object selection_data_to_lisp_data P_ ((Display *, unsigned char *, - int, Atom, int)); -static void lisp_data_to_selection_data P_ ((Display *, Lisp_Object, - unsigned char **, Atom *, - unsigned *, int *, int *)); -static Lisp_Object clean_local_selection_data P_ ((Lisp_Object)); -static void initialize_cut_buffers P_ ((Display *, Window)); +static Lisp_Object x_atom_to_symbol (Display *dpy, Atom atom); +static Atom symbol_to_x_atom (struct x_display_info *, Display *, + Lisp_Object); +static void x_own_selection (Lisp_Object, Lisp_Object); +static Lisp_Object x_get_local_selection (Lisp_Object, Lisp_Object, int); +static void x_decline_selection_request (struct input_event *); +static Lisp_Object x_selection_request_lisp_error (Lisp_Object); +static Lisp_Object queue_selection_requests_unwind (Lisp_Object); +static Lisp_Object some_frame_on_display (struct x_display_info *); +static Lisp_Object x_catch_errors_unwind (Lisp_Object); +static void x_reply_selection_request (struct input_event *, int, + unsigned char *, int, Atom); +static int waiting_for_other_props_on_window (Display *, Window); +static struct prop_location *expect_property_change (Display *, Window, + Atom, int); +static void unexpect_property_change (struct prop_location *); +static Lisp_Object wait_for_property_change_unwind (Lisp_Object); +static void wait_for_property_change (struct prop_location *); +static Lisp_Object x_get_foreign_selection (Lisp_Object, + Lisp_Object, + Lisp_Object); +static void x_get_window_property (Display *, Window, Atom, + unsigned char **, int *, + Atom *, int *, unsigned long *, int); +static void receive_incremental_selection (Display *, Window, Atom, + Lisp_Object, unsigned, + unsigned char **, int *, + Atom *, int *, unsigned long *); +static Lisp_Object x_get_window_property_as_lisp_data (Display *, + Window, Atom, + Lisp_Object, Atom); +static Lisp_Object selection_data_to_lisp_data (Display *, unsigned char *, + int, Atom, int); +static void lisp_data_to_selection_data (Display *, Lisp_Object, + unsigned char **, Atom *, + unsigned *, int *, int *); +static Lisp_Object clean_local_selection_data (Lisp_Object); +static void initialize_cut_buffers (Display *, Window); /* Printing traces to stderr. */ diff --git a/src/xterm.c b/src/xterm.c index e3ce7bb653..2279f71189 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -104,13 +104,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #endif #ifdef USE_LUCID -extern int xlwmenu_window_p P_ ((Widget w, Window window)); -extern void xlwmenu_redisplay P_ ((Widget)); +extern int xlwmenu_window_p (Widget w, Window window); +extern void xlwmenu_redisplay (Widget); #endif #if defined (USE_X_TOOLKIT) || defined (USE_GTK) -extern void free_frame_menubar P_ ((struct frame *)); +extern void free_frame_menubar (struct frame *); #endif #ifdef USE_X_TOOLKIT @@ -332,54 +332,54 @@ Lisp_Object Qx_gtk_map_stock; extern Lisp_Object Vinhibit_redisplay; -extern XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *)); -extern int x_bitmap_mask P_ ((FRAME_PTR, int)); - -static int x_alloc_nearest_color_1 P_ ((Display *, Colormap, XColor *)); -static void x_set_window_size_1 P_ ((struct frame *, int, int, int)); -static const XColor *x_color_cells P_ ((Display *, int *)); -static void x_update_window_end P_ ((struct window *, int, int)); - -static int x_io_error_quitter P_ ((Display *)); -static struct terminal *x_create_terminal P_ ((struct x_display_info *)); -void x_delete_terminal P_ ((struct terminal *)); -static void x_update_end P_ ((struct frame *)); -static void XTframe_up_to_date P_ ((struct frame *)); -static void XTset_terminal_modes P_ ((struct terminal *)); -static void XTreset_terminal_modes P_ ((struct terminal *)); -static void x_clear_frame P_ ((struct frame *)); -static void frame_highlight P_ ((struct frame *)); -static void frame_unhighlight P_ ((struct frame *)); -static void x_new_focus_frame P_ ((struct x_display_info *, struct frame *)); -static void x_focus_changed P_ ((int, int, struct x_display_info *, - struct frame *, struct input_event *)); -static void x_detect_focus_change P_ ((struct x_display_info *, - XEvent *, struct input_event *)); -static void XTframe_rehighlight P_ ((struct frame *)); -static void x_frame_rehighlight P_ ((struct x_display_info *)); -static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *)); -static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int, - enum text_cursor_kinds)); - -static void x_clip_to_row P_ ((struct window *, struct glyph_row *, int, GC)); -static void x_flush P_ ((struct frame *f)); -static void x_update_begin P_ ((struct frame *)); -static void x_update_window_begin P_ ((struct window *)); -static void x_after_update_window_line P_ ((struct glyph_row *)); -static struct scroll_bar *x_window_to_scroll_bar P_ ((Display *, Window)); -static void x_scroll_bar_report_motion P_ ((struct frame **, Lisp_Object *, - enum scroll_bar_part *, - Lisp_Object *, Lisp_Object *, - unsigned long *)); -static void x_handle_net_wm_state P_ ((struct frame *, XPropertyEvent *)); -static void x_check_fullscreen P_ ((struct frame *)); -static void x_check_expected_move P_ ((struct frame *, int, int)); -static void x_sync_with_move P_ ((struct frame *, int, int, int)); -static int handle_one_xevent P_ ((struct x_display_info *, XEvent *, - int *, struct input_event *)); +extern XrmDatabase x_load_resources (Display *, char *, char *, char *); +extern int x_bitmap_mask (FRAME_PTR, int); + +static int x_alloc_nearest_color_1 (Display *, Colormap, XColor *); +static void x_set_window_size_1 (struct frame *, int, int, int); +static const XColor *x_color_cells (Display *, int *); +static void x_update_window_end (struct window *, int, int); + +static int x_io_error_quitter (Display *); +static struct terminal *x_create_terminal (struct x_display_info *); +void x_delete_terminal (struct terminal *); +static void x_update_end (struct frame *); +static void XTframe_up_to_date (struct frame *); +static void XTset_terminal_modes (struct terminal *); +static void XTreset_terminal_modes (struct terminal *); +static void x_clear_frame (struct frame *); +static void frame_highlight (struct frame *); +static void frame_unhighlight (struct frame *); +static void x_new_focus_frame (struct x_display_info *, struct frame *); +static void x_focus_changed (int, int, struct x_display_info *, + struct frame *, struct input_event *); +static void x_detect_focus_change (struct x_display_info *, + XEvent *, struct input_event *); +static void XTframe_rehighlight (struct frame *); +static void x_frame_rehighlight (struct x_display_info *); +static void x_draw_hollow_cursor (struct window *, struct glyph_row *); +static void x_draw_bar_cursor (struct window *, struct glyph_row *, int, + enum text_cursor_kinds); + +static void x_clip_to_row (struct window *, struct glyph_row *, int, GC); +static void x_flush (struct frame *f); +static void x_update_begin (struct frame *); +static void x_update_window_begin (struct window *); +static void x_after_update_window_line (struct glyph_row *); +static struct scroll_bar *x_window_to_scroll_bar (Display *, Window); +static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *, + enum scroll_bar_part *, + Lisp_Object *, Lisp_Object *, + unsigned long *); +static void x_handle_net_wm_state (struct frame *, XPropertyEvent *); +static void x_check_fullscreen (struct frame *); +static void x_check_expected_move (struct frame *, int, int); +static void x_sync_with_move (struct frame *, int, int, int); +static int handle_one_xevent (struct x_display_info *, XEvent *, + int *, struct input_event *); /* Don't declare this NO_RETURN because we want no interference with debugging failing X calls. */ -static SIGTYPE x_connection_closed P_ ((Display *, char *)); +static SIGTYPE x_connection_closed (Display *, char *); /* Flush display of frame F, or of all frames if F is null. */ @@ -931,37 +931,37 @@ XTreset_terminal_modes (struct terminal *terminal) -static void x_set_glyph_string_clipping P_ ((struct glyph_string *)); -static void x_set_glyph_string_gc P_ ((struct glyph_string *)); -static void x_draw_glyph_string_background P_ ((struct glyph_string *, - int)); -static void x_draw_glyph_string_foreground P_ ((struct glyph_string *)); -static void x_draw_composite_glyph_string_foreground P_ ((struct glyph_string *)); -static void x_draw_glyph_string_box P_ ((struct glyph_string *)); -static void x_draw_glyph_string P_ ((struct glyph_string *)); -static void x_compute_glyph_string_overhangs P_ ((struct glyph_string *)); -static void x_set_cursor_gc P_ ((struct glyph_string *)); -static void x_set_mode_line_face_gc P_ ((struct glyph_string *)); -static void x_set_mouse_face_gc P_ ((struct glyph_string *)); -static int x_alloc_lighter_color P_ ((struct frame *, Display *, Colormap, - unsigned long *, double, int)); -static void x_setup_relief_color P_ ((struct frame *, struct relief *, - double, int, unsigned long)); -static void x_setup_relief_colors P_ ((struct glyph_string *)); -static void x_draw_image_glyph_string P_ ((struct glyph_string *)); -static void x_draw_image_relief P_ ((struct glyph_string *)); -static void x_draw_image_foreground P_ ((struct glyph_string *)); -static void x_draw_image_foreground_1 P_ ((struct glyph_string *, Pixmap)); -static void x_clear_glyph_string_rect P_ ((struct glyph_string *, int, - int, int, int)); -static void x_draw_relief_rect P_ ((struct frame *, int, int, int, int, - int, int, int, int, int, int, - XRectangle *)); -static void x_draw_box_rect P_ ((struct glyph_string *, int, int, int, int, - int, int, int, XRectangle *)); +static void x_set_glyph_string_clipping (struct glyph_string *); +static void x_set_glyph_string_gc (struct glyph_string *); +static void x_draw_glyph_string_background (struct glyph_string *, + int); +static void x_draw_glyph_string_foreground (struct glyph_string *); +static void x_draw_composite_glyph_string_foreground (struct glyph_string *); +static void x_draw_glyph_string_box (struct glyph_string *); +static void x_draw_glyph_string (struct glyph_string *); +static void x_compute_glyph_string_overhangs (struct glyph_string *); +static void x_set_cursor_gc (struct glyph_string *); +static void x_set_mode_line_face_gc (struct glyph_string *); +static void x_set_mouse_face_gc (struct glyph_string *); +static int x_alloc_lighter_color (struct frame *, Display *, Colormap, + unsigned long *, double, int); +static void x_setup_relief_color (struct frame *, struct relief *, + double, int, unsigned long); +static void x_setup_relief_colors (struct glyph_string *); +static void x_draw_image_glyph_string (struct glyph_string *); +static void x_draw_image_relief (struct glyph_string *); +static void x_draw_image_foreground (struct glyph_string *); +static void x_draw_image_foreground_1 (struct glyph_string *, Pixmap); +static void x_clear_glyph_string_rect (struct glyph_string *, int, + int, int, int); +static void x_draw_relief_rect (struct frame *, int, int, int, int, + int, int, int, int, int, int, + XRectangle *); +static void x_draw_box_rect (struct glyph_string *, int, int, int, int, + int, int, int, XRectangle *); #if GLYPH_DEBUG -static void x_check_font P_ ((struct frame *, struct font *)); +static void x_check_font (struct frame *, struct font *); #endif @@ -1401,11 +1401,11 @@ x_draw_composite_glyph_string_foreground (s) #ifdef USE_X_TOOLKIT -static struct frame *x_frame_of_widget P_ ((Widget)); -static Boolean cvt_string_to_pixel P_ ((Display *, XrmValue *, Cardinal *, - XrmValue *, XrmValue *, XtPointer *)); -static void cvt_pixel_dtor P_ ((XtAppContext, XrmValue *, XtPointer, - XrmValue *, Cardinal *)); +static struct frame *x_frame_of_widget (Widget); +static Boolean cvt_string_to_pixel (Display *, XrmValue *, Cardinal *, + XrmValue *, XrmValue *, XtPointer *); +static void cvt_pixel_dtor (XtAppContext, XrmValue *, XtPointer, + XrmValue *, Cardinal *); /* Return the frame on which widget WIDGET is used.. Abort if frame @@ -4125,12 +4125,12 @@ x_window_to_menu_bar (window) #ifdef USE_TOOLKIT_SCROLL_BARS -static void x_scroll_bar_to_input_event P_ ((XEvent *, struct input_event *)); -static void x_send_scroll_bar_event P_ ((Lisp_Object, int, int, int)); -static void x_create_toolkit_scroll_bar P_ ((struct frame *, - struct scroll_bar *)); -static void x_set_toolkit_scroll_bar_thumb P_ ((struct scroll_bar *, - int, int, int)); +static void x_scroll_bar_to_input_event (XEvent *, struct input_event *); +static void x_send_scroll_bar_event (Lisp_Object, int, int, int); +static void x_create_toolkit_scroll_bar (struct frame *, + struct scroll_bar *); +static void x_set_toolkit_scroll_bar_thumb (struct scroll_bar *, + int, int, int); /* Lisp window being scrolled. Set when starting to interact with @@ -7919,7 +7919,7 @@ x_connection_closed (dpy, error_message) /* If DPYINFO is null, this means we didn't open the display in the first place, so don't try to close it. */ { - extern void (*fatal_error_signal_hook) P_ ((void)); + extern void (*fatal_error_signal_hook) (void); fatal_error_signal_hook = x_fatal_error_signal; XtCloseDisplay (dpy); fatal_error_signal_hook = NULL; @@ -7980,7 +7980,7 @@ x_connection_closed (dpy, error_message) /* We specifically use it before defining it, so that gcc doesn't inline it, otherwise gdb doesn't know how to properly put a breakpoint on it. */ -static void x_error_quitter P_ ((Display *, XErrorEvent *)); +static void x_error_quitter (Display *, XErrorEvent *); /* This is the first-level handler for X protocol errors. It calls x_error_quitter or x_error_catcher. */ @@ -8167,7 +8167,7 @@ xim_destroy_callback (xim, client_data, call_data) #ifdef HAVE_X11R6 /* This isn't prototyped in OSF 5.0 or 5.1a. */ -extern char *XSetIMValues P_ ((XIM, ...)); +extern char *XSetIMValues (XIM, ...); #endif /* Open the connection to the XIM server on display DPYINFO. @@ -9357,7 +9357,7 @@ x_make_frame_visible (f) /* It could be confusing if a real alarm arrives while processing the fake one. Turn it off and let the handler reset it. */ - extern void poll_for_input_1 P_ ((void)); + extern void poll_for_input_1 (void); int old_poll_suppress_count = poll_suppress_count; poll_suppress_count = 1; poll_for_input_1 (); |