aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan D2010-07-02 14:19:53 +0200
committerJan D2010-07-02 14:19:53 +0200
commitf57e2426f0e8a6b251be71b6f62237fd286998ea (patch)
treea8db36e415ea69b4196881b44122454317510f46 /src
parent383e09700c9b3d175c506301d363be4597827db7 (diff)
downloademacs-f57e2426f0e8a6b251be71b6f62237fd286998ea.tar.gz
emacs-f57e2426f0e8a6b251be71b6f62237fd286998ea.zip
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/ChangeLog70
-rw-r--r--src/alloc.c92
-rw-r--r--src/atimer.c8
-rw-r--r--src/atimer.h7
-rw-r--r--src/buffer.c48
-rw-r--r--src/callint.c2
-rw-r--r--src/category.c2
-rw-r--r--src/charset.c18
-rw-r--r--src/chartab.c8
-rw-r--r--src/cm.c4
-rw-r--r--src/coding.c150
-rw-r--r--src/composite.c16
-rw-r--r--src/data.c6
-rw-r--r--src/dired.c4
-rw-r--r--src/dispnew.c132
-rw-r--r--src/doc.c4
-rw-r--r--src/editfns.c30
-rw-r--r--src/emacs.c10
-rw-r--r--src/eval.c14
-rw-r--r--src/fileio.c10
-rw-r--r--src/filelock.c2
-rw-r--r--src/fns.c50
-rw-r--r--src/font.c64
-rw-r--r--src/fontset.c30
-rw-r--r--src/frame.c6
-rw-r--r--src/ftfont.c56
-rw-r--r--src/ftxfont.c22
-rw-r--r--src/gmalloc.c20
-rw-r--r--src/gtkutil.c14
-rw-r--r--src/image.c202
-rw-r--r--src/indent.c6
-rw-r--r--src/intervals.c8
-rw-r--r--src/keyboard.c82
-rw-r--r--src/keymap.c36
-rw-r--r--src/lisp.h3
-rw-r--r--src/lread.c54
-rw-r--r--src/marker.c2
-rw-r--r--src/menu.c16
-rw-r--r--src/minibuf.c26
-rw-r--r--src/print.c2
-rw-r--r--src/process.c10
-rw-r--r--src/scroll.c16
-rw-r--r--src/search.c24
-rw-r--r--src/sound.c58
-rw-r--r--src/strftime.c20
-rw-r--r--src/syntax.c14
-rw-r--r--src/sysdep.c10
-rw-r--r--src/term.c36
-rw-r--r--src/terminal.c2
-rw-r--r--src/textprop.c2
-rw-r--r--src/unexalpha.c6
-rw-r--r--src/w32console.c4
-rw-r--r--src/w32fns.c56
-rw-r--r--src/w32font.c38
-rw-r--r--src/w32menu.c10
-rw-r--r--src/w32term.c126
-rw-r--r--src/w32uniscribe.c6
-rw-r--r--src/window.c66
-rw-r--r--src/xdisp.c306
-rw-r--r--src/xfaces.c90
-rw-r--r--src/xfns.c68
-rw-r--r--src/xfont.c30
-rw-r--r--src/xftfont.c34
-rw-r--r--src/xmenu.c22
-rw-r--r--src/xselect.c76
-rw-r--r--src/xterm.c186
66 files changed, 1355 insertions, 1297 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c951ed32557..b36953e23f3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,75 @@
12010-07-02 Jan Djärv <jan.h.d@swipnet.se> 12010-07-02 Jan Djärv <jan.h.d@swipnet.se>
2 2
3 * lisp.h:
4 * atimer.h: Remove define for P_.
5
6 * alloc.c: Remove __P and P_ from .c and .m files.
7 * atimer.c:
8 * buffer.c:
9 * callint.c:
10 * category.c:
11 * charset.c:
12 * chartab.c:
13 * cm.c:
14 * coding.c:
15 * composite.c:
16 * data.c:
17 * dired.c:
18 * dispnew.c:
19 * doc.c:
20 * editfns.c:
21 * emacs.c:
22 * eval.c:
23 * fileio.c:
24 * filelock.c:
25 * fns.c:
26 * font.c:
27 * fontset.c:
28 * frame.c:
29 * ftfont.c:
30 * ftxfont.c:
31 * gmalloc.c:
32 * gtkutil.c:
33 * image.c:
34 * indent.c:
35 * intervals.c:
36 * keyboard.c:
37 * keymap.c:
38 * lread.c:
39 * marker.c:
40 * menu.c:
41 * minibuf.c:
42 * print.c:
43 * process.c:
44 * scroll.c:
45 * search.c:
46 * sound.c:
47 * strftime.c:
48 * syntax.c:
49 * sysdep.c:
50 * term.c:
51 * terminal.c:
52 * textprop.c:
53 * unexalpha.c:
54 * w32console.c:
55 * w32fns.c:
56 * w32font.c:
57 * w32menu.c:
58 * w32term.c:
59 * w32uniscribe.c:
60 * window.c:
61 * xdisp.c:
62 * xfaces.c:
63 * xfns.c:
64 * xfont.c:
65 * xftfont.c:
66 * xmenu.c:
67 * xselect.c:
68 * xterm.c: Likewise.
69
3 Remove P_ and __P macros. 70 Remove P_ and __P macros.
4 * buffer.h: Remove P_ and __P macros. 71 * atimer.h: Remove P_ and __P macros.
72 * buffer.h:
5 * category.h: 73 * category.h:
6 * ccl.h: 74 * ccl.h:
7 * character.h: 75 * character.h:
diff --git a/src/alloc.c b/src/alloc.c
index e0f07cc5f5a..84b9007cdd5 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -329,23 +329,23 @@ Lisp_Object Vpost_gc_hook, Qpost_gc_hook;
329Lisp_Object Vgc_elapsed; /* accumulated elapsed time in GC */ 329Lisp_Object Vgc_elapsed; /* accumulated elapsed time in GC */
330EMACS_INT gcs_done; /* accumulated GCs */ 330EMACS_INT gcs_done; /* accumulated GCs */
331 331
332static void mark_buffer P_ ((Lisp_Object)); 332static void mark_buffer (Lisp_Object);
333static void mark_terminals P_ ((void)); 333static void mark_terminals (void);
334extern void mark_kboards P_ ((void)); 334extern void mark_kboards (void);
335extern void mark_ttys P_ ((void)); 335extern void mark_ttys (void);
336extern void mark_backtrace P_ ((void)); 336extern void mark_backtrace (void);
337static void gc_sweep P_ ((void)); 337static void gc_sweep (void);
338static void mark_glyph_matrix P_ ((struct glyph_matrix *)); 338static void mark_glyph_matrix (struct glyph_matrix *);
339static void mark_face_cache P_ ((struct face_cache *)); 339static void mark_face_cache (struct face_cache *);
340 340
341#ifdef HAVE_WINDOW_SYSTEM 341#ifdef HAVE_WINDOW_SYSTEM
342extern void mark_fringe_data P_ ((void)); 342extern void mark_fringe_data (void);
343#endif /* HAVE_WINDOW_SYSTEM */ 343#endif /* HAVE_WINDOW_SYSTEM */
344 344
345static struct Lisp_String *allocate_string P_ ((void)); 345static struct Lisp_String *allocate_string (void);
346static void compact_small_strings P_ ((void)); 346static void compact_small_strings (void);
347static void free_large_strings P_ ((void)); 347static void free_large_strings (void);
348static void sweep_strings P_ ((void)); 348static void sweep_strings (void);
349 349
350extern int message_enable_multibyte; 350extern int message_enable_multibyte;
351 351
@@ -369,8 +369,8 @@ enum mem_type
369 MEM_TYPE_VECTORLIKE 369 MEM_TYPE_VECTORLIKE
370}; 370};
371 371
372static POINTER_TYPE *lisp_align_malloc P_ ((size_t, enum mem_type)); 372static POINTER_TYPE *lisp_align_malloc (size_t, enum mem_type);
373static POINTER_TYPE *lisp_malloc P_ ((size_t, enum mem_type)); 373static POINTER_TYPE *lisp_malloc (size_t, enum mem_type);
374void refill_memory_reserve (); 374void refill_memory_reserve ();
375 375
376 376
@@ -452,31 +452,31 @@ static void *min_heap_address, *max_heap_address;
452static struct mem_node mem_z; 452static struct mem_node mem_z;
453#define MEM_NIL &mem_z 453#define MEM_NIL &mem_z
454 454
455static POINTER_TYPE *lisp_malloc P_ ((size_t, enum mem_type)); 455static POINTER_TYPE *lisp_malloc (size_t, enum mem_type);
456static struct Lisp_Vector *allocate_vectorlike P_ ((EMACS_INT)); 456static struct Lisp_Vector *allocate_vectorlike (EMACS_INT);
457static void lisp_free P_ ((POINTER_TYPE *)); 457static void lisp_free (POINTER_TYPE *);
458static void mark_stack P_ ((void)); 458static void mark_stack (void);
459static int live_vector_p P_ ((struct mem_node *, void *)); 459static int live_vector_p (struct mem_node *, void *);
460static int live_buffer_p P_ ((struct mem_node *, void *)); 460static int live_buffer_p (struct mem_node *, void *);
461static int live_string_p P_ ((struct mem_node *, void *)); 461static int live_string_p (struct mem_node *, void *);
462static int live_cons_p P_ ((struct mem_node *, void *)); 462static int live_cons_p (struct mem_node *, void *);
463static int live_symbol_p P_ ((struct mem_node *, void *)); 463static int live_symbol_p (struct mem_node *, void *);
464static int live_float_p P_ ((struct mem_node *, void *)); 464static int live_float_p (struct mem_node *, void *);
465static int live_misc_p P_ ((struct mem_node *, void *)); 465static int live_misc_p (struct mem_node *, void *);
466static void mark_maybe_object P_ ((Lisp_Object)); 466static void mark_maybe_object (Lisp_Object);
467static void mark_memory P_ ((void *, void *, int)); 467static void mark_memory (void *, void *, int);
468static void mem_init P_ ((void)); 468static void mem_init (void);
469static struct mem_node *mem_insert P_ ((void *, void *, enum mem_type)); 469static struct mem_node *mem_insert (void *, void *, enum mem_type);
470static void mem_insert_fixup P_ ((struct mem_node *)); 470static void mem_insert_fixup (struct mem_node *);
471static void mem_rotate_left P_ ((struct mem_node *)); 471static void mem_rotate_left (struct mem_node *);
472static void mem_rotate_right P_ ((struct mem_node *)); 472static void mem_rotate_right (struct mem_node *);
473static void mem_delete P_ ((struct mem_node *)); 473static void mem_delete (struct mem_node *);
474static void mem_delete_fixup P_ ((struct mem_node *)); 474static void mem_delete_fixup (struct mem_node *);
475static INLINE struct mem_node *mem_find P_ ((void *)); 475static INLINE struct mem_node *mem_find (void *);
476 476
477 477
478#if GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS 478#if GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS
479static void check_gcpros P_ ((void)); 479static void check_gcpros (void);
480#endif 480#endif
481 481
482#endif /* GC_MARK_STACK || GC_MALLOC_CHECK */ 482#endif /* GC_MARK_STACK || GC_MALLOC_CHECK */
@@ -495,7 +495,7 @@ static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag};
495 495
496static int staticidx = 0; 496static int staticidx = 0;
497 497
498static POINTER_TYPE *pure_alloc P_ ((size_t, int)); 498static POINTER_TYPE *pure_alloc (size_t, int);
499 499
500 500
501/* Value is SZ rounded up to the next multiple of ALIGNMENT. 501/* Value is SZ rounded up to the next multiple of ALIGNMENT.
@@ -1164,14 +1164,14 @@ allocate_buffer ()
1164 there's no need to block input around malloc. */ 1164 there's no need to block input around malloc. */
1165 1165
1166#ifndef DOUG_LEA_MALLOC 1166#ifndef DOUG_LEA_MALLOC
1167extern void * (*__malloc_hook) P_ ((size_t, const void *)); 1167extern void * (*__malloc_hook) (size_t, const void *);
1168extern void * (*__realloc_hook) P_ ((void *, size_t, const void *)); 1168extern void * (*__realloc_hook) (void *, size_t, const void *);
1169extern void (*__free_hook) P_ ((void *, const void *)); 1169extern void (*__free_hook) (void *, const void *);
1170/* Else declared in malloc.h, perhaps with an extra arg. */ 1170/* Else declared in malloc.h, perhaps with an extra arg. */
1171#endif /* DOUG_LEA_MALLOC */ 1171#endif /* DOUG_LEA_MALLOC */
1172static void * (*old_malloc_hook) P_ ((size_t, const void *)); 1172static void * (*old_malloc_hook) (size_t, const void *);
1173static void * (*old_realloc_hook) P_ ((void *, size_t, const void*)); 1173static void * (*old_realloc_hook) (void *, size_t, const void*);
1174static void (*old_free_hook) P_ ((void*, const void*)); 1174static void (*old_free_hook) (void*, const void*);
1175 1175
1176/* This function is used as the hook for free to call. */ 1176/* This function is used as the hook for free to call. */
1177 1177
@@ -1767,8 +1767,8 @@ init_strings ()
1767 1767
1768static int check_string_bytes_count; 1768static int check_string_bytes_count;
1769 1769
1770static void check_string_bytes P_ ((int)); 1770static void check_string_bytes (int);
1771static void check_sblock P_ ((struct sblock *)); 1771static void check_sblock (struct sblock *);
1772 1772
1773#define CHECK_STRING_BYTES(S) STRING_BYTES (S) 1773#define CHECK_STRING_BYTES(S) STRING_BYTES (S)
1774 1774
diff --git a/src/atimer.c b/src/atimer.c
index 556272d7918..3ef51522c31 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -64,10 +64,10 @@ int pending_atimers;
64 64
65/* Function prototypes. */ 65/* Function prototypes. */
66 66
67static void set_alarm P_ ((void)); 67static void set_alarm (void);
68static void schedule_atimer P_ ((struct atimer *)); 68static void schedule_atimer (struct atimer *);
69static struct atimer *append_atimer_lists P_ ((struct atimer *, 69static struct atimer *append_atimer_lists (struct atimer *,
70 struct atimer *)); 70 struct atimer *);
71SIGTYPE alarm_signal_handler (); 71SIGTYPE alarm_signal_handler ();
72 72
73 73
diff --git a/src/atimer.h b/src/atimer.h
index e0f81a51d9a..c2245d30e6b 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/>. */
20#ifndef EMACS_ATIMER_H 20#ifndef EMACS_ATIMER_H
21#define EMACS_ATIMER_H 21#define EMACS_ATIMER_H
22 22
23/* Declare the prototype for a general external function. */
24#if defined (PROTOTYPES) || defined (WINDOWSNT)
25#define P_(proto) proto
26#else
27#define P_(proto) ()
28#endif
29
30#include "systime.h" /* for EMACS_TIME */ 23#include "systime.h" /* for EMACS_TIME */
31 24
32/* Forward declaration. */ 25/* Forward declaration. */
diff --git a/src/buffer.c b/src/buffer.c
index 589266f40e5..0dfad93b3e7 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -106,13 +106,13 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS];
106int last_per_buffer_idx; 106int last_per_buffer_idx;
107 107
108EXFUN (Fset_buffer, 1); 108EXFUN (Fset_buffer, 1);
109void set_buffer_internal P_ ((struct buffer *b)); 109void set_buffer_internal (struct buffer *b);
110void set_buffer_internal_1 P_ ((struct buffer *b)); 110void set_buffer_internal_1 (struct buffer *b);
111static void call_overlay_mod_hooks P_ ((Lisp_Object list, Lisp_Object overlay, 111static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,
112 int after, Lisp_Object arg1, 112 int after, Lisp_Object arg1,
113 Lisp_Object arg2, Lisp_Object arg3)); 113 Lisp_Object arg2, Lisp_Object arg3);
114static void swap_out_buffer_local_variables P_ ((struct buffer *b)); 114static void swap_out_buffer_local_variables (struct buffer *b);
115static void reset_buffer_local_variables P_ ((struct buffer *b, int permanent_too)); 115static void reset_buffer_local_variables (struct buffer *b, int permanent_too);
116 116
117/* Alist of all buffer names vs the buffers. */ 117/* Alist of all buffer names vs the buffers. */
118/* This used to be a variable, but is no longer, 118/* This used to be a variable, but is no longer,
@@ -168,13 +168,13 @@ Lisp_Object Qmodification_hooks;
168Lisp_Object Qinsert_in_front_hooks; 168Lisp_Object Qinsert_in_front_hooks;
169Lisp_Object Qinsert_behind_hooks; 169Lisp_Object Qinsert_behind_hooks;
170 170
171static void alloc_buffer_text P_ ((struct buffer *, size_t)); 171static void alloc_buffer_text (struct buffer *, size_t);
172static void free_buffer_text P_ ((struct buffer *b)); 172static void free_buffer_text (struct buffer *b);
173static struct Lisp_Overlay * copy_overlays P_ ((struct buffer *, struct Lisp_Overlay *)); 173static struct Lisp_Overlay * copy_overlays (struct buffer *, struct Lisp_Overlay *);
174static void modify_overlay P_ ((struct buffer *, EMACS_INT, EMACS_INT)); 174static void modify_overlay (struct buffer *, EMACS_INT, EMACS_INT);
175static Lisp_Object buffer_lisp_local_variables P_ ((struct buffer *)); 175static Lisp_Object buffer_lisp_local_variables (struct buffer *);
176 176
177extern char * emacs_strerror P_ ((int)); 177extern char * emacs_strerror (int);
178 178
179/* For debugging; temporary. See set_buffer_internal. */ 179/* For debugging; temporary. See set_buffer_internal. */
180/* Lisp_Object Qlisp_mode, Vcheck_symbol; */ 180/* Lisp_Object Qlisp_mode, Vcheck_symbol; */
@@ -2175,7 +2175,7 @@ advance_to_char_boundary (byte_pos)
2175} 2175}
2176 2176
2177#ifdef REL_ALLOC 2177#ifdef REL_ALLOC
2178extern void r_alloc_reset_variable P_ ((POINTER_TYPE *, POINTER_TYPE *)); 2178extern void r_alloc_reset_variable (POINTER_TYPE *, POINTER_TYPE *);
2179#endif /* REL_ALLOC */ 2179#endif /* REL_ALLOC */
2180 2180
2181DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, 2181DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text,
@@ -4693,13 +4693,13 @@ static int mmap_initialized_p;
4693 4693
4694/* Function prototypes. */ 4694/* Function prototypes. */
4695 4695
4696static int mmap_free_1 P_ ((struct mmap_region *)); 4696static int mmap_free_1 (struct mmap_region *);
4697static int mmap_enlarge P_ ((struct mmap_region *, int)); 4697static int mmap_enlarge (struct mmap_region *, int);
4698static struct mmap_region *mmap_find P_ ((POINTER_TYPE *, POINTER_TYPE *)); 4698static struct mmap_region *mmap_find (POINTER_TYPE *, POINTER_TYPE *);
4699static POINTER_TYPE *mmap_alloc P_ ((POINTER_TYPE **, size_t)); 4699static POINTER_TYPE *mmap_alloc (POINTER_TYPE **, size_t);
4700static POINTER_TYPE *mmap_realloc P_ ((POINTER_TYPE **, size_t)); 4700static POINTER_TYPE *mmap_realloc (POINTER_TYPE **, size_t);
4701static void mmap_free P_ ((POINTER_TYPE **ptr)); 4701static void mmap_free (POINTER_TYPE **ptr);
4702static void mmap_init P_ ((void)); 4702static void mmap_init (void);
4703 4703
4704 4704
4705/* Return a region overlapping address range START...END, or null if 4705/* Return a region overlapping address range START...END, or null if
@@ -5032,9 +5032,9 @@ mmap_init ()
5032 ***********************************************************************/ 5032 ***********************************************************************/
5033 5033
5034#ifdef REL_ALLOC 5034#ifdef REL_ALLOC
5035extern POINTER_TYPE *r_alloc P_ ((POINTER_TYPE **, size_t)); 5035extern POINTER_TYPE *r_alloc (POINTER_TYPE **, size_t);
5036extern POINTER_TYPE *r_re_alloc P_ ((POINTER_TYPE **, size_t)); 5036extern POINTER_TYPE *r_re_alloc (POINTER_TYPE **, size_t);
5037extern void r_alloc_free P_ ((POINTER_TYPE **ptr)); 5037extern void r_alloc_free (POINTER_TYPE **ptr);
5038#endif /* REL_ALLOC */ 5038#endif /* REL_ALLOC */
5039 5039
5040 5040
diff --git a/src/callint.c b/src/callint.c
index a45f8a372b8..45e5bd9ed9b 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/>. */
30#include "keymap.h" 30#include "keymap.h"
31 31
32#ifdef HAVE_INDEX 32#ifdef HAVE_INDEX
33extern char *index P_ ((const char *, int)); 33extern char *index (const char *, int);
34#endif 34#endif
35 35
36extern Lisp_Object Qcursor_in_echo_area; 36extern Lisp_Object Qcursor_in_echo_area;
diff --git a/src/category.c b/src/category.c
index b56d62b6b80..610df686dab 100644
--- a/src/category.c
+++ b/src/category.c
@@ -59,7 +59,7 @@ Lisp_Object _temp_category_set;
59 59
60/* Category set staff. */ 60/* Category set staff. */
61 61
62static Lisp_Object hash_get_category_set P_ ((Lisp_Object, Lisp_Object)); 62static Lisp_Object hash_get_category_set (Lisp_Object, Lisp_Object);
63 63
64static Lisp_Object 64static Lisp_Object
65hash_get_category_set (table, category_set) 65hash_get_category_set (table, category_set)
diff --git a/src/charset.c b/src/charset.c
index f83fa994536..787d000d99a 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -129,10 +129,10 @@ Lisp_Object Vcurrent_iso639_language;
129 129
130/* Defined in chartab.c */ 130/* Defined in chartab.c */
131extern void 131extern void
132map_char_table_for_charset P_ ((void (*c_function) (Lisp_Object, Lisp_Object), 132map_char_table_for_charset (void (*c_function) (Lisp_Object, Lisp_Object),
133 Lisp_Object function, Lisp_Object table, 133 Lisp_Object function, Lisp_Object table,
134 Lisp_Object arg, struct charset *charset, 134 Lisp_Object arg, struct charset *charset,
135 unsigned from, unsigned to)); 135 unsigned from, unsigned to);
136 136
137#define CODE_POINT_TO_INDEX(charset, code) \ 137#define CODE_POINT_TO_INDEX(charset, code) \
138 ((charset)->code_linear_p \ 138 ((charset)->code_linear_p \
@@ -497,7 +497,7 @@ extern Lisp_Object Qfile_name_handler_alist;
497 Note that this function uses `openp' to open MAPFILE but ignores 497 Note that this function uses `openp' to open MAPFILE but ignores
498 `file-name-handler-alist' to avoid running any Lisp code. */ 498 `file-name-handler-alist' to avoid running any Lisp code. */
499 499
500extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object)); 500extern void add_to_log (char *, Lisp_Object, Lisp_Object);
501 501
502static void 502static void
503load_charset_map_from_file (charset, mapfile, control_flag) 503load_charset_map_from_file (charset, mapfile, control_flag)
@@ -684,9 +684,9 @@ DEFUN ("charsetp", Fcharsetp, Scharsetp, 1, 1, 0,
684} 684}
685 685
686 686
687void map_charset_for_dump P_ ((void (*c_function) (Lisp_Object, Lisp_Object), 687void map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object),
688 Lisp_Object function, Lisp_Object arg, 688 Lisp_Object function, Lisp_Object arg,
689 unsigned from, unsigned to)); 689 unsigned from, unsigned to);
690 690
691void 691void
692map_charset_for_dump (c_function, function, arg, from, to) 692map_charset_for_dump (c_function, function, arg, from, to)
@@ -750,7 +750,7 @@ map_charset_for_dump (c_function, function, arg, from, to)
750void 750void
751map_charset_chars (c_function, function, arg, 751map_charset_chars (c_function, function, arg,
752 charset, from, to) 752 charset, from, to)
753 void (*c_function) P_ ((Lisp_Object, Lisp_Object)); 753 void (*c_function) (Lisp_Object, Lisp_Object);
754 Lisp_Object function, arg; 754 Lisp_Object function, arg;
755 struct charset *charset; 755 struct charset *charset;
756 unsigned from, to; 756 unsigned from, to;
diff --git a/src/chartab.c b/src/chartab.c
index 2b547184b21..90ec660d671 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -725,7 +725,7 @@ equivalent and can be merged. It defaults to `equal'. */)
725static Lisp_Object 725static Lisp_Object
726map_sub_char_table (c_function, function, table, arg, val, range, 726map_sub_char_table (c_function, function, table, arg, val, range,
727 default_val, parent) 727 default_val, parent)
728 void (*c_function) P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); 728 void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object);
729 Lisp_Object function, table, arg, val, range, default_val, parent; 729 Lisp_Object function, table, arg, val, range, default_val, parent;
730{ 730{
731 /* Pointer to the elements of TABLE. */ 731 /* Pointer to the elements of TABLE. */
@@ -841,7 +841,7 @@ map_sub_char_table (c_function, function, table, arg, val, range,
841 841
842void 842void
843map_char_table (c_function, function, table, arg) 843map_char_table (c_function, function, table, arg)
844 void (*c_function) P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); 844 void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object);
845 Lisp_Object function, table, arg; 845 Lisp_Object function, table, arg;
846{ 846{
847 Lisp_Object range, val; 847 Lisp_Object range, val;
@@ -915,7 +915,7 @@ range of characters that have the same value. */)
915static void 915static void
916map_sub_char_table_for_charset (c_function, function, table, arg, range, 916map_sub_char_table_for_charset (c_function, function, table, arg, range,
917 charset, from, to) 917 charset, from, to)
918 void (*c_function) P_ ((Lisp_Object, Lisp_Object)); 918 void (*c_function) (Lisp_Object, Lisp_Object);
919 Lisp_Object function, table, arg, range; 919 Lisp_Object function, table, arg, range;
920 struct charset *charset; 920 struct charset *charset;
921 unsigned from, to; 921 unsigned from, to;
@@ -1002,7 +1002,7 @@ map_sub_char_table_for_charset (c_function, function, table, arg, range,
1002void 1002void
1003map_char_table_for_charset (c_function, function, table, arg, 1003map_char_table_for_charset (c_function, function, table, arg,
1004 charset, from, to) 1004 charset, from, to)
1005 void (*c_function) P_ ((Lisp_Object, Lisp_Object)); 1005 void (*c_function) (Lisp_Object, Lisp_Object);
1006 Lisp_Object function, table, arg; 1006 Lisp_Object function, table, arg;
1007 struct charset *charset; 1007 struct charset *charset;
1008 unsigned from, to; 1008 unsigned from, to;
diff --git a/src/cm.c b/src/cm.c
index 73d3791074e..45d6417f61f 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -33,8 +33,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
33/* For now, don't try to include termcap.h. On some systems, 33/* For now, don't try to include termcap.h. On some systems,
34 configure finds a non-standard termcap.h that the main build 34 configure finds a non-standard termcap.h that the main build
35 won't find. */ 35 won't find. */
36extern void tputs P_ ((const char *, int, int (*)(int))); 36extern void tputs (const char *, int, int (*)(int));
37extern char *tgoto P_ ((const char *, int, int)); 37extern char *tgoto (const char *, int, int);
38 38
39#define BIG 9999 /* 9999 good on VAXen. For 16 bit machines 39#define BIG 9999 /* 9999 good on VAXen. For 16 bit machines
40 use about 2000.... */ 40 use about 2000.... */
diff --git a/src/coding.c b/src/coding.c
index 6435fa1ddb1..1730468ade9 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -896,80 +896,80 @@ static struct coding_system coding_categories[coding_category_max];
896 896
897 897
898/* Prototypes for static functions. */ 898/* Prototypes for static functions. */
899static void record_conversion_result P_ ((struct coding_system *coding, 899static void record_conversion_result (struct coding_system *coding,
900 enum coding_result_code result)); 900 enum coding_result_code result);
901static int detect_coding_utf_8 P_ ((struct coding_system *, 901static int detect_coding_utf_8 (struct coding_system *,
902 struct coding_detection_info *info)); 902 struct coding_detection_info *info);
903static void decode_coding_utf_8 P_ ((struct coding_system *)); 903static void decode_coding_utf_8 (struct coding_system *);
904static int encode_coding_utf_8 P_ ((struct coding_system *)); 904static int encode_coding_utf_8 (struct coding_system *);
905 905
906static int detect_coding_utf_16 P_ ((struct coding_system *, 906static int detect_coding_utf_16 (struct coding_system *,
907 struct coding_detection_info *info)); 907 struct coding_detection_info *info);
908static void decode_coding_utf_16 P_ ((struct coding_system *)); 908static void decode_coding_utf_16 (struct coding_system *);
909static int encode_coding_utf_16 P_ ((struct coding_system *)); 909static int encode_coding_utf_16 (struct coding_system *);
910 910
911static int detect_coding_iso_2022 P_ ((struct coding_system *, 911static int detect_coding_iso_2022 (struct coding_system *,
912 struct coding_detection_info *info)); 912 struct coding_detection_info *info);
913static void decode_coding_iso_2022 P_ ((struct coding_system *)); 913static void decode_coding_iso_2022 (struct coding_system *);
914static int encode_coding_iso_2022 P_ ((struct coding_system *)); 914static int encode_coding_iso_2022 (struct coding_system *);
915 915
916static int detect_coding_emacs_mule P_ ((struct coding_system *, 916static int detect_coding_emacs_mule (struct coding_system *,
917 struct coding_detection_info *info)); 917 struct coding_detection_info *info);
918static void decode_coding_emacs_mule P_ ((struct coding_system *)); 918static void decode_coding_emacs_mule (struct coding_system *);
919static int encode_coding_emacs_mule P_ ((struct coding_system *)); 919static int encode_coding_emacs_mule (struct coding_system *);
920 920
921static int detect_coding_sjis P_ ((struct coding_system *, 921static int detect_coding_sjis (struct coding_system *,
922 struct coding_detection_info *info)); 922 struct coding_detection_info *info);
923static void decode_coding_sjis P_ ((struct coding_system *)); 923static void decode_coding_sjis (struct coding_system *);
924static int encode_coding_sjis P_ ((struct coding_system *)); 924static int encode_coding_sjis (struct coding_system *);
925 925
926static int detect_coding_big5 P_ ((struct coding_system *, 926static int detect_coding_big5 (struct coding_system *,
927 struct coding_detection_info *info)); 927 struct coding_detection_info *info);
928static void decode_coding_big5 P_ ((struct coding_system *)); 928static void decode_coding_big5 (struct coding_system *);
929static int encode_coding_big5 P_ ((struct coding_system *)); 929static int encode_coding_big5 (struct coding_system *);
930 930
931static int detect_coding_ccl P_ ((struct coding_system *, 931static int detect_coding_ccl (struct coding_system *,
932 struct coding_detection_info *info)); 932 struct coding_detection_info *info);
933static void decode_coding_ccl P_ ((struct coding_system *)); 933static void decode_coding_ccl (struct coding_system *);
934static int encode_coding_ccl P_ ((struct coding_system *)); 934static int encode_coding_ccl (struct coding_system *);
935 935
936static void decode_coding_raw_text P_ ((struct coding_system *)); 936static void decode_coding_raw_text (struct coding_system *);
937static int encode_coding_raw_text P_ ((struct coding_system *)); 937static int encode_coding_raw_text (struct coding_system *);
938 938
939static void coding_set_source P_ ((struct coding_system *)); 939static void coding_set_source (struct coding_system *);
940static void coding_set_destination P_ ((struct coding_system *)); 940static void coding_set_destination (struct coding_system *);
941static void coding_alloc_by_realloc P_ ((struct coding_system *, EMACS_INT)); 941static void coding_alloc_by_realloc (struct coding_system *, EMACS_INT);
942static void coding_alloc_by_making_gap P_ ((struct coding_system *, 942static void coding_alloc_by_making_gap (struct coding_system *,
943 EMACS_INT, EMACS_INT)); 943 EMACS_INT, EMACS_INT);
944static unsigned char *alloc_destination P_ ((struct coding_system *, 944static unsigned char *alloc_destination (struct coding_system *,
945 EMACS_INT, unsigned char *)); 945 EMACS_INT, unsigned char *);
946static void setup_iso_safe_charsets P_ ((Lisp_Object)); 946static void setup_iso_safe_charsets (Lisp_Object);
947static unsigned char *encode_designation_at_bol P_ ((struct coding_system *, 947static unsigned char *encode_designation_at_bol (struct coding_system *,
948 int *, int *, 948 int *, int *,
949 unsigned char *)); 949 unsigned char *);
950static int detect_eol P_ ((const unsigned char *, 950static int detect_eol (const unsigned char *,
951 EMACS_INT, enum coding_category)); 951 EMACS_INT, enum coding_category);
952static Lisp_Object adjust_coding_eol_type P_ ((struct coding_system *, int)); 952static Lisp_Object adjust_coding_eol_type (struct coding_system *, int);
953static void decode_eol P_ ((struct coding_system *)); 953static void decode_eol (struct coding_system *);
954static Lisp_Object get_translation_table P_ ((Lisp_Object, int, int *)); 954static Lisp_Object get_translation_table (Lisp_Object, int, int *);
955static Lisp_Object get_translation P_ ((Lisp_Object, int *, int *)); 955static Lisp_Object get_translation (Lisp_Object, int *, int *);
956static int produce_chars P_ ((struct coding_system *, Lisp_Object, int)); 956static int produce_chars (struct coding_system *, Lisp_Object, int);
957static INLINE void produce_charset P_ ((struct coding_system *, int *, 957static INLINE void produce_charset (struct coding_system *, int *,
958 EMACS_INT)); 958 EMACS_INT);
959static void produce_annotation P_ ((struct coding_system *, EMACS_INT)); 959static void produce_annotation (struct coding_system *, EMACS_INT);
960static int decode_coding P_ ((struct coding_system *)); 960static int decode_coding (struct coding_system *);
961static INLINE int *handle_composition_annotation P_ ((EMACS_INT, EMACS_INT, 961static INLINE int *handle_composition_annotation (EMACS_INT, EMACS_INT,
962 struct coding_system *, 962 struct coding_system *,
963 int *, EMACS_INT *)); 963 int *, EMACS_INT *);
964static INLINE int *handle_charset_annotation P_ ((EMACS_INT, EMACS_INT, 964static INLINE int *handle_charset_annotation (EMACS_INT, EMACS_INT,
965 struct coding_system *, 965 struct coding_system *,
966 int *, EMACS_INT *)); 966 int *, EMACS_INT *);
967static void consume_chars P_ ((struct coding_system *, Lisp_Object, int)); 967static void consume_chars (struct coding_system *, Lisp_Object, int);
968static int encode_coding P_ ((struct coding_system *)); 968static int encode_coding (struct coding_system *);
969static Lisp_Object make_conversion_work_buffer P_ ((int)); 969static Lisp_Object make_conversion_work_buffer (int);
970static Lisp_Object code_conversion_restore P_ ((Lisp_Object)); 970static Lisp_Object code_conversion_restore (Lisp_Object);
971static INLINE int char_encodable_p P_ ((int, Lisp_Object)); 971static INLINE int char_encodable_p (int, Lisp_Object);
972static Lisp_Object make_subsidiaries P_ ((Lisp_Object)); 972static Lisp_Object make_subsidiaries (Lisp_Object);
973 973
974static void 974static void
975record_conversion_result (struct coding_system *coding, 975record_conversion_result (struct coding_system *coding,
@@ -3442,7 +3442,7 @@ detect_coding_iso_2022 (coding, detect_info)
3442 3442
3443/* Finish the current composition as invalid. */ 3443/* Finish the current composition as invalid. */
3444 3444
3445static int finish_composition P_ ((int *, struct composition_status *)); 3445static int finish_composition (int *, struct composition_status *);
3446 3446
3447static int 3447static int
3448finish_composition (charbuf, cmp_status) 3448finish_composition (charbuf, cmp_status)
diff --git a/src/composite.c b/src/composite.c
index cab57e824a9..6b2fe6a6522 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -651,9 +651,9 @@ compose_text (start, end, components, modification_func, string)
651} 651}
652 652
653 653
654static Lisp_Object autocmp_chars P_ ((Lisp_Object, EMACS_INT, EMACS_INT, 654static Lisp_Object autocmp_chars (Lisp_Object, EMACS_INT, EMACS_INT,
655 EMACS_INT, struct window *, 655 EMACS_INT, struct window *,
656 struct face *, Lisp_Object)); 656 struct face *, Lisp_Object);
657 657
658 658
659/* Lisp glyph-string handlers */ 659/* Lisp glyph-string handlers */
@@ -664,7 +664,7 @@ static Lisp_Object autocmp_chars P_ ((Lisp_Object, EMACS_INT, EMACS_INT,
664 664
665static Lisp_Object gstring_hash_table; 665static Lisp_Object gstring_hash_table;
666 666
667static Lisp_Object gstring_lookup_cache P_ ((Lisp_Object)); 667static Lisp_Object gstring_lookup_cache (Lisp_Object);
668 668
669static Lisp_Object 669static Lisp_Object
670gstring_lookup_cache (header) 670gstring_lookup_cache (header)
@@ -715,9 +715,9 @@ composition_gstring_from_id (id)
715 return HASH_VALUE (h, id); 715 return HASH_VALUE (h, id);
716} 716}
717 717
718static Lisp_Object fill_gstring_header P_ ((Lisp_Object, Lisp_Object, 718static Lisp_Object fill_gstring_header (Lisp_Object, Lisp_Object,
719 Lisp_Object, Lisp_Object, 719 Lisp_Object, Lisp_Object,
720 Lisp_Object)); 720 Lisp_Object);
721 721
722int 722int
723composition_gstring_p (gstring) 723composition_gstring_p (gstring)
@@ -869,7 +869,7 @@ fill_gstring_header (header, start, end, font_object, string)
869 return header; 869 return header;
870} 870}
871 871
872extern void font_fill_lglyph_metrics P_ ((Lisp_Object, Lisp_Object)); 872extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object);
873 873
874static void 874static void
875fill_gstring_body (gstring) 875fill_gstring_body (gstring)
diff --git a/src/data.c b/src/data.c
index 93cc57e9f2c..d44176d9b01 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. */)
2057/* This code is disabled now that we use the selected frame to return 2057/* This code is disabled now that we use the selected frame to return
2058 keyboard-local-values. */ 2058 keyboard-local-values. */
2059#if 0 2059#if 0
2060extern struct terminal *get_terminal P_ ((Lisp_Object display, int)); 2060extern struct terminal *get_terminal (Lisp_Object display, int);
2061 2061
2062DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, 2, 0, 2062DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, 2, 0,
2063 doc: /* Return the terminal-local value of SYMBOL on TERMINAL. 2063 doc: /* Return the terminal-local value of SYMBOL on TERMINAL.
@@ -2605,8 +2605,8 @@ enum arithop
2605 Amin 2605 Amin
2606 }; 2606 };
2607 2607
2608static Lisp_Object float_arith_driver P_ ((double, int, enum arithop, 2608static Lisp_Object float_arith_driver (double, int, enum arithop,
2609 int, Lisp_Object *)); 2609 int, Lisp_Object *);
2610extern Lisp_Object fmod_float (); 2610extern Lisp_Object fmod_float ();
2611 2611
2612Lisp_Object 2612Lisp_Object
diff --git a/src/dired.c b/src/dired.c
index c7f4774b991..c2090aeda0c 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -93,7 +93,7 @@ extern struct direct *readdir ();
93extern struct re_pattern_buffer *compile_pattern (); 93extern struct re_pattern_buffer *compile_pattern ();
94 94
95/* From filemode.c. Can't go in Lisp.h because of `stat'. */ 95/* From filemode.c. Can't go in Lisp.h because of `stat'. */
96extern void filemodestring P_ ((struct stat *, char *)); 96extern void filemodestring (struct stat *, char *);
97 97
98/* if system does not have symbolic links, it does not have lstat. 98/* if system does not have symbolic links, it does not have lstat.
99 In that case, use ordinary stat instead. */ 99 In that case, use ordinary stat instead. */
@@ -115,7 +115,7 @@ Lisp_Object Qfile_name_all_completions;
115Lisp_Object Qfile_attributes; 115Lisp_Object Qfile_attributes;
116Lisp_Object Qfile_attributes_lessp; 116Lisp_Object Qfile_attributes_lessp;
117 117
118static int scmp P_ ((unsigned char *, unsigned char *, int)); 118static int scmp (unsigned char *, unsigned char *, int);
119 119
120#ifdef WINDOWSNT 120#ifdef WINDOWSNT
121Lisp_Object 121Lisp_Object
diff --git a/src/dispnew.c b/src/dispnew.c
index a8ba1995435..74c41dfcd44 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -114,73 +114,73 @@ struct dim
114 114
115/* Function prototypes. */ 115/* Function prototypes. */
116 116
117static struct glyph_matrix *save_current_matrix P_ ((struct frame *)); 117static struct glyph_matrix *save_current_matrix (struct frame *);
118static void restore_current_matrix P_ ((struct frame *, struct glyph_matrix *)); 118static void restore_current_matrix (struct frame *, struct glyph_matrix *);
119static int showing_window_margins_p P_ ((struct window *)); 119static int showing_window_margins_p (struct window *);
120static void fake_current_matrices P_ ((Lisp_Object)); 120static void fake_current_matrices (Lisp_Object);
121static void redraw_overlapping_rows P_ ((struct window *, int)); 121static void redraw_overlapping_rows (struct window *, int);
122static void redraw_overlapped_rows P_ ((struct window *, int)); 122static void redraw_overlapped_rows (struct window *, int);
123static int count_blanks P_ ((struct glyph *, int)); 123static int count_blanks (struct glyph *, int);
124static int count_match P_ ((struct glyph *, struct glyph *, 124static int count_match (struct glyph *, struct glyph *,
125 struct glyph *, struct glyph *)); 125 struct glyph *, struct glyph *);
126static unsigned line_draw_cost P_ ((struct glyph_matrix *, int)); 126static unsigned line_draw_cost (struct glyph_matrix *, int);
127static void update_frame_line P_ ((struct frame *, int)); 127static void update_frame_line (struct frame *, int);
128static struct dim allocate_matrices_for_frame_redisplay 128static struct dim allocate_matrices_for_frame_redisplay
129 P_ ((Lisp_Object, int, int, int, int *)); 129 (Lisp_Object, int, int, int, int *);
130static void allocate_matrices_for_window_redisplay P_ ((struct window *)); 130static void allocate_matrices_for_window_redisplay (struct window *);
131static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim)); 131static int realloc_glyph_pool (struct glyph_pool *, struct dim);
132static void adjust_frame_glyphs P_ ((struct frame *)); 132static void adjust_frame_glyphs (struct frame *);
133struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *)); 133struct glyph_matrix *new_glyph_matrix (struct glyph_pool *);
134static void free_glyph_matrix P_ ((struct glyph_matrix *)); 134static void free_glyph_matrix (struct glyph_matrix *);
135static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *, 135static void adjust_glyph_matrix (struct window *, struct glyph_matrix *,
136 int, int, struct dim)); 136 int, int, struct dim);
137static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); 137static void change_frame_size_1 (struct frame *, int, int, int, int, int);
138static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *)); 138static void swap_glyph_pointers (struct glyph_row *, struct glyph_row *);
139#if GLYPH_DEBUG 139#if GLYPH_DEBUG
140static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *)); 140static int glyph_row_slice_p (struct glyph_row *, struct glyph_row *);
141#endif 141#endif
142static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); 142static void fill_up_frame_row_with_spaces (struct glyph_row *, int);
143static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *, 143static void build_frame_matrix_from_window_tree (struct glyph_matrix *,
144 struct window *)); 144 struct window *);
145static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *, 145static void build_frame_matrix_from_leaf_window (struct glyph_matrix *,
146 struct window *)); 146 struct window *);
147static struct glyph_pool *new_glyph_pool P_ ((void)); 147static struct glyph_pool *new_glyph_pool (void);
148static void free_glyph_pool P_ ((struct glyph_pool *)); 148static void free_glyph_pool (struct glyph_pool *);
149static void adjust_frame_glyphs_initially P_ ((void)); 149static void adjust_frame_glyphs_initially (void);
150static void adjust_frame_message_buffer P_ ((struct frame *)); 150static void adjust_frame_message_buffer (struct frame *);
151static void adjust_decode_mode_spec_buffer P_ ((struct frame *)); 151static void adjust_decode_mode_spec_buffer (struct frame *);
152static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *)); 152static void fill_up_glyph_row_with_spaces (struct glyph_row *);
153static void build_frame_matrix P_ ((struct frame *)); 153static void build_frame_matrix (struct frame *);
154void clear_current_matrices P_ ((struct frame *)); 154void clear_current_matrices (struct frame *);
155void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int, 155void scroll_glyph_matrix_range (struct glyph_matrix *, int, int,
156 int, int)); 156 int, int);
157static void clear_window_matrices P_ ((struct window *, int)); 157static void clear_window_matrices (struct window *, int);
158static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int)); 158static void fill_up_glyph_row_area_with_spaces (struct glyph_row *, int);
159static int scrolling_window P_ ((struct window *, int)); 159static int scrolling_window (struct window *, int);
160static int update_window_line P_ ((struct window *, int, int *)); 160static int update_window_line (struct window *, int, int *);
161static void update_marginal_area P_ ((struct window *, int, int)); 161static void update_marginal_area (struct window *, int, int);
162static int update_text_area P_ ((struct window *, int)); 162static int update_text_area (struct window *, int);
163static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *, 163static void make_current (struct glyph_matrix *, struct glyph_matrix *,
164 int)); 164 int);
165static void mirror_make_current P_ ((struct window *, int)); 165static void mirror_make_current (struct window *, int);
166void check_window_matrix_pointers P_ ((struct window *)); 166void check_window_matrix_pointers (struct window *);
167#if GLYPH_DEBUG 167#if GLYPH_DEBUG
168static void check_matrix_pointers P_ ((struct glyph_matrix *, 168static void check_matrix_pointers (struct glyph_matrix *,
169 struct glyph_matrix *)); 169 struct glyph_matrix *);
170#endif 170#endif
171static void mirror_line_dance P_ ((struct window *, int, int, int *, char *)); 171static void mirror_line_dance (struct window *, int, int, int *, char *);
172static int update_window_tree P_ ((struct window *, int)); 172static int update_window_tree (struct window *, int);
173static int update_window P_ ((struct window *, int)); 173static int update_window (struct window *, int);
174static int update_frame_1 P_ ((struct frame *, int, int)); 174static int update_frame_1 (struct frame *, int, int);
175static void set_window_cursor_after_update P_ ((struct window *)); 175static void set_window_cursor_after_update (struct window *);
176static int row_equal_p P_ ((struct window *, struct glyph_row *, 176static int row_equal_p (struct window *, struct glyph_row *,
177 struct glyph_row *, int)); 177 struct glyph_row *, int);
178static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *)); 178static void adjust_frame_glyphs_for_window_redisplay (struct frame *);
179static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *)); 179static void adjust_frame_glyphs_for_frame_redisplay (struct frame *);
180static void reverse_rows P_ ((struct glyph_matrix *, int, int)); 180static void reverse_rows (struct glyph_matrix *, int, int);
181static int margin_glyphs_to_reserve P_ ((struct window *, int, Lisp_Object)); 181static int margin_glyphs_to_reserve (struct window *, int, Lisp_Object);
182static void sync_window_with_frame_matrix_rows P_ ((struct window *)); 182static void sync_window_with_frame_matrix_rows (struct window *);
183struct window *frame_row_to_window P_ ((struct window *, int)); 183struct window *frame_row_to_window (struct window *, int);
184 184
185 185
186/* Non-zero means don't pause redisplay for pending input. (This is 186/* Non-zero means don't pause redisplay for pending input. (This is
@@ -325,8 +325,8 @@ int fonts_changed_p;
325 325
326#if GLYPH_DEBUG 326#if GLYPH_DEBUG
327 327
328static int window_to_frame_vpos P_ ((struct window *, int)); 328static int window_to_frame_vpos (struct window *, int);
329static int window_to_frame_hpos P_ ((struct window *, int)); 329static int window_to_frame_hpos (struct window *, int);
330#define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) 330#define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS))
331#define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) 331#define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS))
332 332
@@ -355,8 +355,8 @@ static int history_idx;
355 355
356static unsigned history_tick; 356static unsigned history_tick;
357 357
358static void add_frame_display_history P_ ((struct frame *, int)); 358static void add_frame_display_history (struct frame *, int);
359static void add_window_display_history P_ ((struct window *, char *, int)); 359static void add_window_display_history (struct window *, char *, int);
360 360
361/* Add to the redisplay history how window W has been displayed. 361/* Add to the redisplay history how window W has been displayed.
362 MSG is a trace containing the information how W's glyph matrix 362 MSG is a trace containing the information how W's glyph matrix
diff --git a/src/doc.c b/src/doc.c
index 536d22c57a6..b0820d15933 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -46,7 +46,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
46#include "buildobj.h" 46#include "buildobj.h"
47 47
48#ifdef HAVE_INDEX 48#ifdef HAVE_INDEX
49extern char *index P_ ((const char *, int)); 49extern char *index (const char *, int);
50#endif 50#endif
51 51
52Lisp_Object Vdoc_file_name; 52Lisp_Object Vdoc_file_name;
@@ -65,7 +65,7 @@ static char *get_doc_string_buffer;
65static int get_doc_string_buffer_size; 65static int get_doc_string_buffer_size;
66 66
67static unsigned char *read_bytecode_pointer; 67static unsigned char *read_bytecode_pointer;
68Lisp_Object Fsnarf_documentation P_ ((Lisp_Object)); 68Lisp_Object Fsnarf_documentation (Lisp_Object);
69 69
70/* readchar in lread.c calls back here to fetch the next byte. 70/* readchar in lread.c calls back here to fetch the next byte.
71 If UNREADFLAG is 1, we unread a byte. */ 71 If UNREADFLAG is 1, we unread a byte. */
diff --git a/src/editfns.c b/src/editfns.c
index ea279a462f2..ac1d152ccdb 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -86,38 +86,38 @@ extern char **environ;
86 (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE) 86 (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE)
87#endif 87#endif
88 88
89extern size_t emacs_strftimeu P_ ((char *, size_t, const char *, 89extern size_t emacs_strftimeu (char *, size_t, const char *,
90 const struct tm *, int)); 90 const struct tm *, int);
91 91
92#ifdef WINDOWSNT 92#ifdef WINDOWSNT
93extern Lisp_Object w32_get_internal_run_time (); 93extern Lisp_Object w32_get_internal_run_time ();
94#endif 94#endif
95 95
96static int tm_diff P_ ((struct tm *, struct tm *)); 96static int tm_diff (struct tm *, struct tm *);
97static void find_field P_ ((Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *)); 97static void find_field (Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *);
98static void update_buffer_properties P_ ((int, int)); 98static void update_buffer_properties (int, int);
99static Lisp_Object region_limit P_ ((int)); 99static Lisp_Object region_limit (int);
100int lisp_time_argument P_ ((Lisp_Object, time_t *, int *)); 100int lisp_time_argument (Lisp_Object, time_t *, int *);
101static size_t emacs_memftimeu P_ ((char *, size_t, const char *, 101static size_t emacs_memftimeu (char *, size_t, const char *,
102 size_t, const struct tm *, int)); 102 size_t, const struct tm *, int);
103static void general_insert_function (void (*) (const unsigned char *, EMACS_INT), 103static void general_insert_function (void (*) (const unsigned char *, EMACS_INT),
104 void (*) (Lisp_Object, EMACS_INT, 104 void (*) (Lisp_Object, EMACS_INT,
105 EMACS_INT, EMACS_INT, 105 EMACS_INT, EMACS_INT,
106 EMACS_INT, int), 106 EMACS_INT, int),
107 int, int, Lisp_Object *); 107 int, int, Lisp_Object *);
108static Lisp_Object subst_char_in_region_unwind P_ ((Lisp_Object)); 108static Lisp_Object subst_char_in_region_unwind (Lisp_Object);
109static Lisp_Object subst_char_in_region_unwind_1 P_ ((Lisp_Object)); 109static Lisp_Object subst_char_in_region_unwind_1 (Lisp_Object);
110static void transpose_markers P_ ((int, int, int, int, int, int, int, int)); 110static void transpose_markers (int, int, int, int, int, int, int, int);
111 111
112#ifdef HAVE_INDEX 112#ifdef HAVE_INDEX
113extern char *index P_ ((const char *, int)); 113extern char *index (const char *, int);
114#endif 114#endif
115 115
116Lisp_Object Vbuffer_access_fontify_functions; 116Lisp_Object Vbuffer_access_fontify_functions;
117Lisp_Object Qbuffer_access_fontify_functions; 117Lisp_Object Qbuffer_access_fontify_functions;
118Lisp_Object Vbuffer_access_fontified_property; 118Lisp_Object Vbuffer_access_fontified_property;
119 119
120Lisp_Object Fuser_full_name P_ ((Lisp_Object)); 120Lisp_Object Fuser_full_name (Lisp_Object);
121 121
122/* Non-nil means don't stop at field boundary in text motion commands. */ 122/* Non-nil means don't stop at field boundary in text motion commands. */
123 123
@@ -2953,7 +2953,7 @@ Both characters must have the same length of multi-byte form. */)
2953} 2953}
2954 2954
2955 2955
2956static Lisp_Object check_translation P_ ((int, int, int, Lisp_Object)); 2956static Lisp_Object check_translation (int, int, int, Lisp_Object);
2957 2957
2958/* Helper function for Ftranslate_region_internal. 2958/* Helper function for Ftranslate_region_internal.
2959 2959
diff --git a/src/emacs.c b/src/emacs.c
index 7e778e2e5fd..d31a5f16f74 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/>. */
90const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; 90const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
91const char emacs_version[] = "24.0.50"; 91const char emacs_version[] = "24.0.50";
92 92
93extern void malloc_warning P_ ((char *)); 93extern void malloc_warning (char *);
94extern void set_time_zone_rule P_ ((char *)); 94extern void set_time_zone_rule (char *);
95#ifdef HAVE_INDEX 95#ifdef HAVE_INDEX
96extern char *index P_ ((const char *, int)); 96extern char *index (const char *, int);
97#endif 97#endif
98 98
99/* Make these values available in GDB, which doesn't see macros. */ 99/* Make these values available in GDB, which doesn't see macros. */
@@ -361,7 +361,7 @@ int fatal_error_in_progress;
361/* If non-null, call this function from fatal_error_signal before 361/* If non-null, call this function from fatal_error_signal before
362 committing suicide. */ 362 committing suicide. */
363 363
364void (*fatal_error_signal_hook) P_ ((void)); 364void (*fatal_error_signal_hook) (void);
365 365
366#ifdef FORWARD_SIGNAL_TO_MAIN_THREAD 366#ifdef FORWARD_SIGNAL_TO_MAIN_THREAD
367/* When compiled with GTK and running under Gnome, 367/* When compiled with GTK and running under Gnome,
@@ -1202,7 +1202,7 @@ main (int argc, char **argv)
1202#endif 1202#endif
1203#if defined (HAVE_GTK_AND_PTHREAD) && !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC) 1203#if defined (HAVE_GTK_AND_PTHREAD) && !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)
1204 { 1204 {
1205 extern void malloc_enable_thread P_ ((void)); 1205 extern void malloc_enable_thread (void);
1206 1206
1207 malloc_enable_thread (); 1207 malloc_enable_thread ();
1208 } 1208 }
diff --git a/src/eval.c b/src/eval.c
index 199c4705736..239ee40ab95 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -170,8 +170,8 @@ extern Lisp_Object Qrisky_local_variable;
170 170
171extern Lisp_Object Qfunction; 171extern Lisp_Object Qfunction;
172 172
173static Lisp_Object funcall_lambda P_ ((Lisp_Object, int, Lisp_Object*)); 173static Lisp_Object funcall_lambda (Lisp_Object, int, Lisp_Object*);
174static void unwind_to_catch P_ ((struct catchtag *, Lisp_Object)) NO_RETURN; 174static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN;
175 175
176#if __GNUC__ 176#if __GNUC__
177/* "gcc -O3" enables automatic function inlining, which optimizes out 177/* "gcc -O3" enables automatic function inlining, which optimizes out
@@ -1660,8 +1660,8 @@ internal_condition_case_n (Lisp_Object (*bfun) (int, Lisp_Object*),
1660} 1660}
1661 1661
1662 1662
1663static Lisp_Object find_handler_clause P_ ((Lisp_Object, Lisp_Object, 1663static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object,
1664 Lisp_Object, Lisp_Object)); 1664 Lisp_Object, Lisp_Object);
1665 1665
1666DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0, 1666DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0,
1667 doc: /* Signal an error. Args are ERROR-SYMBOL and associated DATA. 1667 doc: /* Signal an error. Args are ERROR-SYMBOL and associated DATA.
@@ -2574,8 +2574,8 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
2574/* Run hook variables in various ways. */ 2574/* Run hook variables in various ways. */
2575 2575
2576enum run_hooks_condition {to_completion, until_success, until_failure}; 2576enum run_hooks_condition {to_completion, until_success, until_failure};
2577static Lisp_Object run_hook_with_args P_ ((int, Lisp_Object *, 2577static Lisp_Object run_hook_with_args (int, Lisp_Object *,
2578 enum run_hooks_condition)); 2578 enum run_hooks_condition);
2579 2579
2580DEFUN ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0, 2580DEFUN ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0,
2581 doc: /* Run each hook in HOOKS. 2581 doc: /* Run each hook in HOOKS.
@@ -3424,7 +3424,7 @@ specbind (symbol, value)
3424 3424
3425void 3425void
3426record_unwind_protect (function, arg) 3426record_unwind_protect (function, arg)
3427 Lisp_Object (*function) P_ ((Lisp_Object)); 3427 Lisp_Object (*function) (Lisp_Object);
3428 Lisp_Object arg; 3428 Lisp_Object arg;
3429{ 3429{
3430 eassert (!handling_signal); 3430 eassert (!handling_signal);
diff --git a/src/fileio.c b/src/fileio.c
index 8c2ee45c073..af477792ec8 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -240,9 +240,9 @@ Lisp_Object Qfile_name_history;
240 240
241Lisp_Object Qcar_less_than_car; 241Lisp_Object Qcar_less_than_car;
242 242
243static int a_write P_ ((int, Lisp_Object, int, int, 243static int a_write (int, Lisp_Object, int, int,
244 Lisp_Object *, struct coding_system *)); 244 Lisp_Object *, struct coding_system *);
245static int e_write P_ ((int, Lisp_Object, int, int, struct coding_system *)); 245static int e_write (int, Lisp_Object, int, int, struct coding_system *);
246 246
247 247
248void 248void
@@ -3101,7 +3101,7 @@ The value is an integer. */)
3101 return value; 3101 return value;
3102} 3102}
3103 3103
3104extern int lisp_time_argument P_ ((Lisp_Object, time_t *, int *)); 3104extern int lisp_time_argument (Lisp_Object, time_t *, int *);
3105 3105
3106DEFUN ("set-file-times", Fset_file_times, Sset_file_times, 1, 2, 0, 3106DEFUN ("set-file-times", Fset_file_times, Sset_file_times, 1, 2, 0,
3107 doc: /* Set times of file FILENAME to TIME. 3107 doc: /* Set times of file FILENAME to TIME.
@@ -4445,7 +4445,7 @@ variable `last-coding-system-used' to the coding system actually used. */)
4445 RETURN_UNGCPRO (unbind_to (count, val)); 4445 RETURN_UNGCPRO (unbind_to (count, val));
4446} 4446}
4447 4447
4448static Lisp_Object build_annotations P_ ((Lisp_Object, Lisp_Object)); 4448static Lisp_Object build_annotations (Lisp_Object, Lisp_Object);
4449 4449
4450static Lisp_Object 4450static Lisp_Object
4451build_annotations_unwind (arg) 4451build_annotations_unwind (arg)
diff --git a/src/filelock.c b/src/filelock.c
index b11338c58b6..69e15a53846 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -122,7 +122,7 @@ static int boot_time_initialized;
122extern Lisp_Object Vshell_file_name; 122extern Lisp_Object Vshell_file_name;
123 123
124#ifdef BOOT_TIME 124#ifdef BOOT_TIME
125static void get_boot_time_1 P_ ((char *, int)); 125static void get_boot_time_1 (char *, int);
126#endif 126#endif
127 127
128static time_t 128static time_t
diff --git a/src/fns.c b/src/fns.c
index 3f984905d1e..a016d199c58 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -74,10 +74,10 @@ Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper;
74 74
75extern Lisp_Object Qinput_method_function; 75extern Lisp_Object Qinput_method_function;
76 76
77static int internal_equal P_ ((Lisp_Object , Lisp_Object, int, int)); 77static int internal_equal (Lisp_Object , Lisp_Object, int, int);
78 78
79extern long get_random (); 79extern long get_random ();
80extern void seed_random P_ ((long)); 80extern void seed_random (long);
81 81
82#ifndef HAVE_UNISTD_H 82#ifndef HAVE_UNISTD_H
83extern long time (); 83extern long time ();
@@ -383,9 +383,9 @@ Symbols are also allowed; their print names are used instead. */)
383/* "gcc -O3" enables automatic function inlining, which optimizes out 383/* "gcc -O3" enables automatic function inlining, which optimizes out
384 the arguments for the invocations of this function, whereas it 384 the arguments for the invocations of this function, whereas it
385 expects these values on the stack. */ 385 expects these values on the stack. */
386static Lisp_Object concat P_ ((int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special)) __attribute__((noinline)); 386static Lisp_Object concat (int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special) __attribute__((noinline));
387#else /* !__GNUC__ */ 387#else /* !__GNUC__ */
388static Lisp_Object concat P_ ((int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special)); 388static Lisp_Object concat (int nargs, Lisp_Object *args, enum Lisp_Type target_type, int last_special);
389#endif 389#endif
390 390
391/* ARGSUSED */ 391/* ARGSUSED */
@@ -3224,8 +3224,8 @@ static const short base64_char_to_value[128] =
3224 base64 characters. */ 3224 base64 characters. */
3225 3225
3226 3226
3227static int base64_encode_1 P_ ((const char *, char *, int, int, int)); 3227static int base64_encode_1 (const char *, char *, int, int, int);
3228static int base64_decode_1 P_ ((const char *, char *, int, int, int *)); 3228static int base64_decode_1 (const char *, char *, int, int, int *);
3229 3229
3230DEFUN ("base64-encode-region", Fbase64_encode_region, Sbase64_encode_region, 3230DEFUN ("base64-encode-region", Fbase64_encode_region, Sbase64_encode_region,
3231 2, 3, "r", 3231 2, 3, "r",
@@ -3652,25 +3652,25 @@ Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value;
3652 3652
3653/* Function prototypes. */ 3653/* Function prototypes. */
3654 3654
3655static struct Lisp_Hash_Table *check_hash_table P_ ((Lisp_Object)); 3655static struct Lisp_Hash_Table *check_hash_table (Lisp_Object);
3656static int get_key_arg P_ ((Lisp_Object, int, Lisp_Object *, char *)); 3656static int get_key_arg (Lisp_Object, int, Lisp_Object *, char *);
3657static void maybe_resize_hash_table P_ ((struct Lisp_Hash_Table *)); 3657static void maybe_resize_hash_table (struct Lisp_Hash_Table *);
3658static int cmpfn_eql P_ ((struct Lisp_Hash_Table *, Lisp_Object, unsigned, 3658static int cmpfn_eql (struct Lisp_Hash_Table *, Lisp_Object, unsigned,
3659 Lisp_Object, unsigned)); 3659 Lisp_Object, unsigned);
3660static int cmpfn_equal P_ ((struct Lisp_Hash_Table *, Lisp_Object, unsigned, 3660static int cmpfn_equal (struct Lisp_Hash_Table *, Lisp_Object, unsigned,
3661 Lisp_Object, unsigned)); 3661 Lisp_Object, unsigned);
3662static int cmpfn_user_defined P_ ((struct Lisp_Hash_Table *, Lisp_Object, 3662static int cmpfn_user_defined (struct Lisp_Hash_Table *, Lisp_Object,
3663 unsigned, Lisp_Object, unsigned)); 3663 unsigned, Lisp_Object, unsigned);
3664static unsigned hashfn_eq P_ ((struct Lisp_Hash_Table *, Lisp_Object)); 3664static unsigned hashfn_eq (struct Lisp_Hash_Table *, Lisp_Object);
3665static unsigned hashfn_eql P_ ((struct Lisp_Hash_Table *, Lisp_Object)); 3665static unsigned hashfn_eql (struct Lisp_Hash_Table *, Lisp_Object);
3666static unsigned hashfn_equal P_ ((struct Lisp_Hash_Table *, Lisp_Object)); 3666static unsigned hashfn_equal (struct Lisp_Hash_Table *, Lisp_Object);
3667static unsigned hashfn_user_defined P_ ((struct Lisp_Hash_Table *, 3667static unsigned hashfn_user_defined (struct Lisp_Hash_Table *,
3668 Lisp_Object)); 3668 Lisp_Object);
3669static unsigned sxhash_string P_ ((unsigned char *, int)); 3669static unsigned sxhash_string (unsigned char *, int);
3670static unsigned sxhash_list P_ ((Lisp_Object, int)); 3670static unsigned sxhash_list (Lisp_Object, int);
3671static unsigned sxhash_vector P_ ((Lisp_Object, int)); 3671static unsigned sxhash_vector (Lisp_Object, int);
3672static unsigned sxhash_bool_vector P_ ((Lisp_Object)); 3672static unsigned sxhash_bool_vector (Lisp_Object);
3673static int sweep_weak_table P_ ((struct Lisp_Hash_Table *, int)); 3673static int sweep_weak_table (struct Lisp_Hash_Table *, int);
3674 3674
3675 3675
3676 3676
diff --git a/src/font.c b/src/font.c
index f9c2381fa70..b92b44a38bc 100644
--- a/src/font.c
+++ b/src/font.c
@@ -229,10 +229,10 @@ font_make_object (size, entity, pixelsize)
229 229
230 230
231 231
232static int font_pixel_size P_ ((FRAME_PTR f, Lisp_Object)); 232static int font_pixel_size (FRAME_PTR f, Lisp_Object);
233static Lisp_Object font_open_entity P_ ((FRAME_PTR, Lisp_Object, int)); 233static Lisp_Object font_open_entity (FRAME_PTR, Lisp_Object, int);
234static Lisp_Object font_matching_entity P_ ((FRAME_PTR, Lisp_Object *, 234static Lisp_Object font_matching_entity (FRAME_PTR, Lisp_Object *,
235 Lisp_Object)); 235 Lisp_Object);
236 236
237/* Number of registered font drivers. */ 237/* Number of registered font drivers. */
238static int num_font_drivers; 238static int num_font_drivers;
@@ -416,7 +416,7 @@ font_style_symbolic (font, prop, for_face)
416 416
417extern Lisp_Object Vface_alternative_font_family_alist; 417extern Lisp_Object Vface_alternative_font_family_alist;
418 418
419extern Lisp_Object find_font_encoding P_ ((Lisp_Object)); 419extern Lisp_Object find_font_encoding (Lisp_Object);
420 420
421 421
422/* Return ENCODING or a cons of ENCODING and REPERTORY of the font 422/* Return ENCODING or a cons of ENCODING and REPERTORY of the font
@@ -508,12 +508,12 @@ font_registry_charsets (registry, encoding, repertory)
508/* Font property value validaters. See the comment of 508/* Font property value validaters. See the comment of
509 font_property_table for the meaning of the arguments. */ 509 font_property_table for the meaning of the arguments. */
510 510
511static Lisp_Object font_prop_validate P_ ((int, Lisp_Object, Lisp_Object)); 511static Lisp_Object font_prop_validate (int, Lisp_Object, Lisp_Object);
512static Lisp_Object font_prop_validate_symbol P_ ((Lisp_Object, Lisp_Object)); 512static Lisp_Object font_prop_validate_symbol (Lisp_Object, Lisp_Object);
513static Lisp_Object font_prop_validate_style P_ ((Lisp_Object, Lisp_Object)); 513static Lisp_Object font_prop_validate_style (Lisp_Object, Lisp_Object);
514static Lisp_Object font_prop_validate_non_neg P_ ((Lisp_Object, Lisp_Object)); 514static Lisp_Object font_prop_validate_non_neg (Lisp_Object, Lisp_Object);
515static Lisp_Object font_prop_validate_spacing P_ ((Lisp_Object, Lisp_Object)); 515static Lisp_Object font_prop_validate_spacing (Lisp_Object, Lisp_Object);
516static int get_font_prop_index P_ ((Lisp_Object)); 516static int get_font_prop_index (Lisp_Object);
517 517
518static Lisp_Object 518static Lisp_Object
519font_prop_validate_symbol (prop, val) 519font_prop_validate_symbol (prop, val)
@@ -638,7 +638,7 @@ struct
638 /* Function to validate PROP's value VAL, or NULL if any value is 638 /* Function to validate PROP's value VAL, or NULL if any value is
639 ok. The value is VAL or its regularized value if VAL is valid, 639 ok. The value is VAL or its regularized value if VAL is valid,
640 and Qerror if not. */ 640 and Qerror if not. */
641 Lisp_Object (*validater) P_ ((Lisp_Object prop, Lisp_Object val)); 641 Lisp_Object (*validater) (Lisp_Object prop, Lisp_Object val);
642} font_property_table[] = 642} font_property_table[] =
643 { { &QCtype, font_prop_validate_symbol }, 643 { { &QCtype, font_prop_validate_symbol },
644 { &QCfoundry, font_prop_validate_symbol }, 644 { &QCfoundry, font_prop_validate_symbol },
@@ -740,9 +740,9 @@ font_put_extra (font, prop, val)
740 740
741/* Font name parser and unparser */ 741/* Font name parser and unparser */
742 742
743static int parse_matrix P_ ((char *)); 743static int parse_matrix (char *);
744static int font_expand_wildcards P_ ((Lisp_Object *, int)); 744static int font_expand_wildcards (Lisp_Object *, int);
745static int font_parse_name P_ ((char *, Lisp_Object)); 745static int font_parse_name (char *, Lisp_Object);
746 746
747/* An enumerator for each field of an XLFD font name. */ 747/* An enumerator for each field of an XLFD font name. */
748enum xlfd_field_index 748enum xlfd_field_index
@@ -2220,10 +2220,10 @@ font_otf_Anchor (anchor)
2220 2220
2221/* Font sorting */ 2221/* Font sorting */
2222 2222
2223static unsigned font_score P_ ((Lisp_Object, Lisp_Object *)); 2223static unsigned font_score (Lisp_Object, Lisp_Object *);
2224static int font_compare P_ ((const void *, const void *)); 2224static int font_compare (const void *, const void *);
2225static Lisp_Object font_sort_entities P_ ((Lisp_Object, Lisp_Object, 2225static Lisp_Object font_sort_entities (Lisp_Object, Lisp_Object,
2226 Lisp_Object, int)); 2226 Lisp_Object, int);
2227 2227
2228/* Return a rescaling ratio of FONT_ENTITY. */ 2228/* Return a rescaling ratio of FONT_ENTITY. */
2229extern Lisp_Object Vface_font_rescale_alist; 2229extern Lisp_Object Vface_font_rescale_alist;
@@ -2701,11 +2701,11 @@ font_match_p (spec, font)
2701 is a number frames sharing this cache, and FONT-CACHE-DATA is a 2701 is a number frames sharing this cache, and FONT-CACHE-DATA is a
2702 cons (FONT-SPEC FONT-ENTITY ...). */ 2702 cons (FONT-SPEC FONT-ENTITY ...). */
2703 2703
2704static void font_prepare_cache P_ ((FRAME_PTR, struct font_driver *)); 2704static void font_prepare_cache (FRAME_PTR, struct font_driver *);
2705static void font_finish_cache P_ ((FRAME_PTR, struct font_driver *)); 2705static void font_finish_cache (FRAME_PTR, struct font_driver *);
2706static Lisp_Object font_get_cache P_ ((FRAME_PTR, struct font_driver *)); 2706static Lisp_Object font_get_cache (FRAME_PTR, struct font_driver *);
2707static void font_clear_cache P_ ((FRAME_PTR, Lisp_Object, 2707static void font_clear_cache (FRAME_PTR, Lisp_Object,
2708 struct font_driver *)); 2708 struct font_driver *);
2709 2709
2710static void 2710static void
2711font_prepare_cache (f, driver) 2711font_prepare_cache (f, driver)
@@ -5249,14 +5249,14 @@ font_deferred_log (action, arg, result)
5249 ASET (Vfont_log_deferred, 2, result); 5249 ASET (Vfont_log_deferred, 2, result);
5250} 5250}
5251 5251
5252extern void syms_of_ftfont P_ (()); 5252extern void syms_of_ftfont ();
5253extern void syms_of_xfont P_ (()); 5253extern void syms_of_xfont ();
5254extern void syms_of_xftfont P_ (()); 5254extern void syms_of_xftfont ();
5255extern void syms_of_ftxfont P_ (()); 5255extern void syms_of_ftxfont ();
5256extern void syms_of_bdffont P_ (()); 5256extern void syms_of_bdffont ();
5257extern void syms_of_w32font P_ (()); 5257extern void syms_of_w32font ();
5258extern void syms_of_atmfont P_ (()); 5258extern void syms_of_atmfont ();
5259extern void syms_of_nsfont P_ (()); 5259extern void syms_of_nsfont ();
5260 5260
5261void 5261void
5262syms_of_font () 5262syms_of_font ()
diff --git a/src/fontset.c b/src/fontset.c
index e4fd9d72780..84035838552 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -203,23 +203,23 @@ Lisp_Object Vvertical_centering_font_regexp;
203Lisp_Object Votf_script_alist; 203Lisp_Object Votf_script_alist;
204 204
205/* Check if any window system is used now. */ 205/* Check if any window system is used now. */
206void (*check_window_system_func) P_ ((void)); 206void (*check_window_system_func) (void);
207 207
208 208
209/* Prototype declarations for static functions. */ 209/* Prototype declarations for static functions. */
210static Lisp_Object fontset_add P_ ((Lisp_Object, Lisp_Object, Lisp_Object, 210static Lisp_Object fontset_add (Lisp_Object, Lisp_Object, Lisp_Object,
211 Lisp_Object)); 211 Lisp_Object);
212static Lisp_Object fontset_find_font P_ ((Lisp_Object, int, struct face *, 212static Lisp_Object fontset_find_font (Lisp_Object, int, struct face *,
213 int, int)); 213 int, int);
214static void reorder_font_vector P_ ((Lisp_Object, struct font *)); 214static void reorder_font_vector (Lisp_Object, struct font *);
215static Lisp_Object fontset_font P_ ((Lisp_Object, int, struct face *, int)); 215static Lisp_Object fontset_font (Lisp_Object, int, struct face *, int);
216static Lisp_Object make_fontset P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); 216static Lisp_Object make_fontset (Lisp_Object, Lisp_Object, Lisp_Object);
217static Lisp_Object fontset_pattern_regexp P_ ((Lisp_Object)); 217static Lisp_Object fontset_pattern_regexp (Lisp_Object);
218static void accumulate_script_ranges P_ ((Lisp_Object, Lisp_Object, 218static void accumulate_script_ranges (Lisp_Object, Lisp_Object,
219 Lisp_Object)); 219 Lisp_Object);
220Lisp_Object find_font_encoding P_ ((Lisp_Object)); 220Lisp_Object find_font_encoding (Lisp_Object);
221 221
222static void set_fontset_font P_ ((Lisp_Object, Lisp_Object)); 222static void set_fontset_font (Lisp_Object, Lisp_Object);
223 223
224#ifdef FONTSET_DEBUG 224#ifdef FONTSET_DEBUG
225 225
@@ -1440,7 +1440,7 @@ set_fontset_font (arg, range)
1440} 1440}
1441 1441
1442extern Lisp_Object QCfamily, QCregistry; 1442extern Lisp_Object QCfamily, QCregistry;
1443static void update_auto_fontset_alist P_ ((Lisp_Object, Lisp_Object)); 1443static void update_auto_fontset_alist (Lisp_Object, Lisp_Object);
1444 1444
1445 1445
1446DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 5, 0, 1446DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 5, 0,
diff --git a/src/frame.c b/src/frame.c
index c323c61be69..3199d35004e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1823,7 +1823,7 @@ before calling this function on it, like this.
1823 return Qnil; 1823 return Qnil;
1824} 1824}
1825 1825
1826static void make_frame_visible_1 P_ ((Lisp_Object)); 1826static void make_frame_visible_1 (Lisp_Object);
1827 1827
1828DEFUN ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible, 1828DEFUN ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible,
1829 0, 1, "", 1829 0, 1, "",
@@ -3824,8 +3824,8 @@ validate_x_resource_name ()
3824} 3824}
3825 3825
3826 3826
3827extern char *x_get_string_resource P_ ((XrmDatabase, char *, char *)); 3827extern char *x_get_string_resource (XrmDatabase, char *, char *);
3828extern Display_Info *check_x_display_info P_ ((Lisp_Object)); 3828extern Display_Info *check_x_display_info (Lisp_Object);
3829 3829
3830 3830
3831/* Get specified attribute from resource database RDB. 3831/* Get specified attribute from resource database RDB.
diff --git a/src/ftfont.c b/src/ftfont.c
index 33a96143fd0..a75296cc7b7 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -80,16 +80,16 @@ enum ftfont_cache_for
80 FTFONT_CACHE_FOR_ENTITY 80 FTFONT_CACHE_FOR_ENTITY
81 }; 81 };
82 82
83static Lisp_Object ftfont_pattern_entity P_ ((FcPattern *, Lisp_Object)); 83static Lisp_Object ftfont_pattern_entity (FcPattern *, Lisp_Object);
84 84
85static Lisp_Object ftfont_resolve_generic_family P_ ((Lisp_Object, 85static Lisp_Object ftfont_resolve_generic_family (Lisp_Object,
86 FcPattern *)); 86 FcPattern *);
87static Lisp_Object ftfont_lookup_cache P_ ((Lisp_Object, 87static Lisp_Object ftfont_lookup_cache (Lisp_Object,
88 enum ftfont_cache_for)); 88 enum ftfont_cache_for);
89 89
90static void ftfont_filter_properties P_ ((Lisp_Object font, Lisp_Object alist)); 90static void ftfont_filter_properties (Lisp_Object font, Lisp_Object alist);
91 91
92Lisp_Object ftfont_font_format P_ ((FcPattern *, Lisp_Object)); 92Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object);
93 93
94#define SYMBOL_FcChar8(SYM) (FcChar8 *) SDATA (SYMBOL_NAME (SYM)) 94#define SYMBOL_FcChar8(SYM) (FcChar8 *) SDATA (SYMBOL_NAME (SYM))
95 95
@@ -486,26 +486,26 @@ ftfont_get_otf (ftfont_info)
486} 486}
487#endif /* HAVE_LIBOTF */ 487#endif /* HAVE_LIBOTF */
488 488
489static Lisp_Object ftfont_get_cache P_ ((FRAME_PTR)); 489static Lisp_Object ftfont_get_cache (FRAME_PTR);
490static Lisp_Object ftfont_list P_ ((Lisp_Object, Lisp_Object)); 490static Lisp_Object ftfont_list (Lisp_Object, Lisp_Object);
491static Lisp_Object ftfont_match P_ ((Lisp_Object, Lisp_Object)); 491static Lisp_Object ftfont_match (Lisp_Object, Lisp_Object);
492static Lisp_Object ftfont_list_family P_ ((Lisp_Object)); 492static Lisp_Object ftfont_list_family (Lisp_Object);
493static Lisp_Object ftfont_open P_ ((FRAME_PTR, Lisp_Object, int)); 493static Lisp_Object ftfont_open (FRAME_PTR, Lisp_Object, int);
494static void ftfont_close P_ ((FRAME_PTR, struct font *)); 494static void ftfont_close (FRAME_PTR, struct font *);
495static int ftfont_has_char P_ ((Lisp_Object, int)); 495static int ftfont_has_char (Lisp_Object, int);
496static unsigned ftfont_encode_char P_ ((struct font *, int)); 496static unsigned ftfont_encode_char (struct font *, int);
497static int ftfont_text_extents P_ ((struct font *, unsigned *, int, 497static int ftfont_text_extents (struct font *, unsigned *, int,
498 struct font_metrics *)); 498 struct font_metrics *);
499static int ftfont_get_bitmap P_ ((struct font *, unsigned, 499static int ftfont_get_bitmap (struct font *, unsigned,
500 struct font_bitmap *, int)); 500 struct font_bitmap *, int);
501static int ftfont_anchor_point P_ ((struct font *, unsigned, int, 501static int ftfont_anchor_point (struct font *, unsigned, int,
502 int *, int *)); 502 int *, int *);
503static Lisp_Object ftfont_otf_capability P_ ((struct font *)); 503static Lisp_Object ftfont_otf_capability (struct font *);
504static Lisp_Object ftfont_shape P_ ((Lisp_Object)); 504static Lisp_Object ftfont_shape (Lisp_Object);
505 505
506#ifdef HAVE_OTF_GET_VARIATION_GLYPHS 506#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
507static int ftfont_variation_glyphs P_ ((struct font *, int c, 507static int ftfont_variation_glyphs (struct font *, int c,
508 unsigned variations[256])); 508 unsigned variations[256]);
509#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */ 509#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
510 510
511struct font_driver ftfont_driver = 511struct font_driver ftfont_driver =
@@ -705,9 +705,9 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec)
705 return spec; 705 return spec;
706} 706}
707 707
708static FcPattern *ftfont_spec_pattern P_ ((Lisp_Object, char *, 708static FcPattern *ftfont_spec_pattern (Lisp_Object, char *,
709 struct OpenTypeSpec **, 709 struct OpenTypeSpec **,
710 char **langname)); 710 char **langname);
711 711
712static FcPattern * 712static FcPattern *
713ftfont_spec_pattern (spec, otlayout, otspec, langname) 713ftfont_spec_pattern (spec, otlayout, otspec, langname)
diff --git a/src/ftxfont.c b/src/ftxfont.c
index 847522a2f9c..e81a5380045 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/>. */
39static Lisp_Object Qftx; 39static Lisp_Object Qftx;
40 40
41/* Prototypes for helper function. */ 41/* Prototypes for helper function. */
42static GC *ftxfont_get_gcs P_ ((FRAME_PTR, unsigned long, unsigned long)); 42static GC *ftxfont_get_gcs (FRAME_PTR, unsigned long, unsigned long);
43static int ftxfont_draw_bitmap P_ ((FRAME_PTR, GC, GC *, struct font *, 43static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *,
44 unsigned, int, int, XPoint *, int, int *, 44 unsigned, int, int, XPoint *, int, int *,
45 int)); 45 int);
46static void ftxfont_draw_backgrond P_ ((FRAME_PTR, struct font *, GC, 46static void ftxfont_draw_backgrond (FRAME_PTR, struct font *, GC,
47 int, int, int)); 47 int, int, int);
48 48
49struct ftxfont_frame_data 49struct ftxfont_frame_data
50{ 50{
@@ -241,11 +241,11 @@ ftxfont_draw_backgrond (f, font, gc, x, y, width)
241} 241}
242 242
243/* Prototypes for font-driver methods. */ 243/* Prototypes for font-driver methods. */
244static Lisp_Object ftxfont_list P_ ((Lisp_Object, Lisp_Object)); 244static Lisp_Object ftxfont_list (Lisp_Object, Lisp_Object);
245static Lisp_Object ftxfont_match P_ ((Lisp_Object, Lisp_Object)); 245static Lisp_Object ftxfont_match (Lisp_Object, Lisp_Object);
246static Lisp_Object ftxfont_open P_ ((FRAME_PTR, Lisp_Object, int)); 246static Lisp_Object ftxfont_open (FRAME_PTR, Lisp_Object, int);
247static void ftxfont_close P_ ((FRAME_PTR, struct font *)); 247static void ftxfont_close (FRAME_PTR, struct font *);
248static int ftxfont_draw P_ ((struct glyph_string *, int, int, int, int, int)); 248static int ftxfont_draw (struct glyph_string *, int, int, int, int, int);
249 249
250struct font_driver ftxfont_driver; 250struct font_driver ftxfont_driver;
251 251
diff --git a/src/gmalloc.c b/src/gmalloc.c
index a3f533bd5e8..8314798b171 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -1969,12 +1969,12 @@ Fifth Floor, Boston, MA 02110-1301, USA.
1969#endif 1969#endif
1970 1970
1971/* Old hook values. */ 1971/* Old hook values. */
1972static void (*old_free_hook) __P ((__ptr_t ptr)); 1972static void (*old_free_hook) (__ptr_t ptr);
1973static __ptr_t (*old_malloc_hook) __P ((__malloc_size_t size)); 1973static __ptr_t (*old_malloc_hook) (__malloc_size_t size);
1974static __ptr_t (*old_realloc_hook) __P ((__ptr_t ptr, __malloc_size_t size)); 1974static __ptr_t (*old_realloc_hook) (__ptr_t ptr, __malloc_size_t size);
1975 1975
1976/* Function to call when something awful happens. */ 1976/* Function to call when something awful happens. */
1977static void (*abortfunc) __P ((enum mcheck_status)); 1977static void (*abortfunc) (enum mcheck_status);
1978 1978
1979/* Arbitrary magical numbers. */ 1979/* Arbitrary magical numbers. */
1980#define MAGICWORD 0xfedabeeb 1980#define MAGICWORD 0xfedabeeb
@@ -1992,7 +1992,7 @@ struct hdr
1992#if defined(_LIBC) || defined(STDC_HEADERS) || defined(USG) 1992#if defined(_LIBC) || defined(STDC_HEADERS) || defined(USG)
1993#define flood memset 1993#define flood memset
1994#else 1994#else
1995static void flood __P ((__ptr_t, int, __malloc_size_t)); 1995static void flood (__ptr_t, int, __malloc_size_t);
1996static void 1996static void
1997flood (ptr, val, size) 1997flood (ptr, val, size)
1998 __ptr_t ptr; 1998 __ptr_t ptr;
@@ -2005,7 +2005,7 @@ flood (ptr, val, size)
2005} 2005}
2006#endif 2006#endif
2007 2007
2008static enum mcheck_status checkhdr __P ((const struct hdr *)); 2008static enum mcheck_status checkhdr (const struct hdr *);
2009static enum mcheck_status 2009static enum mcheck_status
2010checkhdr (hdr) 2010checkhdr (hdr)
2011 const struct hdr *hdr; 2011 const struct hdr *hdr;
@@ -2031,7 +2031,7 @@ checkhdr (hdr)
2031 return status; 2031 return status;
2032} 2032}
2033 2033
2034static void freehook __P ((__ptr_t)); 2034static void freehook (__ptr_t);
2035static void 2035static void
2036freehook (ptr) 2036freehook (ptr)
2037 __ptr_t ptr; 2037 __ptr_t ptr;
@@ -2053,7 +2053,7 @@ freehook (ptr)
2053 __free_hook = freehook; 2053 __free_hook = freehook;
2054} 2054}
2055 2055
2056static __ptr_t mallochook __P ((__malloc_size_t)); 2056static __ptr_t mallochook (__malloc_size_t);
2057static __ptr_t 2057static __ptr_t
2058mallochook (size) 2058mallochook (size)
2059 __malloc_size_t size; 2059 __malloc_size_t size;
@@ -2073,7 +2073,7 @@ mallochook (size)
2073 return (__ptr_t) (hdr + 1); 2073 return (__ptr_t) (hdr + 1);
2074} 2074}
2075 2075
2076static __ptr_t reallochook __P ((__ptr_t, __malloc_size_t)); 2076static __ptr_t reallochook (__ptr_t, __malloc_size_t);
2077static __ptr_t 2077static __ptr_t
2078reallochook (ptr, size) 2078reallochook (ptr, size)
2079 __ptr_t ptr; 2079 __ptr_t ptr;
@@ -2146,7 +2146,7 @@ static int mcheck_used = 0;
2146 2146
2147int 2147int
2148mcheck (func) 2148mcheck (func)
2149 void (*func) __P ((enum mcheck_status)); 2149 void (*func) (enum mcheck_status);
2150{ 2150{
2151 abortfunc = (func != NULL) ? func : &mabort; 2151 abortfunc = (func != NULL) ? func : &mabort;
2152 2152
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6a75aa473e3..63de2b02fe5 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1319,7 +1319,7 @@ xg_uses_old_file_dialog ()
1319} 1319}
1320 1320
1321 1321
1322typedef char * (*xg_get_file_func) P_ ((GtkWidget *)); 1322typedef char * (*xg_get_file_func) (GtkWidget *);
1323 1323
1324/* Return the selected file for file chooser dialog W. 1324/* Return the selected file for file chooser dialog W.
1325 The returned string must be free:d. */ 1325 The returned string must be free:d. */
@@ -2087,9 +2087,9 @@ xg_create_one_menuitem (item, f, select_cb, highlight_cb, cl_data, group)
2087 return w; 2087 return w;
2088} 2088}
2089 2089
2090static GtkWidget *create_menus P_ ((widget_value *, FRAME_PTR, GCallback, 2090static GtkWidget *create_menus (widget_value *, FRAME_PTR, GCallback,
2091 GCallback, GCallback, int, int, int, 2091 GCallback, GCallback, int, int, int,
2092 GtkWidget *, xg_menu_cb_data *, char *)); 2092 GtkWidget *, xg_menu_cb_data *, char *);
2093 2093
2094/* Create a full menu tree specified by DATA. 2094/* Create a full menu tree specified by DATA.
2095 F is the frame the created menu belongs to. 2095 F is the frame the created menu belongs to.
@@ -3466,9 +3466,9 @@ xg_tool_bar_proxy_callback (w, client_data)
3466 3466
3467 3467
3468static gboolean 3468static gboolean
3469xg_tool_bar_help_callback P_ ((GtkWidget *w, 3469xg_tool_bar_help_callback (GtkWidget *w,
3470 GdkEventCrossing *event, 3470 GdkEventCrossing *event,
3471 gpointer client_data)); 3471 gpointer client_data);
3472 3472
3473/* This callback is called when a help is to be shown for an item in 3473/* This callback is called when a help is to be shown for an item in
3474 the detached tool bar when the detached tool bar it is not expanded. */ 3474 the detached tool bar when the detached tool bar it is not expanded. */
diff --git a/src/image.c b/src/image.c
index b9620e10948..821246eac03 100644
--- a/src/image.c
+++ b/src/image.c
@@ -127,16 +127,16 @@ typedef struct ns_bitmap_record Bitmap_Record;
127Lisp_Object Vx_bitmap_file_path; 127Lisp_Object Vx_bitmap_file_path;
128 128
129 129
130static void x_disable_image P_ ((struct frame *, struct image *)); 130static void x_disable_image (struct frame *, struct image *);
131static void x_edge_detection P_ ((struct frame *, struct image *, Lisp_Object, 131static void x_edge_detection (struct frame *, struct image *, Lisp_Object,
132 Lisp_Object)); 132 Lisp_Object);
133 133
134static void init_color_table P_ ((void)); 134static void init_color_table (void);
135static unsigned long lookup_rgb_color P_ ((struct frame *f, int r, int g, int b)); 135static unsigned long lookup_rgb_color (struct frame *f, int r, int g, int b);
136#ifdef COLOR_TABLE_SUPPORT 136#ifdef COLOR_TABLE_SUPPORT
137static void free_color_table P_ ((void)); 137static void free_color_table (void);
138static unsigned long *colors_in_color_table P_ ((int *n)); 138static unsigned long *colors_in_color_table (int *n);
139static unsigned long lookup_pixel_color P_ ((struct frame *f, unsigned long p)); 139static unsigned long lookup_pixel_color (struct frame *f, unsigned long p);
140#endif 140#endif
141 141
142/* Code to deal with bitmaps. Bitmaps are referenced by their bitmap 142/* Code to deal with bitmaps. Bitmaps are referenced by their bitmap
@@ -471,16 +471,16 @@ x_destroy_all_bitmaps (dpyinfo)
471/* Useful functions defined in the section 471/* Useful functions defined in the section
472 `Image type independent image structures' below. */ 472 `Image type independent image structures' below. */
473 473
474static unsigned long four_corners_best P_ ((XImagePtr ximg, 474static unsigned long four_corners_best (XImagePtr ximg,
475 int *corners, 475 int *corners,
476 unsigned long width, 476 unsigned long width,
477 unsigned long height)); 477 unsigned long height);
478 478
479static int x_create_x_image_and_pixmap P_ ((struct frame *f, int width, int height, 479static int x_create_x_image_and_pixmap (struct frame *f, int width, int height,
480 int depth, XImagePtr *ximg, 480 int depth, XImagePtr *ximg,
481 Pixmap *pixmap)); 481 Pixmap *pixmap);
482 482
483static void x_destroy_x_image P_ ((XImagePtr ximg)); 483static void x_destroy_x_image (XImagePtr ximg);
484 484
485 485
486/* Create a mask of a bitmap. Note is this not a perfect mask. 486/* Create a mask of a bitmap. Note is this not a perfect mask.
@@ -619,13 +619,13 @@ Lisp_Object Vimage_cache_eviction_delay;
619 619
620/* Function prototypes. */ 620/* Function prototypes. */
621 621
622static Lisp_Object define_image_type P_ ((struct image_type *type, int loaded)); 622static Lisp_Object define_image_type (struct image_type *type, int loaded);
623static struct image_type *lookup_image_type P_ ((Lisp_Object symbol)); 623static struct image_type *lookup_image_type (Lisp_Object symbol);
624static void image_error P_ ((char *format, Lisp_Object, Lisp_Object)); 624static void image_error (char *format, Lisp_Object, Lisp_Object);
625static void x_laplace P_ ((struct frame *, struct image *)); 625static void x_laplace (struct frame *, struct image *);
626static void x_emboss P_ ((struct frame *, struct image *)); 626static void x_emboss (struct frame *, struct image *);
627static int x_build_heuristic_mask P_ ((struct frame *, struct image *, 627static int x_build_heuristic_mask (struct frame *, struct image *,
628 Lisp_Object)); 628 Lisp_Object);
629 629
630#define CACHE_IMAGE_TYPE(type, status) \ 630#define CACHE_IMAGE_TYPE(type, status) \
631 do { Vimage_type_cache = Fcons (Fcons (type, status), Vimage_type_cache); } while (0) 631 do { Vimage_type_cache = Fcons (Fcons (type, status), Vimage_type_cache); } while (0)
@@ -776,9 +776,9 @@ struct image_keyword
776}; 776};
777 777
778 778
779static int parse_image_spec P_ ((Lisp_Object, struct image_keyword *, 779static int parse_image_spec (Lisp_Object, struct image_keyword *,
780 int, Lisp_Object)); 780 int, Lisp_Object);
781static Lisp_Object image_spec_value P_ ((Lisp_Object, Lisp_Object, int *)); 781static Lisp_Object image_spec_value (Lisp_Object, Lisp_Object, int *);
782 782
783 783
784/* Parse image spec SPEC according to KEYWORDS. A valid image spec 784/* Parse image spec SPEC according to KEYWORDS. A valid image spec
@@ -1037,9 +1037,9 @@ or omitted means use the selected frame. */)
1037 Image type independent image structures 1037 Image type independent image structures
1038 ***********************************************************************/ 1038 ***********************************************************************/
1039 1039
1040static struct image *make_image P_ ((Lisp_Object spec, unsigned hash)); 1040static struct image *make_image (Lisp_Object spec, unsigned hash);
1041static void free_image P_ ((struct frame *f, struct image *img)); 1041static void free_image (struct frame *f, struct image *img);
1042static int check_image_size P_ ((struct frame *f, int width, int height)); 1042static int check_image_size (struct frame *f, int width, int height);
1043 1043
1044#define MAX_IMAGE_SIZE 6.0 1044#define MAX_IMAGE_SIZE 6.0
1045Lisp_Object Vmax_image_size; 1045Lisp_Object Vmax_image_size;
@@ -1371,13 +1371,13 @@ image_background_transparent (img, f, mask)
1371 Helper functions for X image types 1371 Helper functions for X image types
1372 ***********************************************************************/ 1372 ***********************************************************************/
1373 1373
1374static void x_clear_image_1 P_ ((struct frame *, struct image *, int, 1374static void x_clear_image_1 (struct frame *, struct image *, int,
1375 int, int)); 1375 int, int);
1376static void x_clear_image P_ ((struct frame *f, struct image *img)); 1376static void x_clear_image (struct frame *f, struct image *img);
1377static unsigned long x_alloc_image_color P_ ((struct frame *f, 1377static unsigned long x_alloc_image_color (struct frame *f,
1378 struct image *img, 1378 struct image *img,
1379 Lisp_Object color_name, 1379 Lisp_Object color_name,
1380 unsigned long dflt)); 1380 unsigned long dflt);
1381 1381
1382 1382
1383/* Clear X resources of image IMG on frame F. PIXMAP_P non-zero means 1383/* 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)
1472 Image Cache 1472 Image Cache
1473 ***********************************************************************/ 1473 ***********************************************************************/
1474 1474
1475static struct image *search_image_cache P_ ((struct frame *, Lisp_Object, unsigned)); 1475static struct image *search_image_cache (struct frame *, Lisp_Object, unsigned);
1476static void cache_image P_ ((struct frame *f, struct image *img)); 1476static void cache_image (struct frame *f, struct image *img);
1477static void postprocess_image P_ ((struct frame *, struct image *)); 1477static void postprocess_image (struct frame *, struct image *);
1478 1478
1479/* Return a new, initialized image cache that is allocated from the 1479/* Return a new, initialized image cache that is allocated from the
1480 heap. Call free_image_cache to free an image cache. */ 1480 heap. Call free_image_cache to free an image cache. */
@@ -2033,10 +2033,10 @@ w32_delayed_load (Lisp_Object libraries, Lisp_Object type)
2033 2033
2034#endif /* HAVE_NTGUI */ 2034#endif /* HAVE_NTGUI */
2035 2035
2036static int x_create_x_image_and_pixmap P_ ((struct frame *, int, int, int, 2036static int x_create_x_image_and_pixmap (struct frame *, int, int, int,
2037 XImagePtr *, Pixmap *)); 2037 XImagePtr *, Pixmap *);
2038static void x_destroy_x_image P_ ((XImagePtr)); 2038static void x_destroy_x_image (XImagePtr);
2039static void x_put_x_image P_ ((struct frame *, XImagePtr, Pixmap, int, int)); 2039static void x_put_x_image (struct frame *, XImagePtr, Pixmap, int, int);
2040 2040
2041 2041
2042/* Create an XImage and a pixmap of size WIDTH x HEIGHT for use on 2042/* 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)
2253 File Handling 2253 File Handling
2254 ***********************************************************************/ 2254 ***********************************************************************/
2255 2255
2256static unsigned char *slurp_file P_ ((char *, int *)); 2256static unsigned char *slurp_file (char *, int *);
2257 2257
2258 2258
2259/* Find image file FILE. Look in data-directory/images, then 2259/* Find image file FILE. Look in data-directory/images, then
@@ -2333,15 +2333,15 @@ slurp_file (file, size)
2333 XBM images 2333 XBM images
2334 ***********************************************************************/ 2334 ***********************************************************************/
2335 2335
2336static int xbm_scan P_ ((unsigned char **, unsigned char *, char *, int *)); 2336static int xbm_scan (unsigned char **, unsigned char *, char *, int *);
2337static int xbm_load P_ ((struct frame *f, struct image *img)); 2337static int xbm_load (struct frame *f, struct image *img);
2338static int xbm_load_image P_ ((struct frame *f, struct image *img, 2338static int xbm_load_image (struct frame *f, struct image *img,
2339 unsigned char *, unsigned char *)); 2339 unsigned char *, unsigned char *);
2340static int xbm_image_p P_ ((Lisp_Object object)); 2340static int xbm_image_p (Lisp_Object object);
2341static int xbm_read_bitmap_data P_ ((struct frame *f, 2341static int xbm_read_bitmap_data (struct frame *f,
2342 unsigned char *, unsigned char *, 2342 unsigned char *, unsigned char *,
2343 int *, int *, unsigned char **, int)); 2343 int *, int *, unsigned char **, int);
2344static int xbm_file_p P_ ((Lisp_Object)); 2344static int xbm_file_p (Lisp_Object);
2345 2345
2346 2346
2347/* Indices of image specification fields in xbm_format, below. */ 2347/* Indices of image specification fields in xbm_format, below. */
@@ -3114,9 +3114,9 @@ xbm_load (f, img)
3114 3114
3115#if defined (HAVE_XPM) || defined (HAVE_NS) 3115#if defined (HAVE_XPM) || defined (HAVE_NS)
3116 3116
3117static int xpm_image_p P_ ((Lisp_Object object)); 3117static int xpm_image_p (Lisp_Object object);
3118static int xpm_load P_ ((struct frame *f, struct image *img)); 3118static int xpm_load (struct frame *f, struct image *img);
3119static int xpm_valid_color_symbols_p P_ ((Lisp_Object)); 3119static int xpm_valid_color_symbols_p (Lisp_Object);
3120 3120
3121#endif /* HAVE_XPM || HAVE_NS */ 3121#endif /* HAVE_XPM || HAVE_NS */
3122 3122
@@ -3207,12 +3207,12 @@ static struct image_type xpm_type =
3207 3207
3208#ifdef ALLOC_XPM_COLORS 3208#ifdef ALLOC_XPM_COLORS
3209 3209
3210static void xpm_init_color_cache P_ ((struct frame *, XpmAttributes *)); 3210static void xpm_init_color_cache (struct frame *, XpmAttributes *);
3211static void xpm_free_color_cache P_ ((void)); 3211static void xpm_free_color_cache (void);
3212static int xpm_lookup_color P_ ((struct frame *, char *, XColor *)); 3212static int xpm_lookup_color (struct frame *, char *, XColor *);
3213static int xpm_color_bucket P_ ((char *)); 3213static int xpm_color_bucket (char *);
3214static struct xpm_cached_color *xpm_cache_color P_ ((struct frame *, char *, 3214static struct xpm_cached_color *xpm_cache_color (struct frame *, char *,
3215 XColor *, int)); 3215 XColor *, int);
3216 3216
3217/* An entry in a hash table used to cache color definitions of named 3217/* An entry in a hash table used to cache color definitions of named
3218 colors. This cache is necessary to speed up XPM image loading in 3218 colors. This cache is necessary to speed up XPM image loading in
@@ -3752,25 +3752,25 @@ xpm_load (f, img)
3752/* XPM support functions for NS where libxpm is not available. 3752/* XPM support functions for NS where libxpm is not available.
3753 Only XPM version 3 (without any extensions) is supported. */ 3753 Only XPM version 3 (without any extensions) is supported. */
3754 3754
3755static int xpm_scan P_ ((const unsigned char **, const unsigned char *, 3755static int xpm_scan (const unsigned char **, const unsigned char *,
3756 const unsigned char **, int *)); 3756 const unsigned char **, int *);
3757static Lisp_Object xpm_make_color_table_v 3757static Lisp_Object xpm_make_color_table_v
3758 P_ ((void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object), 3758 (void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object),
3759 Lisp_Object (**) (Lisp_Object, const unsigned char *, int))); 3759 Lisp_Object (**) (Lisp_Object, const unsigned char *, int));
3760static void xpm_put_color_table_v P_ ((Lisp_Object, const unsigned char *, 3760static void xpm_put_color_table_v (Lisp_Object, const unsigned char *,
3761 int, Lisp_Object)); 3761 int, Lisp_Object);
3762static Lisp_Object xpm_get_color_table_v P_ ((Lisp_Object, 3762static Lisp_Object xpm_get_color_table_v (Lisp_Object,
3763 const unsigned char *, int)); 3763 const unsigned char *, int);
3764static Lisp_Object xpm_make_color_table_h 3764static Lisp_Object xpm_make_color_table_h
3765 P_ ((void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object), 3765 (void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object),
3766 Lisp_Object (**) (Lisp_Object, const unsigned char *, int))); 3766 Lisp_Object (**) (Lisp_Object, const unsigned char *, int));
3767static void xpm_put_color_table_h P_ ((Lisp_Object, const unsigned char *, 3767static void xpm_put_color_table_h (Lisp_Object, const unsigned char *,
3768 int, Lisp_Object)); 3768 int, Lisp_Object);
3769static Lisp_Object xpm_get_color_table_h P_ ((Lisp_Object, 3769static Lisp_Object xpm_get_color_table_h (Lisp_Object,
3770 const unsigned char *, int)); 3770 const unsigned char *, int);
3771static int xpm_str_to_color_key P_ ((const char *)); 3771static int xpm_str_to_color_key (const char *);
3772static int xpm_load_image P_ ((struct frame *, struct image *, 3772static int xpm_load_image (struct frame *, struct image *,
3773 const unsigned char *, const unsigned char *)); 3773 const unsigned char *, const unsigned char *);
3774 3774
3775/* Tokens returned from xpm_scan. */ 3775/* Tokens returned from xpm_scan. */
3776 3776
@@ -4515,9 +4515,9 @@ init_color_table ()
4515 Algorithms 4515 Algorithms
4516 ***********************************************************************/ 4516 ***********************************************************************/
4517 4517
4518static XColor *x_to_xcolors P_ ((struct frame *, struct image *, int)); 4518static XColor *x_to_xcolors (struct frame *, struct image *, int);
4519static void x_from_xcolors P_ ((struct frame *, struct image *, XColor *)); 4519static void x_from_xcolors (struct frame *, struct image *, XColor *);
4520static void x_detect_edges P_ ((struct frame *, struct image *, int[9], int)); 4520static void x_detect_edges (struct frame *, struct image *, int[9], int);
4521 4521
4522#ifdef HAVE_NTGUI 4522#ifdef HAVE_NTGUI
4523static void XPutPixel (XImagePtr , int, int, COLORREF); 4523static void XPutPixel (XImagePtr , int, int, COLORREF);
@@ -5087,9 +5087,9 @@ x_build_heuristic_mask (f, img, how)
5087 PBM (mono, gray, color) 5087 PBM (mono, gray, color)
5088 ***********************************************************************/ 5088 ***********************************************************************/
5089 5089
5090static int pbm_image_p P_ ((Lisp_Object object)); 5090static int pbm_image_p (Lisp_Object object);
5091static int pbm_load P_ ((struct frame *f, struct image *img)); 5091static int pbm_load (struct frame *f, struct image *img);
5092static int pbm_scan_number P_ ((unsigned char **, unsigned char *)); 5092static int pbm_scan_number (unsigned char **, unsigned char *);
5093 5093
5094/* The symbol `pbm' identifying images of this type. */ 5094/* The symbol `pbm' identifying images of this type. */
5095 5095
@@ -5511,8 +5511,8 @@ pbm_load (f, img)
5511 5511
5512/* Function prototypes. */ 5512/* Function prototypes. */
5513 5513
5514static int png_image_p P_ ((Lisp_Object object)); 5514static int png_image_p (Lisp_Object object);
5515static int png_load P_ ((struct frame *f, struct image *img)); 5515static int png_load (struct frame *f, struct image *img);
5516 5516
5517/* The symbol `png' identifying images of this type. */ 5517/* The symbol `png' identifying images of this type. */
5518 5518
@@ -6113,8 +6113,8 @@ png_load (struct frame *f, struct image *img)
6113 6113
6114#if defined (HAVE_JPEG) || defined (HAVE_NS) 6114#if defined (HAVE_JPEG) || defined (HAVE_NS)
6115 6115
6116static int jpeg_image_p P_ ((Lisp_Object object)); 6116static int jpeg_image_p (Lisp_Object object);
6117static int jpeg_load P_ ((struct frame *f, struct image *img)); 6117static int jpeg_load (struct frame *f, struct image *img);
6118 6118
6119/* The symbol `jpeg' identifying images of this type. */ 6119/* The symbol `jpeg' identifying images of this type. */
6120 6120
@@ -6685,8 +6685,8 @@ jpeg_load (struct frame *f, struct image *img)
6685 6685
6686#if defined (HAVE_TIFF) || defined (HAVE_NS) 6686#if defined (HAVE_TIFF) || defined (HAVE_NS)
6687 6687
6688static int tiff_image_p P_ ((Lisp_Object object)); 6688static int tiff_image_p (Lisp_Object object);
6689static int tiff_load P_ ((struct frame *f, struct image *img)); 6689static int tiff_load (struct frame *f, struct image *img);
6690 6690
6691/* The symbol `tiff' identifying images of this type. */ 6691/* The symbol `tiff' identifying images of this type. */
6692 6692
@@ -7136,9 +7136,9 @@ tiff_load (struct frame *f, struct image *img)
7136 7136
7137#if defined (HAVE_GIF) || defined (HAVE_NS) 7137#if defined (HAVE_GIF) || defined (HAVE_NS)
7138 7138
7139static int gif_image_p P_ ((Lisp_Object object)); 7139static int gif_image_p (Lisp_Object object);
7140static int gif_load P_ ((struct frame *f, struct image *img)); 7140static int gif_load (struct frame *f, struct image *img);
7141static void gif_clear_image P_ ((struct frame *f, struct image *img)); 7141static void gif_clear_image (struct frame *f, struct image *img);
7142 7142
7143/* The symbol `gif' identifying images of this type. */ 7143/* The symbol `gif' identifying images of this type. */
7144 7144
@@ -7576,11 +7576,11 @@ gif_load (struct frame *f, struct image *img)
7576 7576
7577/* Function prototypes. */ 7577/* Function prototypes. */
7578 7578
7579static int svg_image_p P_ ((Lisp_Object object)); 7579static int svg_image_p (Lisp_Object object);
7580static int svg_load P_ ((struct frame *f, struct image *img)); 7580static int svg_load (struct frame *f, struct image *img);
7581 7581
7582static int svg_load_image P_ ((struct frame *, struct image *, 7582static int svg_load_image (struct frame *, struct image *,
7583 unsigned char *, unsigned int)); 7583 unsigned char *, unsigned int);
7584 7584
7585/* The symbol `svg' identifying images of this type. */ 7585/* The symbol `svg' identifying images of this type. */
7586 7586
@@ -7982,9 +7982,9 @@ Lisp_Object Qpostscript;
7982 7982
7983#ifdef HAVE_GHOSTSCRIPT 7983#ifdef HAVE_GHOSTSCRIPT
7984 7984
7985static int gs_image_p P_ ((Lisp_Object object)); 7985static int gs_image_p (Lisp_Object object);
7986static int gs_load P_ ((struct frame *f, struct image *img)); 7986static int gs_load (struct frame *f, struct image *img);
7987static void gs_clear_image P_ ((struct frame *f, struct image *img)); 7987static void gs_clear_image (struct frame *f, struct image *img);
7988 7988
7989/* Keyword symbols. */ 7989/* Keyword symbols. */
7990 7990
diff --git a/src/indent.c b/src/indent.c
index b64eae1c429..de0026fe103 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -61,8 +61,8 @@ EMACS_INT last_known_column_point;
61 61
62static int last_known_column_modified; 62static int last_known_column_modified;
63 63
64static double current_column_1 P_ ((void)); 64static double current_column_1 (void);
65static double position_indentation P_ ((int)); 65static double position_indentation (int);
66 66
67/* Cache of beginning of line found by the last call of 67/* Cache of beginning of line found by the last call of
68 current_column. */ 68 current_column. */
@@ -867,7 +867,7 @@ The return value is COLUMN. */)
867} 867}
868 868
869 869
870static double position_indentation P_ ((int)); 870static double position_indentation (int);
871 871
872DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation, 872DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
873 0, 0, 0, 873 0, 0, 0,
diff --git a/src/intervals.c b/src/intervals.c
index 9836f763489..4f12d711bf5 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/>. */
53#define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set)) 53#define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set))
54 54
55Lisp_Object merge_properties_sticky (); 55Lisp_Object merge_properties_sticky ();
56static INTERVAL reproduce_tree P_ ((INTERVAL, INTERVAL)); 56static INTERVAL reproduce_tree (INTERVAL, INTERVAL);
57static INTERVAL reproduce_tree_obj P_ ((INTERVAL, Lisp_Object)); 57static INTERVAL reproduce_tree_obj (INTERVAL, Lisp_Object);
58 58
59/* Utility functions for intervals. */ 59/* Utility functions for intervals. */
60 60
@@ -208,7 +208,7 @@ intervals_equal (i0, i1)
208void 208void
209traverse_intervals_noorder (tree, function, arg) 209traverse_intervals_noorder (tree, function, arg)
210 INTERVAL tree; 210 INTERVAL tree;
211 void (* function) P_ ((INTERVAL, Lisp_Object)); 211 void (* function) (INTERVAL, Lisp_Object);
212 Lisp_Object arg; 212 Lisp_Object arg;
213{ 213{
214 /* Minimize stack usage. */ 214 /* Minimize stack usage. */
@@ -232,7 +232,7 @@ void
232traverse_intervals (tree, position, function, arg) 232traverse_intervals (tree, position, function, arg)
233 INTERVAL tree; 233 INTERVAL tree;
234 int position; 234 int position;
235 void (* function) P_ ((INTERVAL, Lisp_Object)); 235 void (* function) (INTERVAL, Lisp_Object);
236 Lisp_Object arg; 236 Lisp_Object arg;
237{ 237{
238 while (!NULL_INTERVAL_P (tree)) 238 while (!NULL_INTERVAL_P (tree))
diff --git a/src/keyboard.c b/src/keyboard.c
index 63372d600e3..d7e01af0bc4 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -613,39 +613,39 @@ Lisp_Object Venable_disabled_menus_and_buttons;
613/* Function for init_keyboard to call with no args (if nonzero). */ 613/* Function for init_keyboard to call with no args (if nonzero). */
614void (*keyboard_init_hook) (); 614void (*keyboard_init_hook) ();
615 615
616static int read_avail_input P_ ((int)); 616static int read_avail_input (int);
617static void get_input_pending P_ ((int *, int)); 617static void get_input_pending (int *, int);
618static int readable_events P_ ((int)); 618static int readable_events (int);
619static Lisp_Object read_char_x_menu_prompt P_ ((int, Lisp_Object *, 619static Lisp_Object read_char_x_menu_prompt (int, Lisp_Object *,
620 Lisp_Object, int *)); 620 Lisp_Object, int *);
621static Lisp_Object read_char_x_menu_prompt (); 621static Lisp_Object read_char_x_menu_prompt ();
622static Lisp_Object read_char_minibuf_menu_prompt P_ ((int, int, 622static Lisp_Object read_char_minibuf_menu_prompt (int, int,
623 Lisp_Object *)); 623 Lisp_Object *);
624static Lisp_Object make_lispy_event P_ ((struct input_event *)); 624static Lisp_Object make_lispy_event (struct input_event *);
625#if defined (HAVE_MOUSE) || defined (HAVE_GPM) 625#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
626static Lisp_Object make_lispy_movement P_ ((struct frame *, Lisp_Object, 626static Lisp_Object make_lispy_movement (struct frame *, Lisp_Object,
627 enum scroll_bar_part, 627 enum scroll_bar_part,
628 Lisp_Object, Lisp_Object, 628 Lisp_Object, Lisp_Object,
629 unsigned long)); 629 unsigned long);
630#endif 630#endif
631static Lisp_Object modify_event_symbol P_ ((int, unsigned, Lisp_Object, 631static Lisp_Object modify_event_symbol (int, unsigned, Lisp_Object,
632 Lisp_Object, char **, 632 Lisp_Object, char **,
633 Lisp_Object *, unsigned)); 633 Lisp_Object *, unsigned);
634static Lisp_Object make_lispy_switch_frame P_ ((Lisp_Object)); 634static Lisp_Object make_lispy_switch_frame (Lisp_Object);
635static void save_getcjmp P_ ((jmp_buf)); 635static void save_getcjmp (jmp_buf);
636static void save_getcjmp (); 636static void save_getcjmp ();
637static void restore_getcjmp P_ ((jmp_buf)); 637static void restore_getcjmp (jmp_buf);
638static Lisp_Object apply_modifiers P_ ((int, Lisp_Object)); 638static Lisp_Object apply_modifiers (int, Lisp_Object);
639static void clear_event P_ ((struct input_event *)); 639static void clear_event (struct input_event *);
640static Lisp_Object restore_kboard_configuration P_ ((Lisp_Object)); 640static Lisp_Object restore_kboard_configuration (Lisp_Object);
641static SIGTYPE interrupt_signal P_ ((int signalnum)); 641static SIGTYPE interrupt_signal (int signalnum);
642static void handle_interrupt P_ ((void)); 642static void handle_interrupt (void);
643static void timer_start_idle P_ ((void)); 643static void timer_start_idle (void);
644static void timer_stop_idle P_ ((void)); 644static void timer_stop_idle (void);
645static void timer_resume_idle P_ ((void)); 645static void timer_resume_idle (void);
646static SIGTYPE handle_user_signal P_ ((int)); 646static SIGTYPE handle_user_signal (int);
647static char *find_user_signal_name P_ ((int)); 647static char *find_user_signal_name (int);
648static int store_user_signal_events P_ ((void)); 648static int store_user_signal_events (void);
649 649
650/* Nonzero means don't try to suspend even if the operating system seems 650/* Nonzero means don't try to suspend even if the operating system seems
651 to support it. */ 651 to support it. */
@@ -1499,10 +1499,10 @@ some_mouse_moved ()
1499/* This is the actual command reading loop, 1499/* This is the actual command reading loop,
1500 sans error-handling encapsulation. */ 1500 sans error-handling encapsulation. */
1501 1501
1502static int read_key_sequence P_ ((Lisp_Object *, int, Lisp_Object, 1502static int read_key_sequence (Lisp_Object *, int, Lisp_Object,
1503 int, int, int)); 1503 int, int, int);
1504void safe_run_hooks P_ ((Lisp_Object)); 1504void safe_run_hooks (Lisp_Object);
1505static void adjust_point_for_property P_ ((int, int)); 1505static void adjust_point_for_property (int, int);
1506 1506
1507/* Cancel hourglass from protect_unwind. 1507/* Cancel hourglass from protect_unwind.
1508 ARG is not used. */ 1508 ARG is not used. */
@@ -1862,7 +1862,7 @@ extern Lisp_Object Qcomposition, Qdisplay;
1862 LAST_PT is the last position of point. */ 1862 LAST_PT is the last position of point. */
1863 1863
1864extern Lisp_Object Qafter_string, Qbefore_string; 1864extern Lisp_Object Qafter_string, Qbefore_string;
1865extern Lisp_Object get_pos_property P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); 1865extern Lisp_Object get_pos_property (Lisp_Object, Lisp_Object, Lisp_Object);
1866 1866
1867static void 1867static void
1868adjust_point_for_property (last_pt, modified) 1868adjust_point_for_property (last_pt, modified)
@@ -7509,7 +7509,7 @@ store_user_signal_events ()
7509} 7509}
7510 7510
7511 7511
7512static void menu_bar_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, void*)); 7512static void menu_bar_item (Lisp_Object, Lisp_Object, Lisp_Object, void*);
7513static Lisp_Object menu_bar_one_keymap_changed_items; 7513static Lisp_Object menu_bar_one_keymap_changed_items;
7514 7514
7515/* These variables hold the vector under construction within 7515/* These variables hold the vector under construction within
@@ -8077,10 +8077,10 @@ Lisp_Object Qrtl;
8077 8077
8078/* Function prototypes. */ 8078/* Function prototypes. */
8079 8079
8080static void init_tool_bar_items P_ ((Lisp_Object)); 8080static void init_tool_bar_items (Lisp_Object);
8081static void process_tool_bar_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, void*)); 8081static void process_tool_bar_item (Lisp_Object, Lisp_Object, Lisp_Object, void*);
8082static int parse_tool_bar_item P_ ((Lisp_Object, Lisp_Object)); 8082static int parse_tool_bar_item (Lisp_Object, Lisp_Object);
8083static void append_tool_bar_item P_ ((void)); 8083static void append_tool_bar_item (void);
8084 8084
8085 8085
8086/* Return a vector of tool bar items for keymaps currently in effect. 8086/* 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. */)
10876 reset_all_sys_modes (); 10876 reset_all_sys_modes ();
10877 /* sys_suspend can get an error if it tries to fork a subshell 10877 /* sys_suspend can get an error if it tries to fork a subshell
10878 and the system resources aren't available for that. */ 10878 and the system resources aren't available for that. */
10879 record_unwind_protect ((Lisp_Object (*) P_ ((Lisp_Object))) init_all_sys_modes, 10879 record_unwind_protect ((Lisp_Object (*) (Lisp_Object)) init_all_sys_modes,
10880 Qnil); 10880 Qnil);
10881 stuff_buffered_input (stuffstring); 10881 stuff_buffered_input (stuffstring);
10882 if (cannot_suspend) 10882 if (cannot_suspend)
diff --git a/src/keymap.c b/src/keymap.c
index c3a9d9e5cc0..3aeeb1afc05 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -115,20 +115,20 @@ static Lisp_Object where_is_cache;
115/* Which keymaps are reverse-stored in the cache. */ 115/* Which keymaps are reverse-stored in the cache. */
116static Lisp_Object where_is_cache_keymaps; 116static Lisp_Object where_is_cache_keymaps;
117 117
118static Lisp_Object store_in_keymap P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); 118static Lisp_Object store_in_keymap (Lisp_Object, Lisp_Object, Lisp_Object);
119static void fix_submap_inheritance P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); 119static void fix_submap_inheritance (Lisp_Object, Lisp_Object, Lisp_Object);
120 120
121static Lisp_Object define_as_prefix P_ ((Lisp_Object, Lisp_Object)); 121static Lisp_Object define_as_prefix (Lisp_Object, Lisp_Object);
122static void describe_command P_ ((Lisp_Object, Lisp_Object)); 122static void describe_command (Lisp_Object, Lisp_Object);
123static void describe_translation P_ ((Lisp_Object, Lisp_Object)); 123static void describe_translation (Lisp_Object, Lisp_Object);
124static void describe_map P_ ((Lisp_Object, Lisp_Object, 124static void describe_map (Lisp_Object, Lisp_Object,
125 void (*) P_ ((Lisp_Object, Lisp_Object)), 125 void (*) (Lisp_Object, Lisp_Object),
126 int, Lisp_Object, Lisp_Object*, int, int)); 126 int, Lisp_Object, Lisp_Object*, int, int);
127static void describe_vector P_ ((Lisp_Object, Lisp_Object, Lisp_Object, 127static void describe_vector (Lisp_Object, Lisp_Object, Lisp_Object,
128 void (*) (Lisp_Object, Lisp_Object), int, 128 void (*) (Lisp_Object, Lisp_Object), int,
129 Lisp_Object, Lisp_Object, int *, 129 Lisp_Object, Lisp_Object, int *,
130 int, int, int)); 130 int, int, int);
131static void silly_event_symbol_error P_ ((Lisp_Object)); 131static void silly_event_symbol_error (Lisp_Object);
132 132
133/* Keymap object support - constructors and predicates. */ 133/* Keymap object support - constructors and predicates. */
134 134
@@ -2643,8 +2643,8 @@ preferred_sequence_p (seq)
2643 2643
2644/* where-is - finding a command in a set of keymaps. */ 2644/* where-is - finding a command in a set of keymaps. */
2645 2645
2646static void where_is_internal_1 P_ ((Lisp_Object key, Lisp_Object binding, 2646static void where_is_internal_1 (Lisp_Object key, Lisp_Object binding,
2647 Lisp_Object args, void *data)); 2647 Lisp_Object args, void *data);
2648 2648
2649/* Like Flookup_key, but uses a list of keymaps SHADOW instead of a single map. 2649/* Like Flookup_key, but uses a list of keymaps SHADOW instead of a single map.
2650 Returns the first non-nil binding found in any of those maps. 2650 Returns the first non-nil binding found in any of those maps.
@@ -3440,7 +3440,7 @@ describe_map (map, prefix, elt_describer, partial, shadow,
3440 seen, nomenu, mention_shadow) 3440 seen, nomenu, mention_shadow)
3441 register Lisp_Object map; 3441 register Lisp_Object map;
3442 Lisp_Object prefix; 3442 Lisp_Object prefix;
3443 void (*elt_describer) P_ ((Lisp_Object, Lisp_Object)); 3443 void (*elt_describer) (Lisp_Object, Lisp_Object);
3444 int partial; 3444 int partial;
3445 Lisp_Object shadow; 3445 Lisp_Object shadow;
3446 Lisp_Object *seen; 3446 Lisp_Object *seen;
@@ -3692,7 +3692,7 @@ describe_vector (vector, prefix, args, elt_describer,
3692 mention_shadow) 3692 mention_shadow)
3693 register Lisp_Object vector; 3693 register Lisp_Object vector;
3694 Lisp_Object prefix, args; 3694 Lisp_Object prefix, args;
3695 void (*elt_describer) P_ ((Lisp_Object, Lisp_Object)); 3695 void (*elt_describer) (Lisp_Object, Lisp_Object);
3696 int partial; 3696 int partial;
3697 Lisp_Object shadow; 3697 Lisp_Object shadow;
3698 Lisp_Object entire_map; 3698 Lisp_Object entire_map;
diff --git a/src/lisp.h b/src/lisp.h
index f2867a53e64..2b25e153d30 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/>. */
21#ifndef EMACS_LISP_H 21#ifndef EMACS_LISP_H
22#define EMACS_LISP_H 22#define EMACS_LISP_H
23 23
24/* Declare the prototype for a general external function. */
25#define P_(proto) proto
26
27/* Use the configure flag --enable-checking[=LIST] to enable various 24/* Use the configure flag --enable-checking[=LIST] to enable various
28 types of run time checks for Lisp objects. */ 25 types of run time checks for Lisp objects. */
29 26
diff --git a/src/lread.c b/src/lread.c
index c73f7f32e51..16efd7114ea 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -219,18 +219,18 @@ int force_load_messages;
219 219
220static Lisp_Object Vbytecomp_version_regexp; 220static Lisp_Object Vbytecomp_version_regexp;
221 221
222static int read_emacs_mule_char P_ ((int, int (*) (int, Lisp_Object), 222static int read_emacs_mule_char (int, int (*) (int, Lisp_Object),
223 Lisp_Object)); 223 Lisp_Object);
224 224
225static void readevalloop P_ ((Lisp_Object, FILE*, Lisp_Object, 225static void readevalloop (Lisp_Object, FILE*, Lisp_Object,
226 Lisp_Object (*) (), int, 226 Lisp_Object (*) (), int,
227 Lisp_Object, Lisp_Object, 227 Lisp_Object, Lisp_Object,
228 Lisp_Object, Lisp_Object)); 228 Lisp_Object, Lisp_Object);
229static Lisp_Object load_unwind P_ ((Lisp_Object)); 229static Lisp_Object load_unwind (Lisp_Object);
230static Lisp_Object load_descriptor_unwind P_ ((Lisp_Object)); 230static Lisp_Object load_descriptor_unwind (Lisp_Object);
231 231
232static void invalid_syntax P_ ((const char *, int)) NO_RETURN; 232static void invalid_syntax (const char *, int) NO_RETURN;
233static void end_of_file_error P_ (()) NO_RETURN; 233static void end_of_file_error () NO_RETURN;
234 234
235 235
236/* Functions that read one byte from the current source READCHARFUN 236/* Functions that read one byte from the current source READCHARFUN
@@ -239,9 +239,9 @@ static void end_of_file_error P_ (()) NO_RETURN;
239 is 0 or positive, it unreads C, and the return value is not 239 is 0 or positive, it unreads C, and the return value is not
240 interesting. */ 240 interesting. */
241 241
242static int readbyte_for_lambda P_ ((int, Lisp_Object)); 242static int readbyte_for_lambda (int, Lisp_Object);
243static int readbyte_from_file P_ ((int, Lisp_Object)); 243static int readbyte_from_file (int, Lisp_Object);
244static int readbyte_from_string P_ ((int, Lisp_Object)); 244static int readbyte_from_string (int, Lisp_Object);
245 245
246/* Handle unreading and rereading of characters. 246/* Handle unreading and rereading of characters.
247 Write READCHAR to read a character, 247 Write READCHAR to read a character,
@@ -268,7 +268,7 @@ readchar (readcharfun, multibyte)
268{ 268{
269 Lisp_Object tem; 269 Lisp_Object tem;
270 register int c; 270 register int c;
271 int (*readbyte) P_ ((int, Lisp_Object)); 271 int (*readbyte) (int, Lisp_Object);
272 unsigned char buf[MAX_MULTIBYTE_LENGTH]; 272 unsigned char buf[MAX_MULTIBYTE_LENGTH];
273 int i, len; 273 int i, len;
274 int emacs_mule_encoding = 0; 274 int emacs_mule_encoding = 0;
@@ -575,7 +575,7 @@ extern char emacs_mule_bytes[256];
575static int 575static int
576read_emacs_mule_char (c, readbyte, readcharfun) 576read_emacs_mule_char (c, readbyte, readcharfun)
577 int c; 577 int c;
578 int (*readbyte) P_ ((int, Lisp_Object)); 578 int (*readbyte) (int, Lisp_Object);
579 Lisp_Object readcharfun; 579 Lisp_Object readcharfun;
580{ 580{
581 /* Emacs-mule coding uses at most 4-byte for one character. */ 581 /* Emacs-mule coding uses at most 4-byte for one character. */
@@ -635,19 +635,19 @@ read_emacs_mule_char (c, readbyte, readcharfun)
635} 635}
636 636
637 637
638static Lisp_Object read_internal_start P_ ((Lisp_Object, Lisp_Object, 638static Lisp_Object read_internal_start (Lisp_Object, Lisp_Object,
639 Lisp_Object)); 639 Lisp_Object);
640static Lisp_Object read0 P_ ((Lisp_Object)); 640static Lisp_Object read0 (Lisp_Object);
641static Lisp_Object read1 P_ ((Lisp_Object, int *, int)); 641static Lisp_Object read1 (Lisp_Object, int *, int);
642 642
643static Lisp_Object read_list P_ ((int, Lisp_Object)); 643static Lisp_Object read_list (int, Lisp_Object);
644static Lisp_Object read_vector P_ ((Lisp_Object, int)); 644static Lisp_Object read_vector (Lisp_Object, int);
645 645
646static Lisp_Object substitute_object_recurse P_ ((Lisp_Object, Lisp_Object, 646static Lisp_Object substitute_object_recurse (Lisp_Object, Lisp_Object,
647 Lisp_Object)); 647 Lisp_Object);
648static void substitute_object_in_subtree P_ ((Lisp_Object, 648static void substitute_object_in_subtree (Lisp_Object,
649 Lisp_Object)); 649 Lisp_Object);
650static void substitute_in_interval P_ ((INTERVAL, Lisp_Object)); 650static void substitute_in_interval (INTERVAL, Lisp_Object);
651 651
652 652
653/* Get a character from the tty. */ 653/* Get a character from the tty. */
@@ -3873,7 +3873,7 @@ hash_string (ptr, len)
3873void 3873void
3874map_obarray (obarray, fn, arg) 3874map_obarray (obarray, fn, arg)
3875 Lisp_Object obarray; 3875 Lisp_Object obarray;
3876 void (*fn) P_ ((Lisp_Object, Lisp_Object)); 3876 void (*fn) (Lisp_Object, Lisp_Object);
3877 Lisp_Object arg; 3877 Lisp_Object arg;
3878{ 3878{
3879 register int i; 3879 register int i;
diff --git a/src/marker.c b/src/marker.c
index b3381f9c369..354111d3081 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -32,7 +32,7 @@ static int cached_bytepos;
32static struct buffer *cached_buffer; 32static struct buffer *cached_buffer;
33static int cached_modiff; 33static int cached_modiff;
34 34
35static void byte_char_debug_check P_ ((struct buffer *, int, int)); 35static void byte_char_debug_check (struct buffer *, int, int);
36 36
37/* Nonzero means enable debugging checks on byte/char correspondences. */ 37/* Nonzero means enable debugging checks on byte/char correspondences. */
38 38
diff --git a/src/menu.c b/src/menu.c
index ca00c06a98b..55b1acb3fb9 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -272,8 +272,8 @@ struct skp
272 int notbuttons; 272 int notbuttons;
273 }; 273 };
274 274
275static void single_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, 275static void single_menu_item (Lisp_Object, Lisp_Object, Lisp_Object,
276 void *)); 276 void *);
277 277
278/* This is a recursive subroutine of keymap_panes. 278/* This is a recursive subroutine of keymap_panes.
279 It handles one keymap, KEYMAP. 279 It handles one keymap, KEYMAP.
@@ -1164,12 +1164,12 @@ no quit occurs and `x-popup-menu' returns nil. */)
1164 Lisp_Object bar_window; 1164 Lisp_Object bar_window;
1165 enum scroll_bar_part part; 1165 enum scroll_bar_part part;
1166 unsigned long time; 1166 unsigned long time;
1167 void (*mouse_position_hook) P_ ((struct frame **, int, 1167 void (*mouse_position_hook) (struct frame **, int,
1168 Lisp_Object *, 1168 Lisp_Object *,
1169 enum scroll_bar_part *, 1169 enum scroll_bar_part *,
1170 Lisp_Object *, 1170 Lisp_Object *,
1171 Lisp_Object *, 1171 Lisp_Object *,
1172 unsigned long *)) = 1172 unsigned long *) =
1173 FRAME_TERMINAL (new_f)->mouse_position_hook; 1173 FRAME_TERMINAL (new_f)->mouse_position_hook;
1174 1174
1175 if (mouse_position_hook) 1175 if (mouse_position_hook)
diff --git a/src/minibuf.c b/src/minibuf.c
index 539a953f7ee..412d2550df8 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -220,19 +220,19 @@ without invoking the usual minibuffer commands. */)
220 220
221/* Actual minibuffer invocation. */ 221/* Actual minibuffer invocation. */
222 222
223static Lisp_Object read_minibuf_unwind P_ ((Lisp_Object)); 223static Lisp_Object read_minibuf_unwind (Lisp_Object);
224static Lisp_Object run_exit_minibuf_hook P_ ((Lisp_Object)); 224static Lisp_Object run_exit_minibuf_hook (Lisp_Object);
225static Lisp_Object read_minibuf P_ ((Lisp_Object, Lisp_Object, 225static Lisp_Object read_minibuf (Lisp_Object, Lisp_Object,
226 Lisp_Object, Lisp_Object, 226 Lisp_Object, Lisp_Object,
227 int, Lisp_Object, 227 int, Lisp_Object,
228 Lisp_Object, Lisp_Object, 228 Lisp_Object, Lisp_Object,
229 int, int)); 229 int, int);
230static Lisp_Object read_minibuf_noninteractive P_ ((Lisp_Object, Lisp_Object, 230static Lisp_Object read_minibuf_noninteractive (Lisp_Object, Lisp_Object,
231 Lisp_Object, Lisp_Object, 231 Lisp_Object, Lisp_Object,
232 int, Lisp_Object, 232 int, Lisp_Object,
233 Lisp_Object, Lisp_Object, 233 Lisp_Object, Lisp_Object,
234 int, int)); 234 int, int);
235static Lisp_Object string_to_object P_ ((Lisp_Object, Lisp_Object)); 235static Lisp_Object string_to_object (Lisp_Object, Lisp_Object);
236 236
237 237
238/* Read a Lisp object from VAL and return it. If VAL is an empty 238/* 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 6d403e00fe0..dedd58b99e3 100644
--- a/src/print.c
+++ b/src/print.c
@@ -618,7 +618,7 @@ temp_output_buffer_setup (bufname)
618Lisp_Object 618Lisp_Object
619internal_with_output_to_temp_buffer (bufname, function, args) 619internal_with_output_to_temp_buffer (bufname, function, args)
620 const char *bufname; 620 const char *bufname;
621 Lisp_Object (*function) P_ ((Lisp_Object)); 621 Lisp_Object (*function) (Lisp_Object);
622 Lisp_Object args; 622 Lisp_Object args;
623{ 623{
624 int count = SPECPDL_INDEX (); 624 int count = SPECPDL_INDEX ();
diff --git a/src/process.c b/src/process.c
index 24f31220d0d..255803c92fd 100644
--- a/src/process.c
+++ b/src/process.c
@@ -285,11 +285,11 @@ static Lisp_Object Vprocess_adaptive_read_buffering;
285 285
286#include "sysselect.h" 286#include "sysselect.h"
287 287
288static int keyboard_bit_set P_ ((SELECT_TYPE *)); 288static int keyboard_bit_set (SELECT_TYPE *);
289static void deactivate_process P_ ((Lisp_Object)); 289static void deactivate_process (Lisp_Object);
290static void status_notify P_ ((struct Lisp_Process *)); 290static void status_notify (struct Lisp_Process *);
291static int read_process_output P_ ((Lisp_Object, int)); 291static int read_process_output (Lisp_Object, int);
292static void create_pty P_ ((Lisp_Object)); 292static void create_pty (Lisp_Object);
293 293
294/* If we support a window system, turn on the code to poll periodically 294/* If we support a window system, turn on the code to poll periodically
295 to detect C-g. It isn't actually used when doing interrupt input. */ 295 to detect C-g. It isn't actually used when doing interrupt input. */
diff --git a/src/scroll.c b/src/scroll.c
index e2d3656dc43..5363ec3be42 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -58,14 +58,14 @@ struct matrix_elt
58 unsigned char writecount; 58 unsigned char writecount;
59 }; 59 };
60 60
61static void do_direct_scrolling P_ ((struct frame *, 61static void do_direct_scrolling (struct frame *,
62 struct glyph_matrix *, 62 struct glyph_matrix *,
63 struct matrix_elt *, 63 struct matrix_elt *,
64 int, int)); 64 int, int);
65static void do_scrolling P_ ((struct frame *, 65static void do_scrolling (struct frame *,
66 struct glyph_matrix *, 66 struct glyph_matrix *,
67 struct matrix_elt *, 67 struct matrix_elt *,
68 int, int)); 68 int, int);
69 69
70 70
71/* Determine, in matrix[i,j], the cost of updating the first j old 71/* Determine, in matrix[i,j], the cost of updating the first j old
diff --git a/src/search.c b/src/search.c
index 736a89258f5..69db94e9f1a 100644
--- a/src/search.c
+++ b/src/search.c
@@ -98,18 +98,18 @@ Lisp_Object Vsearch_spaces_regexp;
98 only. */ 98 only. */
99Lisp_Object Vinhibit_changing_match_data; 99Lisp_Object Vinhibit_changing_match_data;
100 100
101static void set_search_regs P_ ((EMACS_INT, EMACS_INT)); 101static void set_search_regs (EMACS_INT, EMACS_INT);
102static void save_search_regs P_ ((void)); 102static void save_search_regs (void);
103static EMACS_INT simple_search P_ ((int, unsigned char *, int, int, 103static EMACS_INT simple_search (int, unsigned char *, int, int,
104 Lisp_Object, EMACS_INT, EMACS_INT, 104 Lisp_Object, EMACS_INT, EMACS_INT,
105 EMACS_INT, EMACS_INT)); 105 EMACS_INT, EMACS_INT);
106static EMACS_INT boyer_moore P_ ((int, unsigned char *, int, int, 106static EMACS_INT boyer_moore (int, unsigned char *, int, int,
107 Lisp_Object, Lisp_Object, 107 Lisp_Object, Lisp_Object,
108 EMACS_INT, EMACS_INT, 108 EMACS_INT, EMACS_INT,
109 EMACS_INT, EMACS_INT, int)); 109 EMACS_INT, EMACS_INT, int);
110static EMACS_INT search_buffer P_ ((Lisp_Object, EMACS_INT, EMACS_INT, 110static EMACS_INT search_buffer (Lisp_Object, EMACS_INT, EMACS_INT,
111 EMACS_INT, EMACS_INT, int, int, 111 EMACS_INT, EMACS_INT, int, int,
112 Lisp_Object, Lisp_Object, int)); 112 Lisp_Object, Lisp_Object, int);
113static void matcher_overflow () NO_RETURN; 113static void matcher_overflow () NO_RETURN;
114 114
115static void 115static void
diff --git a/src/sound.c b/src/sound.c
index af6daf2e268..b362fc8819e 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -115,10 +115,10 @@ enum sound_attr
115 SOUND_ATTR_SENTINEL 115 SOUND_ATTR_SENTINEL
116}; 116};
117 117
118static void alsa_sound_perror P_ ((char *, int)) NO_RETURN; 118static void alsa_sound_perror (char *, int) NO_RETURN;
119static void sound_perror P_ ((char *)) NO_RETURN; 119static void sound_perror (char *) NO_RETURN;
120static void sound_warning P_ ((char *)); 120static void sound_warning (char *);
121static int parse_sound P_ ((Lisp_Object, Lisp_Object *)); 121static int parse_sound (Lisp_Object, Lisp_Object *);
122 122
123/* END: Common Definitions */ 123/* END: Common Definitions */
124 124
@@ -225,25 +225,25 @@ struct sound_device
225 int channels; 225 int channels;
226 226
227 /* Open device SD. */ 227 /* Open device SD. */
228 void (* open) P_ ((struct sound_device *sd)); 228 void (* open) (struct sound_device *sd);
229 229
230 /* Close device SD. */ 230 /* Close device SD. */
231 void (* close) P_ ((struct sound_device *sd)); 231 void (* close) (struct sound_device *sd);
232 232
233 /* Configure SD accoring to device-dependent parameters. */ 233 /* Configure SD accoring to device-dependent parameters. */
234 void (* configure) P_ ((struct sound_device *device)); 234 void (* configure) (struct sound_device *device);
235 235
236 /* Choose a device-dependent format for outputting sound S. */ 236 /* Choose a device-dependent format for outputting sound S. */
237 void (* choose_format) P_ ((struct sound_device *sd, 237 void (* choose_format) (struct sound_device *sd,
238 struct sound *s)); 238 struct sound *s);
239 239
240 /* Return a preferred data size in bytes to be sent to write (below) 240 /* Return a preferred data size in bytes to be sent to write (below)
241 each time. 2048 is used if this is NULL. */ 241 each time. 2048 is used if this is NULL. */
242 int (* period_size) P_ ((struct sound_device *sd)); 242 int (* period_size) (struct sound_device *sd);
243 243
244 /* Write NYBTES bytes from BUFFER to device SD. */ 244 /* Write NYBTES bytes from BUFFER to device SD. */
245 void (* write) P_ ((struct sound_device *sd, const char *buffer, 245 void (* write) (struct sound_device *sd, const char *buffer,
246 int nbytes)); 246 int nbytes);
247 247
248 /* A place for devices to store additional data. */ 248 /* A place for devices to store additional data. */
249 void *data; 249 void *data;
@@ -279,7 +279,7 @@ struct sound
279 Lisp_Object data; 279 Lisp_Object data;
280 280
281 /* Play sound file S on device SD. */ 281 /* Play sound file S on device SD. */
282 void (* play) P_ ((struct sound *s, struct sound_device *sd)); 282 void (* play) (struct sound *s, struct sound_device *sd);
283}; 283};
284 284
285/* These are set during `play-sound-internal' so that sound_cleanup has 285/* These are set during `play-sound-internal' so that sound_cleanup has
@@ -290,30 +290,30 @@ struct sound *current_sound;
290 290
291/* Function prototypes. */ 291/* Function prototypes. */
292 292
293static void vox_open P_ ((struct sound_device *)); 293static void vox_open (struct sound_device *);
294static void vox_configure P_ ((struct sound_device *)); 294static void vox_configure (struct sound_device *);
295static void vox_close P_ ((struct sound_device *sd)); 295static void vox_close (struct sound_device *sd);
296static void vox_choose_format P_ ((struct sound_device *, struct sound *)); 296static void vox_choose_format (struct sound_device *, struct sound *);
297static int vox_init P_ ((struct sound_device *)); 297static int vox_init (struct sound_device *);
298static void vox_write P_ ((struct sound_device *, const char *, int)); 298static void vox_write (struct sound_device *, const char *, int);
299static void find_sound_type P_ ((struct sound *)); 299static void find_sound_type (struct sound *);
300static u_int32_t le2hl P_ ((u_int32_t)); 300static u_int32_t le2hl (u_int32_t);
301static u_int16_t le2hs P_ ((u_int16_t)); 301static u_int16_t le2hs (u_int16_t);
302static u_int32_t be2hl P_ ((u_int32_t)); 302static u_int32_t be2hl (u_int32_t);
303static int wav_init P_ ((struct sound *)); 303static int wav_init (struct sound *);
304static void wav_play P_ ((struct sound *, struct sound_device *)); 304static void wav_play (struct sound *, struct sound_device *);
305static int au_init P_ ((struct sound *)); 305static int au_init (struct sound *);
306static void au_play P_ ((struct sound *, struct sound_device *)); 306static void au_play (struct sound *, struct sound_device *);
307 307
308#if 0 /* Currently not used. */ 308#if 0 /* Currently not used. */
309static u_int16_t be2hs P_ ((u_int16_t)); 309static u_int16_t be2hs (u_int16_t);
310#endif 310#endif
311 311
312/* END: Non Windows Definitions */ 312/* END: Non Windows Definitions */
313#else /* WINDOWSNT */ 313#else /* WINDOWSNT */
314 314
315/* BEGIN: Windows Specific Definitions */ 315/* BEGIN: Windows Specific Definitions */
316static int do_play_sound P_ ((const char *, unsigned long)); 316static int do_play_sound (const char *, unsigned long);
317/* 317/*
318 END: Windows Specific Definitions */ 318 END: Windows Specific Definitions */
319#endif /* WINDOWSNT */ 319#endif /* WINDOWSNT */
diff --git a/src/strftime.c b/src/strftime.c
index 7a9506e55d3..e96d8a92332 100644
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -187,7 +187,7 @@ extern char *tzname[];
187 Similarly for localtime_r. */ 187 Similarly for localtime_r. */
188 188
189# if ! HAVE_TM_GMTOFF 189# if ! HAVE_TM_GMTOFF
190static struct tm *my_strftime_gmtime_r __P ((const time_t *, struct tm *)); 190static struct tm *my_strftime_gmtime_r (const time_t *, struct tm *);
191static struct tm * 191static struct tm *
192my_strftime_gmtime_r (t, tp) 192my_strftime_gmtime_r (t, tp)
193 const time_t *t; 193 const time_t *t;
@@ -200,7 +200,7 @@ my_strftime_gmtime_r (t, tp)
200 return tp; 200 return tp;
201} 201}
202 202
203static struct tm *my_strftime_localtime_r __P ((const time_t *, struct tm *)); 203static struct tm *my_strftime_localtime_r (const time_t *, struct tm *);
204static struct tm * 204static struct tm *
205my_strftime_localtime_r (t, tp) 205my_strftime_localtime_r (t, tp)
206 const time_t *t; 206 const time_t *t;
@@ -371,8 +371,8 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */
371 more reliable way to accept other sets of digits. */ 371 more reliable way to accept other sets of digits. */
372#define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9) 372#define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9)
373 373
374static CHAR_T *memcpy_lowcase __P ((CHAR_T *dest, const CHAR_T *src, 374static CHAR_T *memcpy_lowcase (CHAR_T *dest, const CHAR_T *src,
375 size_t len LOCALE_PARAM_PROTO)); 375 size_t len LOCALE_PARAM_PROTO);
376 376
377static CHAR_T * 377static CHAR_T *
378memcpy_lowcase (dest, src, len LOCALE_PARAM) 378memcpy_lowcase (dest, src, len LOCALE_PARAM)
@@ -386,8 +386,8 @@ memcpy_lowcase (dest, src, len LOCALE_PARAM)
386 return dest; 386 return dest;
387} 387}
388 388
389static CHAR_T *memcpy_uppcase __P ((CHAR_T *dest, const CHAR_T *src, 389static CHAR_T *memcpy_uppcase (CHAR_T *dest, const CHAR_T *src,
390 size_t len LOCALE_PARAM_PROTO)); 390 size_t len LOCALE_PARAM_PROTO);
391 391
392static CHAR_T * 392static CHAR_T *
393memcpy_uppcase (dest, src, len LOCALE_PARAM) 393memcpy_uppcase (dest, src, len LOCALE_PARAM)
@@ -406,7 +406,7 @@ memcpy_uppcase (dest, src, len LOCALE_PARAM)
406/* Yield the difference between *A and *B, 406/* Yield the difference between *A and *B,
407 measured in seconds, ignoring leap seconds. */ 407 measured in seconds, ignoring leap seconds. */
408# define tm_diff ftime_tm_diff 408# define tm_diff ftime_tm_diff
409static int tm_diff __P ((const struct tm *, const struct tm *)); 409static int tm_diff (const struct tm *, const struct tm *);
410static int 410static int
411tm_diff (a, b) 411tm_diff (a, b)
412 const struct tm *a; 412 const struct tm *a;
@@ -440,7 +440,7 @@ tm_diff (a, b)
440#define ISO_WEEK_START_WDAY 1 /* Monday */ 440#define ISO_WEEK_START_WDAY 1 /* Monday */
441#define ISO_WEEK1_WDAY 4 /* Thursday */ 441#define ISO_WEEK1_WDAY 4 /* Thursday */
442#define YDAY_MINIMUM (-366) 442#define YDAY_MINIMUM (-366)
443static int iso_week_days __P ((int, int)); 443static int iso_week_days (int, int);
444#ifdef __GNUC__ 444#ifdef __GNUC__
445__inline__ 445__inline__
446#endif 446#endif
@@ -499,8 +499,8 @@ static CHAR_T const month_name[][10] =
499#if !defined _LIBC && !defined(WINDOWSNT) && HAVE_TZNAME && HAVE_TZSET 499#if !defined _LIBC && !defined(WINDOWSNT) && HAVE_TZNAME && HAVE_TZSET
500 /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime. 500 /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime.
501 Work around this bug by copying *tp before it might be munged. */ 501 Work around this bug by copying *tp before it might be munged. */
502 size_t _strftime_copytm __P ((char *, size_t, const char *, 502 size_t _strftime_copytm (char *, size_t, const char *,
503 const struct tm * extra_args_spec_iso)); 503 const struct tm * extra_args_spec_iso);
504 size_t 504 size_t
505 my_strftime (s, maxsize, format, tp extra_args) 505 my_strftime (s, maxsize, format, tp extra_args)
506 CHAR_T *s; 506 CHAR_T *s;
diff --git a/src/syntax.c b/src/syntax.c
index 4741fa260d2..4cead52f958 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -98,13 +98,13 @@ static EMACS_INT find_start_begv;
98static int find_start_modiff; 98static int find_start_modiff;
99 99
100 100
101static Lisp_Object skip_chars P_ ((int, Lisp_Object, Lisp_Object, int)); 101static Lisp_Object skip_chars (int, Lisp_Object, Lisp_Object, int);
102static Lisp_Object skip_syntaxes P_ ((int, Lisp_Object, Lisp_Object)); 102static Lisp_Object skip_syntaxes (int, Lisp_Object, Lisp_Object);
103static Lisp_Object scan_lists P_ ((EMACS_INT, EMACS_INT, EMACS_INT, int)); 103static Lisp_Object scan_lists (EMACS_INT, EMACS_INT, EMACS_INT, int);
104static void scan_sexps_forward P_ ((struct lisp_parse_state *, 104static void scan_sexps_forward (struct lisp_parse_state *,
105 EMACS_INT, EMACS_INT, EMACS_INT, int, 105 EMACS_INT, EMACS_INT, EMACS_INT, int,
106 int, Lisp_Object, int)); 106 int, Lisp_Object, int);
107static int in_classes P_ ((int, Lisp_Object)); 107static int in_classes (int, Lisp_Object);
108 108
109 109
110struct gl_state_s gl_state; /* Global state of syntax parser. */ 110struct gl_state_s gl_state; /* Global state of syntax parser. */
diff --git a/src/sysdep.c b/src/sysdep.c
index e311d181c9c..a026cd014a2 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -169,7 +169,7 @@ static const int baud_convert[] =
169 169
170int emacs_ospeed; 170int emacs_ospeed;
171 171
172void croak P_ ((char *)) NO_RETURN; 172void croak (char *) NO_RETURN;
173 173
174/* Temporary used by `sigblock' when defined in terms of signprocmask. */ 174/* Temporary used by `sigblock' when defined in terms of signprocmask. */
175 175
@@ -561,11 +561,11 @@ child_setup_tty (out)
561struct save_signal 561struct save_signal
562{ 562{
563 int code; 563 int code;
564 SIGTYPE (*handler) P_ ((int)); 564 SIGTYPE (*handler) (int);
565}; 565};
566 566
567static void save_signal_handlers P_ ((struct save_signal *)); 567static void save_signal_handlers (struct save_signal *);
568static void restore_signal_handlers P_ ((struct save_signal *)); 568static void restore_signal_handlers (struct save_signal *);
569 569
570/* Suspend the Emacs process; give terminal to its superior. */ 570/* Suspend the Emacs process; give terminal to its superior. */
571 571
@@ -725,7 +725,7 @@ save_signal_handlers (saved_handlers)
725 while (saved_handlers->code) 725 while (saved_handlers->code)
726 { 726 {
727 saved_handlers->handler 727 saved_handlers->handler
728 = (SIGTYPE (*) P_ ((int))) signal (saved_handlers->code, SIG_IGN); 728 = (SIGTYPE (*) (int)) signal (saved_handlers->code, SIG_IGN);
729 saved_handlers++; 729 saved_handlers++;
730 } 730 }
731} 731}
diff --git a/src/term.c b/src/term.c
index fad6e3c80d7..64e329ec602 100644
--- a/src/term.c
+++ b/src/term.c
@@ -66,10 +66,10 @@ static int been_here = -1;
66/* For now, don't try to include termcap.h. On some systems, 66/* For now, don't try to include termcap.h. On some systems,
67 configure finds a non-standard termcap.h that the main build 67 configure finds a non-standard termcap.h that the main build
68 won't find. */ 68 won't find. */
69extern void tputs P_ ((const char *, int, int (*)(int))); 69extern void tputs (const char *, int, int (*)(int));
70extern int tgetent P_ ((char *, const char *)); 70extern int tgetent (char *, const char *);
71extern int tgetflag P_ ((char *id)); 71extern int tgetflag (char *id);
72extern int tgetnum P_ ((char *id)); 72extern int tgetnum (char *id);
73 73
74#include "cm.h" 74#include "cm.h"
75#ifdef HAVE_X_WINDOWS 75#ifdef HAVE_X_WINDOWS
@@ -91,16 +91,16 @@ extern int tgetnum P_ ((char *id));
91#define DEV_TTY "/dev/tty" 91#define DEV_TTY "/dev/tty"
92#endif 92#endif
93 93
94static void tty_set_scroll_region P_ ((struct frame *f, int start, int stop)); 94static void tty_set_scroll_region (struct frame *f, int start, int stop);
95static void turn_on_face P_ ((struct frame *, int face_id)); 95static void turn_on_face (struct frame *, int face_id);
96static void turn_off_face P_ ((struct frame *, int face_id)); 96static void turn_off_face (struct frame *, int face_id);
97static void tty_show_cursor P_ ((struct tty_display_info *)); 97static void tty_show_cursor (struct tty_display_info *);
98static void tty_hide_cursor P_ ((struct tty_display_info *)); 98static void tty_hide_cursor (struct tty_display_info *);
99static void tty_background_highlight P_ ((struct tty_display_info *tty)); 99static void tty_background_highlight (struct tty_display_info *tty);
100static void clear_tty_hooks P_ ((struct terminal *terminal)); 100static void clear_tty_hooks (struct terminal *terminal);
101static void set_tty_hooks P_ ((struct terminal *terminal)); 101static void set_tty_hooks (struct terminal *terminal);
102static void dissociate_if_controlling_tty P_ ((int fd)); 102static void dissociate_if_controlling_tty (int fd);
103static void delete_tty P_ ((struct terminal *)); 103static void delete_tty (struct terminal *);
104 104
105#define OUTPUT(tty, a) \ 105#define OUTPUT(tty, a) \
106 emacs_tputs ((tty), a, \ 106 emacs_tputs ((tty), a, \
@@ -1517,10 +1517,10 @@ term_get_fkeys_1 ()
1517#define produce_composite_glyph produce_composite_glyph_term 1517#define produce_composite_glyph produce_composite_glyph_term
1518#endif 1518#endif
1519 1519
1520static void append_glyph P_ ((struct it *)); 1520static void append_glyph (struct it *);
1521static void produce_stretch_glyph P_ ((struct it *)); 1521static void produce_stretch_glyph (struct it *);
1522static void append_composite_glyph P_ ((struct it *)); 1522static void append_composite_glyph (struct it *);
1523static void produce_composite_glyph P_ ((struct it *)); 1523static void produce_composite_glyph (struct it *);
1524 1524
1525/* Append glyphs to IT's glyph_row. Called from produce_glyphs for 1525/* Append glyphs to IT's glyph_row. Called from produce_glyphs for
1526 terminal frames if IT->glyph_row != NULL. IT->char_to_display is 1526 terminal frames if IT->glyph_row != NULL. IT->char_to_display is
diff --git a/src/terminal.c b/src/terminal.c
index 45d918a2bd4..7693bc3ad40 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -40,7 +40,7 @@ struct terminal *initial_terminal;
40/* Function to use to ring the bell. */ 40/* Function to use to ring the bell. */
41Lisp_Object Vring_bell_function; 41Lisp_Object Vring_bell_function;
42 42
43static void delete_initial_terminal P_ ((struct terminal *)); 43static void delete_initial_terminal (struct terminal *);
44 44
45 45
46 46
diff --git a/src/textprop.c b/src/textprop.c
index 83d09cce558..7e2f2b8f4db 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -78,7 +78,7 @@ Lisp_Object Vtext_property_default_nonsticky;
78Lisp_Object interval_insert_behind_hooks; 78Lisp_Object interval_insert_behind_hooks;
79Lisp_Object interval_insert_in_front_hooks; 79Lisp_Object interval_insert_in_front_hooks;
80 80
81static void text_read_only P_ ((Lisp_Object)) NO_RETURN; 81static void text_read_only (Lisp_Object) NO_RETURN;
82 82
83 83
84/* Signal a `text-read-only' error. This function makes it easier 84/* Signal a `text-read-only' error. This function makes it easier
diff --git a/src/unexalpha.c b/src/unexalpha.c
index 13c1def5714..196742a19aa 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/>. */
81#define _SBSS ".sbss" 81#define _SBSS ".sbss"
82#endif /* __NetBSD__ || __OpenBSD__ */ 82#endif /* __NetBSD__ || __OpenBSD__ */
83 83
84static void fatal_unexec __P ((char *, char *)); 84static void fatal_unexec (char *, char *);
85static void mark_x __P ((char *)); 85static void mark_x (char *);
86 86
87static void update_dynamic_symbols __P ((char *, char *, int, struct aouthdr)); 87static void update_dynamic_symbols (char *, char *, int, struct aouthdr);
88 88
89#define READ(_fd, _buffer, _size, _error_message, _error_arg) \ 89#define READ(_fd, _buffer, _size, _error_message, _error_arg) \
90 errno = EEOF; \ 90 errno = EEOF; \
diff --git a/src/w32console.c b/src/w32console.c
index dcebe466e32..34715ccfd52 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
286 } 286 }
287} 287}
288 288
289extern unsigned char *encode_terminal_code P_ ((struct glyph *, int, 289extern unsigned char *encode_terminal_code (struct glyph *, int,
290 struct coding_system *)); 290 struct coding_system *);
291 291
292static void 292static void
293w32con_write_glyphs (struct frame *f, register struct glyph *string, 293w32con_write_glyphs (struct frame *f, register struct glyph *string,
diff --git a/src/w32fns.c b/src/w32fns.c
index f498539a568..f371bd36fa5 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -74,10 +74,10 @@ void globals_of_w32fns ();
74 74
75extern void free_frame_menubar (); 75extern void free_frame_menubar ();
76extern double atof (); 76extern double atof ();
77extern int w32_console_toggle_lock_key P_ ((int, Lisp_Object)); 77extern int w32_console_toggle_lock_key (int, Lisp_Object);
78extern void w32_menu_display_help P_ ((HWND, HMENU, UINT, UINT)); 78extern void w32_menu_display_help (HWND, HMENU, UINT, UINT);
79extern void w32_free_menu_strings P_ ((HWND)); 79extern void w32_free_menu_strings (HWND);
80extern const char *map_w32_filename P_ ((const char *, const char **)); 80extern const char *map_w32_filename (const char *, const char **);
81 81
82extern int quit_char; 82extern int quit_char;
83 83
@@ -320,8 +320,8 @@ extern void syms_of_w32uniscribe ();
320extern int uniscribe_available; 320extern int uniscribe_available;
321 321
322/* Function prototypes for hourglass support. */ 322/* Function prototypes for hourglass support. */
323static void w32_show_hourglass P_ ((struct frame *)); 323static void w32_show_hourglass (struct frame *);
324static void w32_hide_hourglass P_ ((void)); 324static void w32_hide_hourglass (void);
325 325
326 326
327 327
@@ -420,26 +420,26 @@ x_window_to_frame (dpyinfo, wdesc)
420} 420}
421 421
422 422
423static Lisp_Object unwind_create_frame P_ ((Lisp_Object)); 423static Lisp_Object unwind_create_frame (Lisp_Object);
424static Lisp_Object unwind_create_tip_frame P_ ((Lisp_Object)); 424static Lisp_Object unwind_create_tip_frame (Lisp_Object);
425static void my_create_window P_ ((struct frame *)); 425static void my_create_window (struct frame *);
426static void my_create_tip_window P_ ((struct frame *)); 426static void my_create_tip_window (struct frame *);
427 427
428/* TODO: Native Input Method support; see x_create_im. */ 428/* TODO: Native Input Method support; see x_create_im. */
429void x_set_foreground_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); 429void x_set_foreground_color (struct frame *, Lisp_Object, Lisp_Object);
430void x_set_background_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); 430void x_set_background_color (struct frame *, Lisp_Object, Lisp_Object);
431void x_set_mouse_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); 431void x_set_mouse_color (struct frame *, Lisp_Object, Lisp_Object);
432void x_set_cursor_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); 432void x_set_cursor_color (struct frame *, Lisp_Object, Lisp_Object);
433void x_set_border_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); 433void x_set_border_color (struct frame *, Lisp_Object, Lisp_Object);
434void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object)); 434void x_set_cursor_type (struct frame *, Lisp_Object, Lisp_Object);
435void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object)); 435void x_set_icon_type (struct frame *, Lisp_Object, Lisp_Object);
436void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); 436void x_set_icon_name (struct frame *, Lisp_Object, Lisp_Object);
437void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); 437void x_explicitly_set_name (struct frame *, Lisp_Object, Lisp_Object);
438void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); 438void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
439void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object)); 439void x_set_title (struct frame *, Lisp_Object, Lisp_Object);
440void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); 440void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
441static void x_edge_detection P_ ((struct frame *, struct image *, Lisp_Object, 441static void x_edge_detection (struct frame *, struct image *, Lisp_Object,
442 Lisp_Object)); 442 Lisp_Object);
443 443
444 444
445 445
@@ -5360,10 +5360,10 @@ w32_hide_hourglass ()
5360 Tool tips 5360 Tool tips
5361 ***********************************************************************/ 5361 ***********************************************************************/
5362 5362
5363static Lisp_Object x_create_tip_frame P_ ((struct w32_display_info *, 5363static Lisp_Object x_create_tip_frame (struct w32_display_info *,
5364 Lisp_Object, Lisp_Object)); 5364 Lisp_Object, Lisp_Object);
5365static void compute_tip_xy P_ ((struct frame *, Lisp_Object, Lisp_Object, 5365static void compute_tip_xy (struct frame *, Lisp_Object, Lisp_Object,
5366 Lisp_Object, int, int, int *, int *)); 5366 Lisp_Object, int, int, int *, int *);
5367 5367
5368/* The frame of a currently visible tooltip. */ 5368/* The frame of a currently visible tooltip. */
5369 5369
diff --git a/src/w32font.c b/src/w32font.c
index e93dbca2ddb..ab56eb9e4d2 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -106,28 +106,28 @@ static Lisp_Object Vw32_charset_info_alist;
106/* Font spacing symbols - defined in font.c. */ 106/* Font spacing symbols - defined in font.c. */
107extern Lisp_Object Qc, Qp, Qm; 107extern Lisp_Object Qc, Qp, Qm;
108 108
109static void fill_in_logfont P_ ((FRAME_PTR, LOGFONT *, Lisp_Object)); 109static void fill_in_logfont (FRAME_PTR, LOGFONT *, Lisp_Object);
110 110
111static BYTE w32_antialias_type P_ ((Lisp_Object)); 111static BYTE w32_antialias_type (Lisp_Object);
112static Lisp_Object lispy_antialias_type P_ ((BYTE)); 112static Lisp_Object lispy_antialias_type (BYTE);
113 113
114static Lisp_Object font_supported_scripts P_ ((FONTSIGNATURE *)); 114static Lisp_Object font_supported_scripts (FONTSIGNATURE *);
115static int w32font_full_name P_ ((LOGFONT *, Lisp_Object, int, char *, int)); 115static int w32font_full_name (LOGFONT *, Lisp_Object, int, char *, int);
116static void compute_metrics P_ ((HDC, struct w32font_info *, unsigned int, 116static void compute_metrics (HDC, struct w32font_info *, unsigned int,
117 struct w32_metric_cache *)); 117 struct w32_metric_cache *);
118 118
119static Lisp_Object w32_registry P_ ((LONG, DWORD)); 119static Lisp_Object w32_registry (LONG, DWORD);
120 120
121/* EnumFontFamiliesEx callbacks. */ 121/* EnumFontFamiliesEx callbacks. */
122static int CALLBACK add_font_entity_to_list P_ ((ENUMLOGFONTEX *, 122static int CALLBACK add_font_entity_to_list (ENUMLOGFONTEX *,
123 NEWTEXTMETRICEX *,
124 DWORD, LPARAM);
125static int CALLBACK add_one_font_entity_to_list (ENUMLOGFONTEX *,
123 NEWTEXTMETRICEX *, 126 NEWTEXTMETRICEX *,
124 DWORD, LPARAM)); 127 DWORD, LPARAM);
125static int CALLBACK add_one_font_entity_to_list P_ ((ENUMLOGFONTEX *, 128static int CALLBACK add_font_name_to_list (ENUMLOGFONTEX *,
126 NEWTEXTMETRICEX *, 129 NEWTEXTMETRICEX *,
127 DWORD, LPARAM)); 130 DWORD, LPARAM);
128static int CALLBACK add_font_name_to_list P_ ((ENUMLOGFONTEX *,
129 NEWTEXTMETRICEX *,
130 DWORD, LPARAM));
131 131
132/* struct passed in as LPARAM arg to EnumFontFamiliesEx, for keeping track 132/* struct passed in as LPARAM arg to EnumFontFamiliesEx, for keeping track
133 of what we really want. */ 133 of what we really want. */
@@ -149,7 +149,7 @@ struct font_callback_data
149 149
150/* Handles the problem that EnumFontFamiliesEx will not return all 150/* Handles the problem that EnumFontFamiliesEx will not return all
151 style variations if the font name is not specified. */ 151 style variations if the font name is not specified. */
152static void list_all_matching_fonts P_ ((struct font_callback_data *)); 152static void list_all_matching_fonts (struct font_callback_data *);
153 153
154 154
155static int 155static int
@@ -971,8 +971,8 @@ add_font_name_to_list (logical_font, physical_font, font_type, list_object)
971 return 1; 971 return 1;
972} 972}
973 973
974static int w32_decode_weight P_ ((int)); 974static int w32_decode_weight (int);
975static int w32_encode_weight P_ ((int)); 975static int w32_encode_weight (int);
976 976
977/* Convert an enumerated Windows font to an Emacs font entity. */ 977/* Convert an enumerated Windows font to an Emacs font entity. */
978static Lisp_Object 978static Lisp_Object
diff --git a/src/w32menu.c b/src/w32menu.c
index 73fba8108c6..2c8a5308d3b 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -90,16 +90,16 @@ extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
90 90
91extern Lisp_Object Qmenu_bar_update_hook; 91extern Lisp_Object Qmenu_bar_update_hook;
92 92
93void set_frame_menubar P_ ((FRAME_PTR, int, int)); 93void set_frame_menubar (FRAME_PTR, int, int);
94 94
95#ifdef HAVE_DIALOGS 95#ifdef HAVE_DIALOGS
96static Lisp_Object w32_dialog_show P_ ((FRAME_PTR, int, Lisp_Object, char**)); 96static Lisp_Object w32_dialog_show (FRAME_PTR, int, Lisp_Object, char**);
97#else 97#else
98static int is_simple_dialog P_ ((Lisp_Object)); 98static int is_simple_dialog (Lisp_Object);
99static Lisp_Object simple_dialog_show P_ ((FRAME_PTR, Lisp_Object, Lisp_Object)); 99static Lisp_Object simple_dialog_show (FRAME_PTR, Lisp_Object, Lisp_Object);
100#endif 100#endif
101 101
102void w32_free_menu_strings P_((HWND)); 102void w32_free_menu_strings (HWND);
103 103
104 104
105/* This is set nonzero after the user activates the menu bar, and set 105/* This is set nonzero after the user activates the menu bar, and set
diff --git a/src/w32term.c b/src/w32term.c
index 0b71b7e02b7..1acb77e7b16 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -234,43 +234,43 @@ extern EMACS_INT extra_keyboard_modifiers;
234/* Keyboard code page - may be changed by language-change events. */ 234/* Keyboard code page - may be changed by language-change events. */
235static int keyboard_codepage; 235static int keyboard_codepage;
236 236
237static void x_update_window_end P_ ((struct window *, int, int)); 237static void x_update_window_end (struct window *, int, int);
238static void w32_handle_tool_bar_click P_ ((struct frame *, 238static void w32_handle_tool_bar_click (struct frame *,
239 struct input_event *)); 239 struct input_event *);
240static void w32_define_cursor P_ ((Window, Cursor)); 240static void w32_define_cursor (Window, Cursor);
241 241
242void x_lower_frame P_ ((struct frame *)); 242void x_lower_frame (struct frame *);
243void x_scroll_bar_clear P_ ((struct frame *)); 243void x_scroll_bar_clear (struct frame *);
244void x_wm_set_size_hint P_ ((struct frame *, long, int)); 244void x_wm_set_size_hint (struct frame *, long, int);
245void x_raise_frame P_ ((struct frame *)); 245void x_raise_frame (struct frame *);
246void x_set_window_size P_ ((struct frame *, int, int, int)); 246void x_set_window_size (struct frame *, int, int, int);
247void x_wm_set_window_state P_ ((struct frame *, int)); 247void x_wm_set_window_state (struct frame *, int);
248void x_wm_set_icon_pixmap P_ ((struct frame *, int)); 248void x_wm_set_icon_pixmap (struct frame *, int);
249static void w32_initialize P_ ((void)); 249static void w32_initialize (void);
250static void x_update_end P_ ((struct frame *)); 250static void x_update_end (struct frame *);
251static void w32_frame_up_to_date P_ ((struct frame *)); 251static void w32_frame_up_to_date (struct frame *);
252static void w32_set_terminal_modes P_ ((struct terminal *)); 252static void w32_set_terminal_modes (struct terminal *);
253static void w32_reset_terminal_modes P_ ((struct terminal *)); 253static void w32_reset_terminal_modes (struct terminal *);
254static void x_clear_frame P_ ((struct frame *)); 254static void x_clear_frame (struct frame *);
255static void frame_highlight P_ ((struct frame *)); 255static void frame_highlight (struct frame *);
256static void frame_unhighlight P_ ((struct frame *)); 256static void frame_unhighlight (struct frame *);
257static void x_new_focus_frame P_ ((struct w32_display_info *, 257static void x_new_focus_frame (struct w32_display_info *,
258 struct frame *)); 258 struct frame *);
259static void x_focus_changed P_ ((int, int, struct w32_display_info *, 259static void x_focus_changed (int, int, struct w32_display_info *,
260 struct frame *, struct input_event *)); 260 struct frame *, struct input_event *);
261static void w32_detect_focus_change P_ ((struct w32_display_info *, 261static void w32_detect_focus_change (struct w32_display_info *,
262 W32Msg *, struct input_event *)); 262 W32Msg *, struct input_event *);
263static void w32_frame_rehighlight P_ ((struct frame *)); 263static void w32_frame_rehighlight (struct frame *);
264static void x_frame_rehighlight P_ ((struct w32_display_info *)); 264static void x_frame_rehighlight (struct w32_display_info *);
265static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *)); 265static void x_draw_hollow_cursor (struct window *, struct glyph_row *);
266static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int, 266static void x_draw_bar_cursor (struct window *, struct glyph_row *, int,
267 enum text_cursor_kinds)); 267 enum text_cursor_kinds);
268static void w32_clip_to_row P_ ((struct window *, struct glyph_row *, int, HDC)); 268static void w32_clip_to_row (struct window *, struct glyph_row *, int, HDC);
269static BOOL my_show_window P_ ((struct frame *, HWND, int)); 269static BOOL my_show_window (struct frame *, HWND, int);
270static void my_set_window_pos P_ ((HWND, HWND, int, int, int, int, UINT)); 270static void my_set_window_pos (HWND, HWND, int, int, int, int, UINT);
271static void my_set_focus P_ ((struct frame *, HWND)); 271static void my_set_focus (struct frame *, HWND);
272static void my_set_foreground_window P_ ((HWND)); 272static void my_set_foreground_window (HWND);
273static void my_destroy_window P_ ((struct frame *, HWND)); 273static void my_destroy_window (struct frame *, HWND);
274 274
275static Lisp_Object Qvendor_specific_keysyms; 275static Lisp_Object Qvendor_specific_keysyms;
276 276
@@ -947,32 +947,32 @@ w32_reset_terminal_modes (struct terminal *term)
947 947
948/* Function prototypes of this page. */ 948/* Function prototypes of this page. */
949 949
950static void x_set_glyph_string_clipping P_ ((struct glyph_string *)); 950static void x_set_glyph_string_clipping (struct glyph_string *);
951static void x_set_glyph_string_gc P_ ((struct glyph_string *)); 951static void x_set_glyph_string_gc (struct glyph_string *);
952static void x_draw_glyph_string_background P_ ((struct glyph_string *, 952static void x_draw_glyph_string_background (struct glyph_string *,
953 int)); 953 int);
954static void x_draw_glyph_string_foreground P_ ((struct glyph_string *)); 954static void x_draw_glyph_string_foreground (struct glyph_string *);
955static void x_draw_composite_glyph_string_foreground P_ ((struct glyph_string *)); 955static void x_draw_composite_glyph_string_foreground (struct glyph_string *);
956static void x_draw_glyph_string_box P_ ((struct glyph_string *)); 956static void x_draw_glyph_string_box (struct glyph_string *);
957static void x_draw_glyph_string P_ ((struct glyph_string *)); 957static void x_draw_glyph_string (struct glyph_string *);
958static void x_set_cursor_gc P_ ((struct glyph_string *)); 958static void x_set_cursor_gc (struct glyph_string *);
959static void x_set_mode_line_face_gc P_ ((struct glyph_string *)); 959static void x_set_mode_line_face_gc (struct glyph_string *);
960static void x_set_mouse_face_gc P_ ((struct glyph_string *)); 960static void x_set_mouse_face_gc (struct glyph_string *);
961static int w32_alloc_lighter_color (struct frame *, COLORREF *, double, int); 961static int w32_alloc_lighter_color (struct frame *, COLORREF *, double, int);
962static void w32_setup_relief_color P_ ((struct frame *, struct relief *, 962static void w32_setup_relief_color (struct frame *, struct relief *,
963 double, int, COLORREF)); 963 double, int, COLORREF);
964static void x_setup_relief_colors P_ ((struct glyph_string *)); 964static void x_setup_relief_colors (struct glyph_string *);
965static void x_draw_image_glyph_string P_ ((struct glyph_string *)); 965static void x_draw_image_glyph_string (struct glyph_string *);
966static void x_draw_image_relief P_ ((struct glyph_string *)); 966static void x_draw_image_relief (struct glyph_string *);
967static void x_draw_image_foreground P_ ((struct glyph_string *)); 967static void x_draw_image_foreground (struct glyph_string *);
968static void w32_draw_image_foreground_1 P_ ((struct glyph_string *, HBITMAP)); 968static void w32_draw_image_foreground_1 (struct glyph_string *, HBITMAP);
969static void x_clear_glyph_string_rect P_ ((struct glyph_string *, int, 969static void x_clear_glyph_string_rect (struct glyph_string *, int,
970 int, int, int)); 970 int, int, int);
971static void w32_draw_relief_rect P_ ((struct frame *, int, int, int, int, 971static void w32_draw_relief_rect (struct frame *, int, int, int, int,
972 int, int, int, int, int, int, 972 int, int, int, int, int, int,
973 RECT *)); 973 RECT *);
974static void w32_draw_box_rect P_ ((struct glyph_string *, int, int, int, int, 974static void w32_draw_box_rect (struct glyph_string *, int, int, int, int,
975 int, int, int, RECT *)); 975 int, int, int, RECT *);
976 976
977 977
978/* Set S->gc to a suitable GC for drawing glyph string S in cursor 978/* Set S->gc to a suitable GC for drawing glyph string S in cursor
@@ -3170,7 +3170,7 @@ note_mouse_movement (frame, msg)
3170 3170
3171static struct scroll_bar *x_window_to_scroll_bar (); 3171static struct scroll_bar *x_window_to_scroll_bar ();
3172static void x_scroll_bar_report_motion (); 3172static void x_scroll_bar_report_motion ();
3173static void x_check_fullscreen P_ ((struct frame *)); 3173static void x_check_fullscreen (struct frame *);
3174 3174
3175static void 3175static void
3176redo_mouse_highlight () 3176redo_mouse_highlight ()
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index cfdf629ceee..9b5bd141d77 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -57,9 +57,9 @@ extern int initialized;
57extern struct font_driver uniscribe_font_driver; 57extern struct font_driver uniscribe_font_driver;
58 58
59/* EnumFontFamiliesEx callback. */ 59/* EnumFontFamiliesEx callback. */
60static int CALLBACK add_opentype_font_name_to_list P_ ((ENUMLOGFONTEX *, 60static int CALLBACK add_opentype_font_name_to_list (ENUMLOGFONTEX *,
61 NEWTEXTMETRICEX *, 61 NEWTEXTMETRICEX *,
62 DWORD, LPARAM)); 62 DWORD, LPARAM);
63/* Used by uniscribe_otf_capability. */ 63/* Used by uniscribe_otf_capability. */
64static Lisp_Object otf_features (HDC context, char *table); 64static Lisp_Object otf_features (HDC context, char *table);
65 65
diff --git a/src/window.c b/src/window.c
index d77c6208693..950b9936497 100644
--- a/src/window.c
+++ b/src/window.c
@@ -59,32 +59,32 @@ Lisp_Object Qwindow_size_fixed;
59 59
60extern Lisp_Object Qleft_margin, Qright_margin; 60extern Lisp_Object Qleft_margin, Qright_margin;
61 61
62static int displayed_window_lines P_ ((struct window *)); 62static int displayed_window_lines (struct window *);
63static struct window *decode_window P_ ((Lisp_Object)); 63static struct window *decode_window (Lisp_Object);
64static int count_windows P_ ((struct window *)); 64static int count_windows (struct window *);
65static int get_leaf_windows P_ ((struct window *, struct window **, int)); 65static int get_leaf_windows (struct window *, struct window **, int);
66static void window_scroll P_ ((Lisp_Object, int, int, int)); 66static void window_scroll (Lisp_Object, int, int, int);
67static void window_scroll_pixel_based P_ ((Lisp_Object, int, int, int)); 67static void window_scroll_pixel_based (Lisp_Object, int, int, int);
68static void window_scroll_line_based P_ ((Lisp_Object, int, int, int)); 68static void window_scroll_line_based (Lisp_Object, int, int, int);
69static int window_min_size_1 P_ ((struct window *, int, int)); 69static int window_min_size_1 (struct window *, int, int);
70static int window_min_size_2 P_ ((struct window *, int, int)); 70static int window_min_size_2 (struct window *, int, int);
71static int window_min_size P_ ((struct window *, int, int, int, int *)); 71static int window_min_size (struct window *, int, int, int, int *);
72static void size_window P_ ((Lisp_Object, int, int, int, int, int)); 72static void size_window (Lisp_Object, int, int, int, int, int);
73static int freeze_window_start P_ ((struct window *, void *)); 73static int freeze_window_start (struct window *, void *);
74static int window_fixed_size_p P_ ((struct window *, int, int)); 74static int window_fixed_size_p (struct window *, int, int);
75static void enlarge_window P_ ((Lisp_Object, int, int)); 75static void enlarge_window (Lisp_Object, int, int);
76static Lisp_Object window_list P_ ((void)); 76static Lisp_Object window_list (void);
77static int add_window_to_list P_ ((struct window *, void *)); 77static int add_window_to_list (struct window *, void *);
78static int candidate_window_p P_ ((Lisp_Object, Lisp_Object, Lisp_Object, 78static int candidate_window_p (Lisp_Object, Lisp_Object, Lisp_Object,
79 Lisp_Object)); 79 Lisp_Object);
80static Lisp_Object next_window P_ ((Lisp_Object, Lisp_Object, 80static Lisp_Object next_window (Lisp_Object, Lisp_Object,
81 Lisp_Object, int)); 81 Lisp_Object, int);
82static void decode_next_window_args P_ ((Lisp_Object *, Lisp_Object *, 82static void decode_next_window_args (Lisp_Object *, Lisp_Object *,
83 Lisp_Object *)); 83 Lisp_Object *);
84static int foreach_window_1 P_ ((struct window *, 84static int foreach_window_1 (struct window *,
85 int (* fn) (struct window *, void *), 85 int (* fn) (struct window *, void *),
86 void *)); 86 void *);
87static Lisp_Object window_list_1 P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); 87static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object);
88 88
89/* This is the window in which the terminal's cursor should 89/* This is the window in which the terminal's cursor should
90 be left when nothing is being done with it. This must 90 be left when nothing is being done with it. This must
@@ -4126,9 +4126,9 @@ enlarge_window (window, delta, horiz_flag)
4126 struct window *p; 4126 struct window *p;
4127 Lisp_Object *sizep; 4127 Lisp_Object *sizep;
4128 int maximum; 4128 int maximum;
4129 int (*sizefun) P_ ((Lisp_Object)) 4129 int (*sizefun) (Lisp_Object)
4130 = horiz_flag ? window_width : window_height; 4130 = horiz_flag ? window_width : window_height;
4131 void (*setsizefun) P_ ((Lisp_Object, int, int)) 4131 void (*setsizefun) (Lisp_Object, int, int)
4132 = (horiz_flag ? set_window_width : set_window_height); 4132 = (horiz_flag ? set_window_width : set_window_height);
4133 4133
4134 /* Give up if this window cannot be resized. */ 4134 /* Give up if this window cannot be resized. */
@@ -4554,7 +4554,7 @@ are not deleted; instead, we signal an error. */)
4554 Resizing Mini-Windows 4554 Resizing Mini-Windows
4555 ***********************************************************************/ 4555 ***********************************************************************/
4556 4556
4557static void shrink_window_lowest_first P_ ((struct window *, int)); 4557static void shrink_window_lowest_first (struct window *, int);
4558 4558
4559enum save_restore_action 4559enum save_restore_action
4560{ 4560{
@@ -4563,8 +4563,8 @@ enum save_restore_action
4563 RESTORE_ORIG_SIZES 4563 RESTORE_ORIG_SIZES
4564}; 4564};
4565 4565
4566static int save_restore_orig_size P_ ((struct window *, 4566static int save_restore_orig_size (struct window *,
4567 enum save_restore_action)); 4567 enum save_restore_action);
4568 4568
4569/* Shrink windows rooted in window W to HEIGHT. Take the space needed 4569/* Shrink windows rooted in window W to HEIGHT. Take the space needed
4570 from lowest windows first. */ 4570 from lowest windows first. */
@@ -7012,7 +7012,7 @@ If PIXELS-P is non-nil, the return value is VSCROLL. */)
7012void 7012void
7013foreach_window (f, fn, user_data) 7013foreach_window (f, fn, user_data)
7014 struct frame *f; 7014 struct frame *f;
7015 int (* fn) P_ ((struct window *, void *)); 7015 int (* fn) (struct window *, void *);
7016 void *user_data; 7016 void *user_data;
7017{ 7017{
7018 /* delete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */ 7018 /* delete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */
@@ -7029,7 +7029,7 @@ foreach_window (f, fn, user_data)
7029static int 7029static int
7030foreach_window_1 (w, fn, user_data) 7030foreach_window_1 (w, fn, user_data)
7031 struct window *w; 7031 struct window *w;
7032 int (* fn) P_ ((struct window *, void *)); 7032 int (* fn) (struct window *, void *);
7033 void *user_data; 7033 void *user_data;
7034{ 7034{
7035 int cont; 7035 int cont;
diff --git a/src/xdisp.c b/src/xdisp.c
index 795e13e6f1a..cea8c625819 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/>. */
270 270
271#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ 271#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \
272 || defined(HAVE_NS) || defined (USE_GTK) 272 || defined(HAVE_NS) || defined (USE_GTK)
273extern void set_frame_menubar P_ ((struct frame *f, int, int)); 273extern void set_frame_menubar (struct frame *f, int, int);
274extern int pending_menu_activation; 274extern int pending_menu_activation;
275#endif 275#endif
276 276
@@ -831,15 +831,15 @@ struct props
831 831
832 /* A handler function called to set up iterator IT from the property 832 /* A handler function called to set up iterator IT from the property
833 at IT's current position. Value is used to steer handle_stop. */ 833 at IT's current position. Value is used to steer handle_stop. */
834 enum prop_handled (*handler) P_ ((struct it *it)); 834 enum prop_handled (*handler) (struct it *it);
835}; 835};
836 836
837static enum prop_handled handle_face_prop P_ ((struct it *)); 837static enum prop_handled handle_face_prop (struct it *);
838static enum prop_handled handle_invisible_prop P_ ((struct it *)); 838static enum prop_handled handle_invisible_prop (struct it *);
839static enum prop_handled handle_display_prop P_ ((struct it *)); 839static enum prop_handled handle_display_prop (struct it *);
840static enum prop_handled handle_composition_prop P_ ((struct it *)); 840static enum prop_handled handle_composition_prop (struct it *);
841static enum prop_handled handle_overlay_change P_ ((struct it *)); 841static enum prop_handled handle_overlay_change (struct it *);
842static enum prop_handled handle_fontified_prop P_ ((struct it *)); 842static enum prop_handled handle_fontified_prop (struct it *);
843 843
844/* Properties handled by iterators. */ 844/* Properties handled by iterators. */
845 845
@@ -949,149 +949,149 @@ Lisp_Object Vhourglass_delay;
949 949
950/* Function prototypes. */ 950/* Function prototypes. */
951 951
952static void setup_for_ellipsis P_ ((struct it *, int)); 952static void setup_for_ellipsis (struct it *, int);
953static void mark_window_display_accurate_1 P_ ((struct window *, int)); 953static void mark_window_display_accurate_1 (struct window *, int);
954static int single_display_spec_string_p P_ ((Lisp_Object, Lisp_Object)); 954static int single_display_spec_string_p (Lisp_Object, Lisp_Object);
955static int display_prop_string_p P_ ((Lisp_Object, Lisp_Object)); 955static int display_prop_string_p (Lisp_Object, Lisp_Object);
956static int cursor_row_p P_ ((struct window *, struct glyph_row *)); 956static int cursor_row_p (struct window *, struct glyph_row *);
957static int redisplay_mode_lines P_ ((Lisp_Object, int)); 957static int redisplay_mode_lines (Lisp_Object, int);
958static char *decode_mode_spec_coding P_ ((Lisp_Object, char *, int)); 958static char *decode_mode_spec_coding (Lisp_Object, char *, int);
959 959
960static Lisp_Object get_it_property P_ ((struct it *it, Lisp_Object prop)); 960static Lisp_Object get_it_property (struct it *it, Lisp_Object prop);
961 961
962static void handle_line_prefix P_ ((struct it *)); 962static void handle_line_prefix (struct it *);
963 963
964static void pint2str P_ ((char *, int, int)); 964static void pint2str (char *, int, int);
965static void pint2hrstr P_ ((char *, int, int)); 965static void pint2hrstr (char *, int, int);
966static struct text_pos run_window_scroll_functions P_ ((Lisp_Object, 966static struct text_pos run_window_scroll_functions (Lisp_Object,
967 struct text_pos)); 967 struct text_pos);
968static void reconsider_clip_changes P_ ((struct window *, struct buffer *)); 968static void reconsider_clip_changes (struct window *, struct buffer *);
969static int text_outside_line_unchanged_p P_ ((struct window *, int, int)); 969static int text_outside_line_unchanged_p (struct window *, int, int);
970static void store_mode_line_noprop_char P_ ((char)); 970static void store_mode_line_noprop_char (char);
971static int store_mode_line_noprop P_ ((const unsigned char *, int, int)); 971static int store_mode_line_noprop (const unsigned char *, int, int);
972static void x_consider_frame_title P_ ((Lisp_Object)); 972static void x_consider_frame_title (Lisp_Object);
973static void handle_stop P_ ((struct it *)); 973static void handle_stop (struct it *);
974static void handle_stop_backwards P_ ((struct it *, EMACS_INT)); 974static void handle_stop_backwards (struct it *, EMACS_INT);
975static int tool_bar_lines_needed P_ ((struct frame *, int *)); 975static int tool_bar_lines_needed (struct frame *, int *);
976static int single_display_spec_intangible_p P_ ((Lisp_Object)); 976static int single_display_spec_intangible_p (Lisp_Object);
977static void ensure_echo_area_buffers P_ ((void)); 977static void ensure_echo_area_buffers (void);
978static Lisp_Object unwind_with_echo_area_buffer P_ ((Lisp_Object)); 978static Lisp_Object unwind_with_echo_area_buffer (Lisp_Object);
979static Lisp_Object with_echo_area_buffer_unwind_data P_ ((struct window *)); 979static Lisp_Object with_echo_area_buffer_unwind_data (struct window *);
980static int with_echo_area_buffer P_ ((struct window *, int, 980static int with_echo_area_buffer (struct window *, int,
981 int (*) (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT), 981 int (*) (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT),
982 EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); 982 EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT);
983static void clear_garbaged_frames P_ ((void)); 983static void clear_garbaged_frames (void);
984static int current_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); 984static int current_message_1 (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT);
985static int truncate_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); 985static int truncate_message_1 (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT);
986static int set_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); 986static int set_message_1 (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT);
987static int display_echo_area P_ ((struct window *)); 987static int display_echo_area (struct window *);
988static int display_echo_area_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); 988static int display_echo_area_1 (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT);
989static int resize_mini_window_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); 989static int resize_mini_window_1 (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT);
990static Lisp_Object unwind_redisplay P_ ((Lisp_Object)); 990static Lisp_Object unwind_redisplay (Lisp_Object);
991static int string_char_and_length P_ ((const unsigned char *, int *)); 991static int string_char_and_length (const unsigned char *, int *);
992static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object, 992static struct text_pos display_prop_end (struct it *, Lisp_Object,
993 struct text_pos)); 993 struct text_pos);
994static int compute_window_start_on_continuation_line P_ ((struct window *)); 994static int compute_window_start_on_continuation_line (struct window *);
995static Lisp_Object safe_eval_handler P_ ((Lisp_Object)); 995static Lisp_Object safe_eval_handler (Lisp_Object);
996static void insert_left_trunc_glyphs P_ ((struct it *)); 996static void insert_left_trunc_glyphs (struct it *);
997static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *, 997static struct glyph_row *get_overlay_arrow_glyph_row (struct window *,
998 Lisp_Object)); 998 Lisp_Object);
999static void extend_face_to_end_of_line P_ ((struct it *)); 999static void extend_face_to_end_of_line (struct it *);
1000static int append_space_for_newline P_ ((struct it *, int)); 1000static int append_space_for_newline (struct it *, int);
1001static int cursor_row_fully_visible_p P_ ((struct window *, int, int)); 1001static int cursor_row_fully_visible_p (struct window *, int, int);
1002static int try_scrolling P_ ((Lisp_Object, int, EMACS_INT, EMACS_INT, int, int)); 1002static int try_scrolling (Lisp_Object, int, EMACS_INT, EMACS_INT, int, int);
1003static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *)); 1003static int try_cursor_movement (Lisp_Object, struct text_pos, int *);
1004static int trailing_whitespace_p P_ ((int)); 1004static int trailing_whitespace_p (int);
1005static int message_log_check_duplicate P_ ((int, int, int, int)); 1005static int message_log_check_duplicate (int, int, int, int);
1006static void push_it P_ ((struct it *)); 1006static void push_it (struct it *);
1007static void pop_it P_ ((struct it *)); 1007static void pop_it (struct it *);
1008static void sync_frame_with_window_matrix_rows P_ ((struct window *)); 1008static void sync_frame_with_window_matrix_rows (struct window *);
1009static void select_frame_for_redisplay P_ ((Lisp_Object)); 1009static void select_frame_for_redisplay (Lisp_Object);
1010static void redisplay_internal P_ ((int)); 1010static void redisplay_internal (int);
1011static int echo_area_display P_ ((int)); 1011static int echo_area_display (int);
1012static void redisplay_windows P_ ((Lisp_Object)); 1012static void redisplay_windows (Lisp_Object);
1013static void redisplay_window P_ ((Lisp_Object, int)); 1013static void redisplay_window (Lisp_Object, int);
1014static Lisp_Object redisplay_window_error (); 1014static Lisp_Object redisplay_window_error ();
1015static Lisp_Object redisplay_window_0 P_ ((Lisp_Object)); 1015static Lisp_Object redisplay_window_0 (Lisp_Object);
1016static Lisp_Object redisplay_window_1 P_ ((Lisp_Object)); 1016static Lisp_Object redisplay_window_1 (Lisp_Object);
1017static int update_menu_bar P_ ((struct frame *, int, int)); 1017static int update_menu_bar (struct frame *, int, int);
1018static int try_window_reusing_current_matrix P_ ((struct window *)); 1018static int try_window_reusing_current_matrix (struct window *);
1019static int try_window_id P_ ((struct window *)); 1019static int try_window_id (struct window *);
1020static int display_line P_ ((struct it *)); 1020static int display_line (struct it *);
1021static int display_mode_lines P_ ((struct window *)); 1021static int display_mode_lines (struct window *);
1022static int display_mode_line P_ ((struct window *, enum face_id, Lisp_Object)); 1022static int display_mode_line (struct window *, enum face_id, Lisp_Object);
1023static int display_mode_element P_ ((struct it *, int, int, int, Lisp_Object, Lisp_Object, int)); 1023static int display_mode_element (struct it *, int, int, int, Lisp_Object, Lisp_Object, int);
1024static int store_mode_line_string P_ ((char *, Lisp_Object, int, int, int, Lisp_Object)); 1024static int store_mode_line_string (char *, Lisp_Object, int, int, int, Lisp_Object);
1025static char *decode_mode_spec P_ ((struct window *, int, int, int, 1025static char *decode_mode_spec (struct window *, int, int, int,
1026 Lisp_Object *)); 1026 Lisp_Object *);
1027static void display_menu_bar P_ ((struct window *)); 1027static void display_menu_bar (struct window *);
1028static int display_count_lines P_ ((int, int, int, int, int *)); 1028static int display_count_lines (int, int, int, int, int *);
1029static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object, 1029static int display_string (unsigned char *, Lisp_Object, Lisp_Object,
1030 EMACS_INT, EMACS_INT, struct it *, int, int, int, int)); 1030 EMACS_INT, EMACS_INT, struct it *, int, int, int, int);
1031static void compute_line_metrics P_ ((struct it *)); 1031static void compute_line_metrics (struct it *);
1032static void run_redisplay_end_trigger_hook P_ ((struct it *)); 1032static void run_redisplay_end_trigger_hook (struct it *);
1033static int get_overlay_strings P_ ((struct it *, int)); 1033static int get_overlay_strings (struct it *, int);
1034static int get_overlay_strings_1 P_ ((struct it *, int, int)); 1034static int get_overlay_strings_1 (struct it *, int, int);
1035static void next_overlay_string P_ ((struct it *)); 1035static void next_overlay_string (struct it *);
1036static void reseat P_ ((struct it *, struct text_pos, int)); 1036static void reseat (struct it *, struct text_pos, int);
1037static void reseat_1 P_ ((struct it *, struct text_pos, int)); 1037static void reseat_1 (struct it *, struct text_pos, int);
1038static void back_to_previous_visible_line_start P_ ((struct it *)); 1038static void back_to_previous_visible_line_start (struct it *);
1039void reseat_at_previous_visible_line_start P_ ((struct it *)); 1039void reseat_at_previous_visible_line_start (struct it *);
1040static void reseat_at_next_visible_line_start P_ ((struct it *, int)); 1040static void reseat_at_next_visible_line_start (struct it *, int);
1041static int next_element_from_ellipsis P_ ((struct it *)); 1041static int next_element_from_ellipsis (struct it *);
1042static int next_element_from_display_vector P_ ((struct it *)); 1042static int next_element_from_display_vector (struct it *);
1043static int next_element_from_string P_ ((struct it *)); 1043static int next_element_from_string (struct it *);
1044static int next_element_from_c_string P_ ((struct it *)); 1044static int next_element_from_c_string (struct it *);
1045static int next_element_from_buffer P_ ((struct it *)); 1045static int next_element_from_buffer (struct it *);
1046static int next_element_from_composition P_ ((struct it *)); 1046static int next_element_from_composition (struct it *);
1047static int next_element_from_image P_ ((struct it *)); 1047static int next_element_from_image (struct it *);
1048static int next_element_from_stretch P_ ((struct it *)); 1048static int next_element_from_stretch (struct it *);
1049static void load_overlay_strings P_ ((struct it *, int)); 1049static void load_overlay_strings (struct it *, int);
1050static int init_from_display_pos P_ ((struct it *, struct window *, 1050static int init_from_display_pos (struct it *, struct window *,
1051 struct display_pos *)); 1051 struct display_pos *);
1052static void reseat_to_string P_ ((struct it *, unsigned char *, 1052static void reseat_to_string (struct it *, unsigned char *,
1053 Lisp_Object, int, int, int, int)); 1053 Lisp_Object, int, int, int, int);
1054static enum move_it_result 1054static enum move_it_result
1055 move_it_in_display_line_to (struct it *, EMACS_INT, int, 1055 move_it_in_display_line_to (struct it *, EMACS_INT, int,
1056 enum move_operation_enum); 1056 enum move_operation_enum);
1057void move_it_vertically_backward P_ ((struct it *, int)); 1057void move_it_vertically_backward (struct it *, int);
1058static void init_to_row_start P_ ((struct it *, struct window *, 1058static void init_to_row_start (struct it *, struct window *,
1059 struct glyph_row *)); 1059 struct glyph_row *);
1060static int init_to_row_end P_ ((struct it *, struct window *, 1060static int init_to_row_end (struct it *, struct window *,
1061 struct glyph_row *)); 1061 struct glyph_row *);
1062static void back_to_previous_line_start P_ ((struct it *)); 1062static void back_to_previous_line_start (struct it *);
1063static int forward_to_next_line_start P_ ((struct it *, int *)); 1063static int forward_to_next_line_start (struct it *, int *);
1064static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos, 1064static struct text_pos string_pos_nchars_ahead (struct text_pos,
1065 Lisp_Object, int)); 1065 Lisp_Object, int);
1066static struct text_pos string_pos P_ ((int, Lisp_Object)); 1066static struct text_pos string_pos (int, Lisp_Object);
1067static struct text_pos c_string_pos P_ ((int, unsigned char *, int)); 1067static struct text_pos c_string_pos (int, unsigned char *, int);
1068static int number_of_chars P_ ((unsigned char *, int)); 1068static int number_of_chars (unsigned char *, int);
1069static void compute_stop_pos P_ ((struct it *)); 1069static void compute_stop_pos (struct it *);
1070static void compute_string_pos P_ ((struct text_pos *, struct text_pos, 1070static void compute_string_pos (struct text_pos *, struct text_pos,
1071 Lisp_Object)); 1071 Lisp_Object);
1072static int face_before_or_after_it_pos P_ ((struct it *, int)); 1072static int face_before_or_after_it_pos (struct it *, int);
1073static EMACS_INT next_overlay_change P_ ((EMACS_INT)); 1073static EMACS_INT next_overlay_change (EMACS_INT);
1074static int handle_single_display_spec P_ ((struct it *, Lisp_Object, 1074static int handle_single_display_spec (struct it *, Lisp_Object,
1075 Lisp_Object, Lisp_Object, 1075 Lisp_Object, Lisp_Object,
1076 struct text_pos *, int)); 1076 struct text_pos *, int);
1077static int underlying_face_id P_ ((struct it *)); 1077static int underlying_face_id (struct it *);
1078static int in_ellipses_for_invisible_text_p P_ ((struct display_pos *, 1078static int in_ellipses_for_invisible_text_p (struct display_pos *,
1079 struct window *)); 1079 struct window *);
1080 1080
1081#define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1) 1081#define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1)
1082#define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0) 1082#define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0)
1083 1083
1084#ifdef HAVE_WINDOW_SYSTEM 1084#ifdef HAVE_WINDOW_SYSTEM
1085 1085
1086static void update_tool_bar P_ ((struct frame *, int)); 1086static void update_tool_bar (struct frame *, int);
1087static void build_desired_tool_bar_string P_ ((struct frame *f)); 1087static void build_desired_tool_bar_string (struct frame *f);
1088static int redisplay_tool_bar P_ ((struct frame *)); 1088static int redisplay_tool_bar (struct frame *);
1089static void display_tool_bar_line P_ ((struct it *, int)); 1089static void display_tool_bar_line (struct it *, int);
1090static void notice_overwritten_cursor P_ ((struct window *, 1090static void notice_overwritten_cursor (struct window *,
1091 enum glyph_row_area, 1091 enum glyph_row_area,
1092 int, int, int, int)); 1092 int, int, int, int);
1093static void append_stretch_glyph P_ ((struct it *, Lisp_Object, 1093static void append_stretch_glyph (struct it *, Lisp_Object,
1094 int, int, int)); 1094 int, int, int);
1095 1095
1096 1096
1097 1097
@@ -5839,7 +5839,7 @@ reseat_to_string (it, s, string, charpos, precision, field_width, multibyte)
5839 5839
5840/* Map enum it_method value to corresponding next_element_from_* function. */ 5840/* Map enum it_method value to corresponding next_element_from_* function. */
5841 5841
5842static int (* get_next_element[NUM_IT_METHODS]) P_ ((struct it *it)) = 5842static int (* get_next_element[NUM_IT_METHODS]) (struct it *it) =
5843{ 5843{
5844 next_element_from_buffer, 5844 next_element_from_buffer,
5845 next_element_from_display_vector, 5845 next_element_from_display_vector,
@@ -8813,7 +8813,7 @@ static int
8813with_echo_area_buffer (w, which, fn, a1, a2, a3, a4) 8813with_echo_area_buffer (w, which, fn, a1, a2, a3, a4)
8814 struct window *w; 8814 struct window *w;
8815 int which; 8815 int which;
8816 int (*fn) P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT)); 8816 int (*fn) (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT);
8817 EMACS_INT a1; 8817 EMACS_INT a1;
8818 Lisp_Object a2; 8818 Lisp_Object a2;
8819 EMACS_INT a3, a4; 8819 EMACS_INT a3, a4;
@@ -11204,8 +11204,8 @@ note_tool_bar_highlight (f, x, y)
11204 Horizontal scrolling 11204 Horizontal scrolling
11205 ************************************************************************/ 11205 ************************************************************************/
11206 11206
11207static int hscroll_window_tree P_ ((Lisp_Object)); 11207static int hscroll_window_tree (Lisp_Object);
11208static int hscroll_windows P_ ((Lisp_Object)); 11208static int hscroll_windows (Lisp_Object);
11209 11209
11210/* For all leaf windows in the window tree rooted at WINDOW, set their 11210/* For all leaf windows in the window tree rooted at WINDOW, set their
11211 hscroll value so that PT is (i) visible in the window, and (ii) so 11211 hscroll value so that PT is (i) visible in the window, and (ii) so
@@ -15384,12 +15384,12 @@ try_window_reusing_current_matrix (w)
15384 Window redisplay reusing current matrix when buffer has changed 15384 Window redisplay reusing current matrix when buffer has changed
15385 ************************************************************************/ 15385 ************************************************************************/
15386 15386
15387static struct glyph_row *find_last_unchanged_at_beg_row P_ ((struct window *)); 15387static struct glyph_row *find_last_unchanged_at_beg_row (struct window *);
15388static struct glyph_row *find_first_unchanged_at_end_row P_ ((struct window *, 15388static struct glyph_row *find_first_unchanged_at_end_row (struct window *,
15389 int *, int *)); 15389 int *, int *);
15390static struct glyph_row * 15390static struct glyph_row *
15391find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *, 15391find_last_row_displaying_text (struct glyph_matrix *, struct it *,
15392 struct glyph_row *)); 15392 struct glyph_row *);
15393 15393
15394 15394
15395/* Return the last row in MATRIX displaying text. If row START is 15395/* Return the last row in MATRIX displaying text. If row START is
@@ -16447,9 +16447,9 @@ try_window_id (w)
16447 16447
16448#if GLYPH_DEBUG 16448#if GLYPH_DEBUG
16449 16449
16450void dump_glyph_row P_ ((struct glyph_row *, int, int)); 16450void dump_glyph_row (struct glyph_row *, int, int);
16451void dump_glyph_matrix P_ ((struct glyph_matrix *, int)); 16451void dump_glyph_matrix (struct glyph_matrix *, int);
16452void dump_glyph P_ ((struct glyph_row *, struct glyph *, int)); 16452void dump_glyph (struct glyph_row *, struct glyph *, int);
16453 16453
16454 16454
16455/* Dump the contents of glyph matrix MATRIX on stderr. 16455/* Dump the contents of glyph matrix MATRIX on stderr.
diff --git a/src/xfaces.c b/src/xfaces.c
index 6bde1c121d2..714b07c0800 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -510,56 +510,56 @@ int menu_face_changed_default;
510struct table_entry; 510struct table_entry;
511struct named_merge_point; 511struct named_merge_point;
512 512
513static void map_tty_color P_ ((struct frame *, struct face *, 513static void map_tty_color (struct frame *, struct face *,
514 enum lface_attribute_index, int *)); 514 enum lface_attribute_index, int *);
515static Lisp_Object resolve_face_name P_ ((Lisp_Object, int)); 515static Lisp_Object resolve_face_name (Lisp_Object, int);
516static int may_use_scalable_font_p P_ ((const char *)); 516static int may_use_scalable_font_p (const char *);
517static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object)); 517static void set_font_frame_param (Lisp_Object, Lisp_Object);
518static int get_lface_attributes P_ ((struct frame *, Lisp_Object, Lisp_Object *, 518static int get_lface_attributes (struct frame *, Lisp_Object, Lisp_Object *,
519 int, struct named_merge_point *)); 519 int, struct named_merge_point *);
520static int load_pixmap P_ ((struct frame *, Lisp_Object, unsigned *, unsigned *)); 520static int load_pixmap (struct frame *, Lisp_Object, unsigned *, unsigned *);
521static struct frame *frame_or_selected_frame P_ ((Lisp_Object, int)); 521static struct frame *frame_or_selected_frame (Lisp_Object, int);
522static void load_face_colors P_ ((struct frame *, struct face *, Lisp_Object *)); 522static void load_face_colors (struct frame *, struct face *, Lisp_Object *);
523static void free_face_colors P_ ((struct frame *, struct face *)); 523static void free_face_colors (struct frame *, struct face *);
524static int face_color_gray_p P_ ((struct frame *, char *)); 524static int face_color_gray_p (struct frame *, char *);
525static struct face *realize_face P_ ((struct face_cache *, Lisp_Object *, 525static struct face *realize_face (struct face_cache *, Lisp_Object *,
526 int)); 526 int);
527static struct face *realize_non_ascii_face P_ ((struct frame *, Lisp_Object, 527static struct face *realize_non_ascii_face (struct frame *, Lisp_Object,
528 struct face *)); 528 struct face *);
529static struct face *realize_x_face P_ ((struct face_cache *, Lisp_Object *)); 529static struct face *realize_x_face (struct face_cache *, Lisp_Object *);
530static struct face *realize_tty_face P_ ((struct face_cache *, Lisp_Object *)); 530static struct face *realize_tty_face (struct face_cache *, Lisp_Object *);
531static int realize_basic_faces P_ ((struct frame *)); 531static int realize_basic_faces (struct frame *);
532static int realize_default_face P_ ((struct frame *)); 532static int realize_default_face (struct frame *);
533static void realize_named_face P_ ((struct frame *, Lisp_Object, int)); 533static void realize_named_face (struct frame *, Lisp_Object, int);
534static int lface_fully_specified_p P_ ((Lisp_Object *)); 534static int lface_fully_specified_p (Lisp_Object *);
535static int lface_equal_p P_ ((Lisp_Object *, Lisp_Object *)); 535static int lface_equal_p (Lisp_Object *, Lisp_Object *);
536static unsigned hash_string_case_insensitive P_ ((Lisp_Object)); 536static unsigned hash_string_case_insensitive (Lisp_Object);
537static unsigned lface_hash P_ ((Lisp_Object *)); 537static unsigned lface_hash (Lisp_Object *);
538static int lface_same_font_attributes_p P_ ((Lisp_Object *, Lisp_Object *)); 538static int lface_same_font_attributes_p (Lisp_Object *, Lisp_Object *);
539static struct face_cache *make_face_cache P_ ((struct frame *)); 539static struct face_cache *make_face_cache (struct frame *);
540static void clear_face_gcs P_ ((struct face_cache *)); 540static void clear_face_gcs (struct face_cache *);
541static void free_face_cache P_ ((struct face_cache *)); 541static void free_face_cache (struct face_cache *);
542static int face_fontset P_ ((Lisp_Object *)); 542static int face_fontset (Lisp_Object *);
543static void merge_face_vectors P_ ((struct frame *, Lisp_Object *, Lisp_Object*, 543static void merge_face_vectors (struct frame *, Lisp_Object *, Lisp_Object*,
544 struct named_merge_point *)); 544 struct named_merge_point *);
545static int merge_face_ref P_ ((struct frame *, Lisp_Object, Lisp_Object *, 545static int merge_face_ref (struct frame *, Lisp_Object, Lisp_Object *,
546 int, struct named_merge_point *)); 546 int, struct named_merge_point *);
547static int set_lface_from_font P_ ((struct frame *, Lisp_Object, Lisp_Object, 547static int set_lface_from_font (struct frame *, Lisp_Object, Lisp_Object,
548 int)); 548 int);
549static Lisp_Object lface_from_face_name P_ ((struct frame *, Lisp_Object, int)); 549static Lisp_Object lface_from_face_name (struct frame *, Lisp_Object, int);
550static struct face *make_realized_face P_ ((Lisp_Object *)); 550static struct face *make_realized_face (Lisp_Object *);
551static void cache_face P_ ((struct face_cache *, struct face *, unsigned)); 551static void cache_face (struct face_cache *, struct face *, unsigned);
552static void uncache_face P_ ((struct face_cache *, struct face *)); 552static void uncache_face (struct face_cache *, struct face *);
553 553
554#ifdef HAVE_WINDOW_SYSTEM 554#ifdef HAVE_WINDOW_SYSTEM
555 555
556static GC x_create_gc P_ ((struct frame *, unsigned long, XGCValues *)); 556static GC x_create_gc (struct frame *, unsigned long, XGCValues *);
557static void x_free_gc P_ ((struct frame *, GC)); 557static void x_free_gc (struct frame *, GC);
558 558
559#ifdef USE_X_TOOLKIT 559#ifdef USE_X_TOOLKIT
560static void x_update_menu_appearance P_ ((struct frame *)); 560static void x_update_menu_appearance (struct frame *);
561 561
562extern void free_frame_menubar P_ ((struct frame *)); 562extern void free_frame_menubar (struct frame *);
563#endif /* USE_X_TOOLKIT */ 563#endif /* USE_X_TOOLKIT */
564 564
565#endif /* HAVE_WINDOW_SYSTEM */ 565#endif /* HAVE_WINDOW_SYSTEM */
@@ -3778,7 +3778,7 @@ x_update_menu_appearance (f)
3778 { 3778 {
3779#if defined HAVE_X_I18N 3779#if defined HAVE_X_I18N
3780 extern char *xic_create_fontsetname 3780 extern char *xic_create_fontsetname
3781 P_ ((char *base_fontname, Bool motif)); 3781 (char *base_fontname, Bool motif);
3782 char *fontsetname = xic_create_fontsetname (SDATA (xlfd), motif); 3782 char *fontsetname = xic_create_fontsetname (SDATA (xlfd), motif);
3783#else 3783#else
3784 char *fontsetname = (char *) SDATA (xlfd); 3784 char *fontsetname = (char *) SDATA (xlfd);
diff --git a/src/xfns.c b/src/xfns.c
index ea592417d1f..74ddce6cf56 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -499,33 +499,33 @@ x_top_window_to_frame (dpyinfo, wdesc)
499 499
500 500
501 501
502static void x_default_font_parameter P_ ((struct frame *, Lisp_Object)); 502static void x_default_font_parameter (struct frame *, Lisp_Object);
503 503
504static Lisp_Object unwind_create_frame P_ ((Lisp_Object)); 504static Lisp_Object unwind_create_frame (Lisp_Object);
505static Lisp_Object unwind_create_tip_frame P_ ((Lisp_Object)); 505static Lisp_Object unwind_create_tip_frame (Lisp_Object);
506 506
507void x_set_foreground_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); 507void x_set_foreground_color (struct frame *, Lisp_Object, Lisp_Object);
508static void x_set_wait_for_wm P_ ((struct frame *, Lisp_Object, Lisp_Object)); 508static void x_set_wait_for_wm (struct frame *, Lisp_Object, Lisp_Object);
509void x_set_background_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); 509void x_set_background_color (struct frame *, Lisp_Object, Lisp_Object);
510void x_set_mouse_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); 510void x_set_mouse_color (struct frame *, Lisp_Object, Lisp_Object);
511void x_set_cursor_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); 511void x_set_cursor_color (struct frame *, Lisp_Object, Lisp_Object);
512void x_set_border_color P_ ((struct frame *, Lisp_Object, Lisp_Object)); 512void x_set_border_color (struct frame *, Lisp_Object, Lisp_Object);
513void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object)); 513void x_set_cursor_type (struct frame *, Lisp_Object, Lisp_Object);
514void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object)); 514void x_set_icon_type (struct frame *, Lisp_Object, Lisp_Object);
515void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); 515void x_set_icon_name (struct frame *, Lisp_Object, Lisp_Object);
516void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object)); 516void x_explicitly_set_name (struct frame *, Lisp_Object, Lisp_Object);
517void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); 517void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
518void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object)); 518void x_set_title (struct frame *, Lisp_Object, Lisp_Object);
519void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); 519void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
520void x_set_scroll_bar_foreground P_ ((struct frame *, Lisp_Object, 520void x_set_scroll_bar_foreground (struct frame *, Lisp_Object,
521 Lisp_Object)); 521 Lisp_Object);
522void x_set_scroll_bar_background P_ ((struct frame *, Lisp_Object, 522void x_set_scroll_bar_background (struct frame *, Lisp_Object,
523 Lisp_Object)); 523 Lisp_Object);
524static Lisp_Object x_default_scroll_bar_color_parameter P_ ((struct frame *, 524static Lisp_Object x_default_scroll_bar_color_parameter (struct frame *,
525 Lisp_Object, 525 Lisp_Object,
526 Lisp_Object, 526 Lisp_Object,
527 char *, char *, 527 char *, char *,
528 int)); 528 int);
529 529
530 530
531/* Store the screen positions of frame F into XPTR and YPTR. 531/* Store the screen positions of frame F into XPTR and YPTR.
@@ -1938,8 +1938,8 @@ hack_wm_protocols (f, widget)
1938 1938
1939#ifdef HAVE_X_I18N 1939#ifdef HAVE_X_I18N
1940 1940
1941static XFontSet xic_create_xfontset P_ ((struct frame *)); 1941static XFontSet xic_create_xfontset (struct frame *);
1942static XIMStyle best_xim_style P_ ((XIMStyles *, XIMStyles *)); 1942static XIMStyle best_xim_style (XIMStyles *, XIMStyles *);
1943 1943
1944 1944
1945/* Supported XIM styles, ordered by preference. */ 1945/* Supported XIM styles, ordered by preference. */
@@ -4665,10 +4665,10 @@ hide_hourglass ()
4665 Tool tips 4665 Tool tips
4666 ***********************************************************************/ 4666 ***********************************************************************/
4667 4667
4668static Lisp_Object x_create_tip_frame P_ ((struct x_display_info *, 4668static Lisp_Object x_create_tip_frame (struct x_display_info *,
4669 Lisp_Object, Lisp_Object)); 4669 Lisp_Object, Lisp_Object);
4670static void compute_tip_xy P_ ((struct frame *, Lisp_Object, Lisp_Object, 4670static void compute_tip_xy (struct frame *, Lisp_Object, Lisp_Object,
4671 Lisp_Object, int, int, int *, int *)); 4671 Lisp_Object, int, int, int *, int *);
4672 4672
4673/* The frame of a currently visible tooltip. */ 4673/* The frame of a currently visible tooltip. */
4674 4674
@@ -5341,7 +5341,7 @@ Value is t if tooltip was open, nil otherwise. */)
5341 { 5341 {
5342 struct frame *f = SELECTED_FRAME (); 5342 struct frame *f = SELECTED_FRAME ();
5343 Widget w = f->output_data.x->menubar_widget; 5343 Widget w = f->output_data.x->menubar_widget;
5344 extern void xlwmenu_redisplay P_ ((Widget)); 5344 extern void xlwmenu_redisplay (Widget);
5345 5345
5346 if (!DoesSaveUnders (FRAME_X_DISPLAY_INFO (f)->screen) 5346 if (!DoesSaveUnders (FRAME_X_DISPLAY_INFO (f)->screen)
5347 && w != NULL) 5347 && w != NULL)
diff --git a/src/xfont.c b/src/xfont.c
index d8fe40eaa93..8a1d960343c 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -47,9 +47,9 @@ struct xfont_info
47}; 47};
48 48
49/* Prototypes of support functions. */ 49/* Prototypes of support functions. */
50extern void x_clear_errors P_ ((Display *)); 50extern void x_clear_errors (Display *);
51 51
52static XCharStruct *xfont_get_pcm P_ ((XFontStruct *, XChar2b *)); 52static XCharStruct *xfont_get_pcm (XFontStruct *, XChar2b *);
53 53
54/* Get metrics of character CHAR2B in XFONT. Value is null if CHAR2B 54/* Get metrics of character CHAR2B in XFONT. Value is null if CHAR2B
55 is not contained in the font. */ 55 is not contained in the font. */
@@ -119,19 +119,19 @@ xfont_get_pcm (xfont, char2b)
119 ? NULL : pcm); 119 ? NULL : pcm);
120} 120}
121 121
122static Lisp_Object xfont_get_cache P_ ((FRAME_PTR)); 122static Lisp_Object xfont_get_cache (FRAME_PTR);
123static Lisp_Object xfont_list P_ ((Lisp_Object, Lisp_Object)); 123static Lisp_Object xfont_list (Lisp_Object, Lisp_Object);
124static Lisp_Object xfont_match P_ ((Lisp_Object, Lisp_Object)); 124static Lisp_Object xfont_match (Lisp_Object, Lisp_Object);
125static Lisp_Object xfont_list_family P_ ((Lisp_Object)); 125static Lisp_Object xfont_list_family (Lisp_Object);
126static Lisp_Object xfont_open P_ ((FRAME_PTR, Lisp_Object, int)); 126static Lisp_Object xfont_open (FRAME_PTR, Lisp_Object, int);
127static void xfont_close P_ ((FRAME_PTR, struct font *)); 127static void xfont_close (FRAME_PTR, struct font *);
128static int xfont_prepare_face P_ ((FRAME_PTR, struct face *)); 128static int xfont_prepare_face (FRAME_PTR, struct face *);
129static int xfont_has_char P_ ((Lisp_Object, int)); 129static int xfont_has_char (Lisp_Object, int);
130static unsigned xfont_encode_char P_ ((struct font *, int)); 130static unsigned xfont_encode_char (struct font *, int);
131static int xfont_text_extents P_ ((struct font *, unsigned *, int, 131static int xfont_text_extents (struct font *, unsigned *, int,
132 struct font_metrics *)); 132 struct font_metrics *);
133static int xfont_draw P_ ((struct glyph_string *, int, int, int, int, int)); 133static int xfont_draw (struct glyph_string *, int, int, int, int, int);
134static int xfont_check P_ ((FRAME_PTR, struct font *)); 134static int xfont_check (FRAME_PTR, struct font *);
135 135
136struct font_driver xfont_driver = 136struct font_driver xfont_driver =
137 { 137 {
diff --git a/src/xftfont.c b/src/xftfont.c
index 197cc9c1f5b..8aeb6397f07 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -70,9 +70,9 @@ struct xftface_info
70 XftColor xft_bg; /* color for face->background */ 70 XftColor xft_bg; /* color for face->background */
71}; 71};
72 72
73static void xftfont_get_colors P_ ((FRAME_PTR, struct face *, GC gc, 73static void xftfont_get_colors (FRAME_PTR, struct face *, GC gc,
74 struct xftface_info *, 74 struct xftface_info *,
75 XftColor *fg, XftColor *bg)); 75 XftColor *fg, XftColor *bg);
76 76
77 77
78/* Setup foreground and background colors of GC into FG and BG. If 78/* 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)
141} 141}
142 142
143 143
144static Lisp_Object xftfont_list P_ ((Lisp_Object, Lisp_Object)); 144static Lisp_Object xftfont_list (Lisp_Object, Lisp_Object);
145static Lisp_Object xftfont_match P_ ((Lisp_Object, Lisp_Object)); 145static Lisp_Object xftfont_match (Lisp_Object, Lisp_Object);
146static Lisp_Object xftfont_open P_ ((FRAME_PTR, Lisp_Object, int)); 146static Lisp_Object xftfont_open (FRAME_PTR, Lisp_Object, int);
147static void xftfont_close P_ ((FRAME_PTR, struct font *)); 147static void xftfont_close (FRAME_PTR, struct font *);
148static int xftfont_prepare_face P_ ((FRAME_PTR, struct face *)); 148static int xftfont_prepare_face (FRAME_PTR, struct face *);
149static void xftfont_done_face P_ ((FRAME_PTR, struct face *)); 149static void xftfont_done_face (FRAME_PTR, struct face *);
150static int xftfont_has_char P_ ((Lisp_Object, int)); 150static int xftfont_has_char (Lisp_Object, int);
151static unsigned xftfont_encode_char P_ ((struct font *, int)); 151static unsigned xftfont_encode_char (struct font *, int);
152static int xftfont_text_extents P_ ((struct font *, unsigned *, int, 152static int xftfont_text_extents (struct font *, unsigned *, int,
153 struct font_metrics *)); 153 struct font_metrics *);
154static int xftfont_draw P_ ((struct glyph_string *, int, int, int, int, int)); 154static int xftfont_draw (struct glyph_string *, int, int, int, int, int);
155static int xftfont_end_for_frame P_ ((FRAME_PTR f)); 155static int xftfont_end_for_frame (FRAME_PTR f);
156 156
157struct font_driver xftfont_driver; 157struct font_driver xftfont_driver;
158 158
@@ -180,8 +180,8 @@ xftfont_match (frame, spec)
180 return entity; 180 return entity;
181} 181}
182 182
183extern Lisp_Object ftfont_font_format P_ ((FcPattern *, Lisp_Object)); 183extern Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object);
184extern FcCharSet *ftfont_get_fc_charset P_ ((Lisp_Object)); 184extern FcCharSet *ftfont_get_fc_charset (Lisp_Object);
185extern Lisp_Object QCantialias; 185extern Lisp_Object QCantialias;
186 186
187static FcChar8 ascii_printable[95]; 187static FcChar8 ascii_printable[95];
diff --git a/src/xmenu.c b/src/xmenu.c
index 53b6b8de48a..189bcbf9a25 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -122,22 +122,22 @@ extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
122extern Lisp_Object Qmenu_bar_update_hook; 122extern Lisp_Object Qmenu_bar_update_hook;
123 123
124#ifdef USE_X_TOOLKIT 124#ifdef USE_X_TOOLKIT
125extern void set_frame_menubar P_ ((FRAME_PTR, int, int)); 125extern void set_frame_menubar (FRAME_PTR, int, int);
126extern XtAppContext Xt_app_con; 126extern XtAppContext Xt_app_con;
127 127
128static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, Lisp_Object, 128static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object,
129 char **)); 129 char **);
130static void popup_get_selection P_ ((XEvent *, struct x_display_info *, 130static void popup_get_selection (XEvent *, struct x_display_info *,
131 LWLIB_ID, int)); 131 LWLIB_ID, int);
132#endif /* USE_X_TOOLKIT */ 132#endif /* USE_X_TOOLKIT */
133 133
134#ifdef USE_GTK 134#ifdef USE_GTK
135extern void set_frame_menubar P_ ((FRAME_PTR, int, int)); 135extern void set_frame_menubar (FRAME_PTR, int, int);
136static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, Lisp_Object, 136static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object,
137 char **)); 137 char **);
138#endif 138#endif
139 139
140static int update_frame_menubar P_ ((struct frame *)); 140static int update_frame_menubar (struct frame *);
141 141
142/* Flag which when set indicates a dialog or menu has been posted by 142/* Flag which when set indicates a dialog or menu has been posted by
143 Xt on behalf of one of the widget sets. */ 143 Xt on behalf of one of the widget sets. */
@@ -147,8 +147,8 @@ static int next_menubar_widget_id;
147 147
148/* For NS and NTGUI, these prototypes are defined in keyboard.h. */ 148/* For NS and NTGUI, these prototypes are defined in keyboard.h. */
149#if defined (USE_X_TOOLKIT) || defined (USE_GTK) 149#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
150extern widget_value *xmalloc_widget_value P_ ((void)); 150extern widget_value *xmalloc_widget_value (void);
151extern widget_value *digest_single_submenu P_ ((int, int, int)); 151extern widget_value *digest_single_submenu (int, int, int);
152#endif 152#endif
153 153
154/* This is set nonzero after the user activates the menu bar, and set 154/* This is set nonzero after the user activates the menu bar, and set
diff --git a/src/xselect.c b/src/xselect.c
index e2027736855..459e5335123 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/>. */
45 45
46struct prop_location; 46struct prop_location;
47 47
48static Lisp_Object x_atom_to_symbol P_ ((Display *dpy, Atom atom)); 48static Lisp_Object x_atom_to_symbol (Display *dpy, Atom atom);
49static Atom symbol_to_x_atom P_ ((struct x_display_info *, Display *, 49static Atom symbol_to_x_atom (struct x_display_info *, Display *,
50 Lisp_Object)); 50 Lisp_Object);
51static void x_own_selection P_ ((Lisp_Object, Lisp_Object)); 51static void x_own_selection (Lisp_Object, Lisp_Object);
52static Lisp_Object x_get_local_selection P_ ((Lisp_Object, Lisp_Object, int)); 52static Lisp_Object x_get_local_selection (Lisp_Object, Lisp_Object, int);
53static void x_decline_selection_request P_ ((struct input_event *)); 53static void x_decline_selection_request (struct input_event *);
54static Lisp_Object x_selection_request_lisp_error P_ ((Lisp_Object)); 54static Lisp_Object x_selection_request_lisp_error (Lisp_Object);
55static Lisp_Object queue_selection_requests_unwind P_ ((Lisp_Object)); 55static Lisp_Object queue_selection_requests_unwind (Lisp_Object);
56static Lisp_Object some_frame_on_display P_ ((struct x_display_info *)); 56static Lisp_Object some_frame_on_display (struct x_display_info *);
57static Lisp_Object x_catch_errors_unwind P_ ((Lisp_Object)); 57static Lisp_Object x_catch_errors_unwind (Lisp_Object);
58static void x_reply_selection_request P_ ((struct input_event *, int, 58static void x_reply_selection_request (struct input_event *, int,
59 unsigned char *, int, Atom)); 59 unsigned char *, int, Atom);
60static int waiting_for_other_props_on_window P_ ((Display *, Window)); 60static int waiting_for_other_props_on_window (Display *, Window);
61static struct prop_location *expect_property_change P_ ((Display *, Window, 61static struct prop_location *expect_property_change (Display *, Window,
62 Atom, int)); 62 Atom, int);
63static void unexpect_property_change P_ ((struct prop_location *)); 63static void unexpect_property_change (struct prop_location *);
64static Lisp_Object wait_for_property_change_unwind P_ ((Lisp_Object)); 64static Lisp_Object wait_for_property_change_unwind (Lisp_Object);
65static void wait_for_property_change P_ ((struct prop_location *)); 65static void wait_for_property_change (struct prop_location *);
66static Lisp_Object x_get_foreign_selection P_ ((Lisp_Object, 66static Lisp_Object x_get_foreign_selection (Lisp_Object,
67 Lisp_Object, 67 Lisp_Object,
68 Lisp_Object)); 68 Lisp_Object);
69static void x_get_window_property P_ ((Display *, Window, Atom, 69static void x_get_window_property (Display *, Window, Atom,
70 unsigned char **, int *, 70 unsigned char **, int *,
71 Atom *, int *, unsigned long *, int)); 71 Atom *, int *, unsigned long *, int);
72static void receive_incremental_selection P_ ((Display *, Window, Atom, 72static void receive_incremental_selection (Display *, Window, Atom,
73 Lisp_Object, unsigned, 73 Lisp_Object, unsigned,
74 unsigned char **, int *, 74 unsigned char **, int *,
75 Atom *, int *, unsigned long *)); 75 Atom *, int *, unsigned long *);
76static Lisp_Object x_get_window_property_as_lisp_data P_ ((Display *, 76static Lisp_Object x_get_window_property_as_lisp_data (Display *,
77 Window, Atom, 77 Window, Atom,
78 Lisp_Object, Atom)); 78 Lisp_Object, Atom);
79static Lisp_Object selection_data_to_lisp_data P_ ((Display *, unsigned char *, 79static Lisp_Object selection_data_to_lisp_data (Display *, unsigned char *,
80 int, Atom, int)); 80 int, Atom, int);
81static void lisp_data_to_selection_data P_ ((Display *, Lisp_Object, 81static void lisp_data_to_selection_data (Display *, Lisp_Object,
82 unsigned char **, Atom *, 82 unsigned char **, Atom *,
83 unsigned *, int *, int *)); 83 unsigned *, int *, int *);
84static Lisp_Object clean_local_selection_data P_ ((Lisp_Object)); 84static Lisp_Object clean_local_selection_data (Lisp_Object);
85static void initialize_cut_buffers P_ ((Display *, Window)); 85static void initialize_cut_buffers (Display *, Window);
86 86
87 87
88/* Printing traces to stderr. */ 88/* Printing traces to stderr. */
diff --git a/src/xterm.c b/src/xterm.c
index e3ce7bb6538..2279f71189f 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/>. */
104#endif 104#endif
105 105
106#ifdef USE_LUCID 106#ifdef USE_LUCID
107extern int xlwmenu_window_p P_ ((Widget w, Window window)); 107extern int xlwmenu_window_p (Widget w, Window window);
108extern void xlwmenu_redisplay P_ ((Widget)); 108extern void xlwmenu_redisplay (Widget);
109#endif 109#endif
110 110
111#if defined (USE_X_TOOLKIT) || defined (USE_GTK) 111#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
112 112
113extern void free_frame_menubar P_ ((struct frame *)); 113extern void free_frame_menubar (struct frame *);
114#endif 114#endif
115 115
116#ifdef USE_X_TOOLKIT 116#ifdef USE_X_TOOLKIT
@@ -332,54 +332,54 @@ Lisp_Object Qx_gtk_map_stock;
332 332
333extern Lisp_Object Vinhibit_redisplay; 333extern Lisp_Object Vinhibit_redisplay;
334 334
335extern XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *)); 335extern XrmDatabase x_load_resources (Display *, char *, char *, char *);
336extern int x_bitmap_mask P_ ((FRAME_PTR, int)); 336extern int x_bitmap_mask (FRAME_PTR, int);
337 337
338static int x_alloc_nearest_color_1 P_ ((Display *, Colormap, XColor *)); 338static int x_alloc_nearest_color_1 (Display *, Colormap, XColor *);
339static void x_set_window_size_1 P_ ((struct frame *, int, int, int)); 339static void x_set_window_size_1 (struct frame *, int, int, int);
340static const XColor *x_color_cells P_ ((Display *, int *)); 340static const XColor *x_color_cells (Display *, int *);
341static void x_update_window_end P_ ((struct window *, int, int)); 341static void x_update_window_end (struct window *, int, int);
342 342
343static int x_io_error_quitter P_ ((Display *)); 343static int x_io_error_quitter (Display *);
344static struct terminal *x_create_terminal P_ ((struct x_display_info *)); 344static struct terminal *x_create_terminal (struct x_display_info *);
345void x_delete_terminal P_ ((struct terminal *)); 345void x_delete_terminal (struct terminal *);
346static void x_update_end P_ ((struct frame *)); 346static void x_update_end (struct frame *);
347static void XTframe_up_to_date P_ ((struct frame *)); 347static void XTframe_up_to_date (struct frame *);
348static void XTset_terminal_modes P_ ((struct terminal *)); 348static void XTset_terminal_modes (struct terminal *);
349static void XTreset_terminal_modes P_ ((struct terminal *)); 349static void XTreset_terminal_modes (struct terminal *);
350static void x_clear_frame P_ ((struct frame *)); 350static void x_clear_frame (struct frame *);
351static void frame_highlight P_ ((struct frame *)); 351static void frame_highlight (struct frame *);
352static void frame_unhighlight P_ ((struct frame *)); 352static void frame_unhighlight (struct frame *);
353static void x_new_focus_frame P_ ((struct x_display_info *, struct frame *)); 353static void x_new_focus_frame (struct x_display_info *, struct frame *);
354static void x_focus_changed P_ ((int, int, struct x_display_info *, 354static void x_focus_changed (int, int, struct x_display_info *,
355 struct frame *, struct input_event *)); 355 struct frame *, struct input_event *);
356static void x_detect_focus_change P_ ((struct x_display_info *, 356static void x_detect_focus_change (struct x_display_info *,
357 XEvent *, struct input_event *)); 357 XEvent *, struct input_event *);
358static void XTframe_rehighlight P_ ((struct frame *)); 358static void XTframe_rehighlight (struct frame *);
359static void x_frame_rehighlight P_ ((struct x_display_info *)); 359static void x_frame_rehighlight (struct x_display_info *);
360static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *)); 360static void x_draw_hollow_cursor (struct window *, struct glyph_row *);
361static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int, 361static void x_draw_bar_cursor (struct window *, struct glyph_row *, int,
362 enum text_cursor_kinds)); 362 enum text_cursor_kinds);
363 363
364static void x_clip_to_row P_ ((struct window *, struct glyph_row *, int, GC)); 364static void x_clip_to_row (struct window *, struct glyph_row *, int, GC);
365static void x_flush P_ ((struct frame *f)); 365static void x_flush (struct frame *f);
366static void x_update_begin P_ ((struct frame *)); 366static void x_update_begin (struct frame *);
367static void x_update_window_begin P_ ((struct window *)); 367static void x_update_window_begin (struct window *);
368static void x_after_update_window_line P_ ((struct glyph_row *)); 368static void x_after_update_window_line (struct glyph_row *);
369static struct scroll_bar *x_window_to_scroll_bar P_ ((Display *, Window)); 369static struct scroll_bar *x_window_to_scroll_bar (Display *, Window);
370static void x_scroll_bar_report_motion P_ ((struct frame **, Lisp_Object *, 370static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *,
371 enum scroll_bar_part *, 371 enum scroll_bar_part *,
372 Lisp_Object *, Lisp_Object *, 372 Lisp_Object *, Lisp_Object *,
373 unsigned long *)); 373 unsigned long *);
374static void x_handle_net_wm_state P_ ((struct frame *, XPropertyEvent *)); 374static void x_handle_net_wm_state (struct frame *, XPropertyEvent *);
375static void x_check_fullscreen P_ ((struct frame *)); 375static void x_check_fullscreen (struct frame *);
376static void x_check_expected_move P_ ((struct frame *, int, int)); 376static void x_check_expected_move (struct frame *, int, int);
377static void x_sync_with_move P_ ((struct frame *, int, int, int)); 377static void x_sync_with_move (struct frame *, int, int, int);
378static int handle_one_xevent P_ ((struct x_display_info *, XEvent *, 378static int handle_one_xevent (struct x_display_info *, XEvent *,
379 int *, struct input_event *)); 379 int *, struct input_event *);
380/* Don't declare this NO_RETURN because we want no 380/* Don't declare this NO_RETURN because we want no
381 interference with debugging failing X calls. */ 381 interference with debugging failing X calls. */
382static SIGTYPE x_connection_closed P_ ((Display *, char *)); 382static SIGTYPE x_connection_closed (Display *, char *);
383 383
384 384
385/* Flush display of frame F, or of all frames if F is null. */ 385/* Flush display of frame F, or of all frames if F is null. */
@@ -931,37 +931,37 @@ XTreset_terminal_modes (struct terminal *terminal)
931 931
932 932
933 933
934static void x_set_glyph_string_clipping P_ ((struct glyph_string *)); 934static void x_set_glyph_string_clipping (struct glyph_string *);
935static void x_set_glyph_string_gc P_ ((struct glyph_string *)); 935static void x_set_glyph_string_gc (struct glyph_string *);
936static void x_draw_glyph_string_background P_ ((struct glyph_string *, 936static void x_draw_glyph_string_background (struct glyph_string *,
937 int)); 937 int);
938static void x_draw_glyph_string_foreground P_ ((struct glyph_string *)); 938static void x_draw_glyph_string_foreground (struct glyph_string *);
939static void x_draw_composite_glyph_string_foreground P_ ((struct glyph_string *)); 939static void x_draw_composite_glyph_string_foreground (struct glyph_string *);
940static void x_draw_glyph_string_box P_ ((struct glyph_string *)); 940static void x_draw_glyph_string_box (struct glyph_string *);
941static void x_draw_glyph_string P_ ((struct glyph_string *)); 941static void x_draw_glyph_string (struct glyph_string *);
942static void x_compute_glyph_string_overhangs P_ ((struct glyph_string *)); 942static void x_compute_glyph_string_overhangs (struct glyph_string *);
943static void x_set_cursor_gc P_ ((struct glyph_string *)); 943static void x_set_cursor_gc (struct glyph_string *);
944static void x_set_mode_line_face_gc P_ ((struct glyph_string *)); 944static void x_set_mode_line_face_gc (struct glyph_string *);
945static void x_set_mouse_face_gc P_ ((struct glyph_string *)); 945static void x_set_mouse_face_gc (struct glyph_string *);
946static int x_alloc_lighter_color P_ ((struct frame *, Display *, Colormap, 946static int x_alloc_lighter_color (struct frame *, Display *, Colormap,
947 unsigned long *, double, int)); 947 unsigned long *, double, int);
948static void x_setup_relief_color P_ ((struct frame *, struct relief *, 948static void x_setup_relief_color (struct frame *, struct relief *,
949 double, int, unsigned long)); 949 double, int, unsigned long);
950static void x_setup_relief_colors P_ ((struct glyph_string *)); 950static void x_setup_relief_colors (struct glyph_string *);
951static void x_draw_image_glyph_string P_ ((struct glyph_string *)); 951static void x_draw_image_glyph_string (struct glyph_string *);
952static void x_draw_image_relief P_ ((struct glyph_string *)); 952static void x_draw_image_relief (struct glyph_string *);
953static void x_draw_image_foreground P_ ((struct glyph_string *)); 953static void x_draw_image_foreground (struct glyph_string *);
954static void x_draw_image_foreground_1 P_ ((struct glyph_string *, Pixmap)); 954static void x_draw_image_foreground_1 (struct glyph_string *, Pixmap);
955static void x_clear_glyph_string_rect P_ ((struct glyph_string *, int, 955static void x_clear_glyph_string_rect (struct glyph_string *, int,
956 int, int, int)); 956 int, int, int);
957static void x_draw_relief_rect P_ ((struct frame *, int, int, int, int, 957static void x_draw_relief_rect (struct frame *, int, int, int, int,
958 int, int, int, int, int, int, 958 int, int, int, int, int, int,
959 XRectangle *)); 959 XRectangle *);
960static void x_draw_box_rect P_ ((struct glyph_string *, int, int, int, int, 960static void x_draw_box_rect (struct glyph_string *, int, int, int, int,
961 int, int, int, XRectangle *)); 961 int, int, int, XRectangle *);
962 962
963#if GLYPH_DEBUG 963#if GLYPH_DEBUG
964static void x_check_font P_ ((struct frame *, struct font *)); 964static void x_check_font (struct frame *, struct font *);
965#endif 965#endif
966 966
967 967
@@ -1401,11 +1401,11 @@ x_draw_composite_glyph_string_foreground (s)
1401 1401
1402#ifdef USE_X_TOOLKIT 1402#ifdef USE_X_TOOLKIT
1403 1403
1404static struct frame *x_frame_of_widget P_ ((Widget)); 1404static struct frame *x_frame_of_widget (Widget);
1405static Boolean cvt_string_to_pixel P_ ((Display *, XrmValue *, Cardinal *, 1405static Boolean cvt_string_to_pixel (Display *, XrmValue *, Cardinal *,
1406 XrmValue *, XrmValue *, XtPointer *)); 1406 XrmValue *, XrmValue *, XtPointer *);
1407static void cvt_pixel_dtor P_ ((XtAppContext, XrmValue *, XtPointer, 1407static void cvt_pixel_dtor (XtAppContext, XrmValue *, XtPointer,
1408 XrmValue *, Cardinal *)); 1408 XrmValue *, Cardinal *);
1409 1409
1410 1410
1411/* Return the frame on which widget WIDGET is used.. Abort if frame 1411/* Return the frame on which widget WIDGET is used.. Abort if frame
@@ -4125,12 +4125,12 @@ x_window_to_menu_bar (window)
4125 4125
4126#ifdef USE_TOOLKIT_SCROLL_BARS 4126#ifdef USE_TOOLKIT_SCROLL_BARS
4127 4127
4128static void x_scroll_bar_to_input_event P_ ((XEvent *, struct input_event *)); 4128static void x_scroll_bar_to_input_event (XEvent *, struct input_event *);
4129static void x_send_scroll_bar_event P_ ((Lisp_Object, int, int, int)); 4129static void x_send_scroll_bar_event (Lisp_Object, int, int, int);
4130static void x_create_toolkit_scroll_bar P_ ((struct frame *, 4130static void x_create_toolkit_scroll_bar (struct frame *,
4131 struct scroll_bar *)); 4131 struct scroll_bar *);
4132static void x_set_toolkit_scroll_bar_thumb P_ ((struct scroll_bar *, 4132static void x_set_toolkit_scroll_bar_thumb (struct scroll_bar *,
4133 int, int, int)); 4133 int, int, int);
4134 4134
4135 4135
4136/* Lisp window being scrolled. Set when starting to interact with 4136/* Lisp window being scrolled. Set when starting to interact with
@@ -7919,7 +7919,7 @@ x_connection_closed (dpy, error_message)
7919 /* If DPYINFO is null, this means we didn't open the display 7919 /* If DPYINFO is null, this means we didn't open the display
7920 in the first place, so don't try to close it. */ 7920 in the first place, so don't try to close it. */
7921 { 7921 {
7922 extern void (*fatal_error_signal_hook) P_ ((void)); 7922 extern void (*fatal_error_signal_hook) (void);
7923 fatal_error_signal_hook = x_fatal_error_signal; 7923 fatal_error_signal_hook = x_fatal_error_signal;
7924 XtCloseDisplay (dpy); 7924 XtCloseDisplay (dpy);
7925 fatal_error_signal_hook = NULL; 7925 fatal_error_signal_hook = NULL;
@@ -7980,7 +7980,7 @@ x_connection_closed (dpy, error_message)
7980 7980
7981/* We specifically use it before defining it, so that gcc doesn't inline it, 7981/* We specifically use it before defining it, so that gcc doesn't inline it,
7982 otherwise gdb doesn't know how to properly put a breakpoint on it. */ 7982 otherwise gdb doesn't know how to properly put a breakpoint on it. */
7983static void x_error_quitter P_ ((Display *, XErrorEvent *)); 7983static void x_error_quitter (Display *, XErrorEvent *);
7984 7984
7985/* This is the first-level handler for X protocol errors. 7985/* This is the first-level handler for X protocol errors.
7986 It calls x_error_quitter or x_error_catcher. */ 7986 It calls x_error_quitter or x_error_catcher. */
@@ -8167,7 +8167,7 @@ xim_destroy_callback (xim, client_data, call_data)
8167 8167
8168#ifdef HAVE_X11R6 8168#ifdef HAVE_X11R6
8169/* This isn't prototyped in OSF 5.0 or 5.1a. */ 8169/* This isn't prototyped in OSF 5.0 or 5.1a. */
8170extern char *XSetIMValues P_ ((XIM, ...)); 8170extern char *XSetIMValues (XIM, ...);
8171#endif 8171#endif
8172 8172
8173/* Open the connection to the XIM server on display DPYINFO. 8173/* Open the connection to the XIM server on display DPYINFO.
@@ -9357,7 +9357,7 @@ x_make_frame_visible (f)
9357 /* It could be confusing if a real alarm arrives while 9357 /* It could be confusing if a real alarm arrives while
9358 processing the fake one. Turn it off and let the 9358 processing the fake one. Turn it off and let the
9359 handler reset it. */ 9359 handler reset it. */
9360 extern void poll_for_input_1 P_ ((void)); 9360 extern void poll_for_input_1 (void);
9361 int old_poll_suppress_count = poll_suppress_count; 9361 int old_poll_suppress_count = poll_suppress_count;
9362 poll_suppress_count = 1; 9362 poll_suppress_count = 1;
9363 poll_for_input_1 (); 9363 poll_for_input_1 ();
generated by cgit v1.2.1 (git 2.18.0) at 2026-04-23 19:53:32 +0000