diff options
| author | Jan D | 2010-07-02 14:19:53 +0200 |
|---|---|---|
| committer | Jan D | 2010-07-02 14:19:53 +0200 |
| commit | f57e2426f0e8a6b251be71b6f62237fd286998ea (patch) | |
| tree | a8db36e415ea69b4196881b44122454317510f46 /src/font.c | |
| parent | 383e09700c9b3d175c506301d363be4597827db7 (diff) | |
| download | emacs-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/font.c')
| -rw-r--r-- | src/font.c | 64 |
1 files changed, 32 insertions, 32 deletions
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 | ||
| 232 | static int font_pixel_size P_ ((FRAME_PTR f, Lisp_Object)); | 232 | static int font_pixel_size (FRAME_PTR f, Lisp_Object); |
| 233 | static Lisp_Object font_open_entity P_ ((FRAME_PTR, Lisp_Object, int)); | 233 | static Lisp_Object font_open_entity (FRAME_PTR, Lisp_Object, int); |
| 234 | static Lisp_Object font_matching_entity P_ ((FRAME_PTR, Lisp_Object *, | 234 | static 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. */ |
| 238 | static int num_font_drivers; | 238 | static int num_font_drivers; |
| @@ -416,7 +416,7 @@ font_style_symbolic (font, prop, for_face) | |||
| 416 | 416 | ||
| 417 | extern Lisp_Object Vface_alternative_font_family_alist; | 417 | extern Lisp_Object Vface_alternative_font_family_alist; |
| 418 | 418 | ||
| 419 | extern Lisp_Object find_font_encoding P_ ((Lisp_Object)); | 419 | extern 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 | ||
| 511 | static Lisp_Object font_prop_validate P_ ((int, Lisp_Object, Lisp_Object)); | 511 | static Lisp_Object font_prop_validate (int, Lisp_Object, Lisp_Object); |
| 512 | static Lisp_Object font_prop_validate_symbol P_ ((Lisp_Object, Lisp_Object)); | 512 | static Lisp_Object font_prop_validate_symbol (Lisp_Object, Lisp_Object); |
| 513 | static Lisp_Object font_prop_validate_style P_ ((Lisp_Object, Lisp_Object)); | 513 | static Lisp_Object font_prop_validate_style (Lisp_Object, Lisp_Object); |
| 514 | static Lisp_Object font_prop_validate_non_neg P_ ((Lisp_Object, Lisp_Object)); | 514 | static Lisp_Object font_prop_validate_non_neg (Lisp_Object, Lisp_Object); |
| 515 | static Lisp_Object font_prop_validate_spacing P_ ((Lisp_Object, Lisp_Object)); | 515 | static Lisp_Object font_prop_validate_spacing (Lisp_Object, Lisp_Object); |
| 516 | static int get_font_prop_index P_ ((Lisp_Object)); | 516 | static int get_font_prop_index (Lisp_Object); |
| 517 | 517 | ||
| 518 | static Lisp_Object | 518 | static Lisp_Object |
| 519 | font_prop_validate_symbol (prop, val) | 519 | font_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 | ||
| 743 | static int parse_matrix P_ ((char *)); | 743 | static int parse_matrix (char *); |
| 744 | static int font_expand_wildcards P_ ((Lisp_Object *, int)); | 744 | static int font_expand_wildcards (Lisp_Object *, int); |
| 745 | static int font_parse_name P_ ((char *, Lisp_Object)); | 745 | static 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. */ |
| 748 | enum xlfd_field_index | 748 | enum xlfd_field_index |
| @@ -2220,10 +2220,10 @@ font_otf_Anchor (anchor) | |||
| 2220 | 2220 | ||
| 2221 | /* Font sorting */ | 2221 | /* Font sorting */ |
| 2222 | 2222 | ||
| 2223 | static unsigned font_score P_ ((Lisp_Object, Lisp_Object *)); | 2223 | static unsigned font_score (Lisp_Object, Lisp_Object *); |
| 2224 | static int font_compare P_ ((const void *, const void *)); | 2224 | static int font_compare (const void *, const void *); |
| 2225 | static Lisp_Object font_sort_entities P_ ((Lisp_Object, Lisp_Object, | 2225 | static 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. */ |
| 2229 | extern Lisp_Object Vface_font_rescale_alist; | 2229 | extern 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 | ||
| 2704 | static void font_prepare_cache P_ ((FRAME_PTR, struct font_driver *)); | 2704 | static void font_prepare_cache (FRAME_PTR, struct font_driver *); |
| 2705 | static void font_finish_cache P_ ((FRAME_PTR, struct font_driver *)); | 2705 | static void font_finish_cache (FRAME_PTR, struct font_driver *); |
| 2706 | static Lisp_Object font_get_cache P_ ((FRAME_PTR, struct font_driver *)); | 2706 | static Lisp_Object font_get_cache (FRAME_PTR, struct font_driver *); |
| 2707 | static void font_clear_cache P_ ((FRAME_PTR, Lisp_Object, | 2707 | static void font_clear_cache (FRAME_PTR, Lisp_Object, |
| 2708 | struct font_driver *)); | 2708 | struct font_driver *); |
| 2709 | 2709 | ||
| 2710 | static void | 2710 | static void |
| 2711 | font_prepare_cache (f, driver) | 2711 | font_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 | ||
| 5252 | extern void syms_of_ftfont P_ (()); | 5252 | extern void syms_of_ftfont (); |
| 5253 | extern void syms_of_xfont P_ (()); | 5253 | extern void syms_of_xfont (); |
| 5254 | extern void syms_of_xftfont P_ (()); | 5254 | extern void syms_of_xftfont (); |
| 5255 | extern void syms_of_ftxfont P_ (()); | 5255 | extern void syms_of_ftxfont (); |
| 5256 | extern void syms_of_bdffont P_ (()); | 5256 | extern void syms_of_bdffont (); |
| 5257 | extern void syms_of_w32font P_ (()); | 5257 | extern void syms_of_w32font (); |
| 5258 | extern void syms_of_atmfont P_ (()); | 5258 | extern void syms_of_atmfont (); |
| 5259 | extern void syms_of_nsfont P_ (()); | 5259 | extern void syms_of_nsfont (); |
| 5260 | 5260 | ||
| 5261 | void | 5261 | void |
| 5262 | syms_of_font () | 5262 | syms_of_font () |