aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorDan Nicolaescu2010-08-05 16:15:24 -0700
committerDan Nicolaescu2010-08-05 16:15:24 -0700
commit99f3388e53a58a319a0584358b3ca0d151e50328 (patch)
tree9d01c15fc8651b1aa7df92b71baa0c06cfeb7c0d /src/lisp.h
parent9f5dd6f226818138aadf2d0cc2562e26650a46b8 (diff)
downloademacs-99f3388e53a58a319a0584358b3ca0d151e50328.tar.gz
emacs-99f3388e53a58a319a0584358b3ca0d151e50328.zip
Add declarations to header files.
* src/keyboard.h (xmalloc_widget_value, digest_single_submenu): Remove declarations, menu.h has them. (QCbutton, QCtoggle, QCradio, QClabel, extra_keyboard_modifiers) (Vinput_method_function, Qinput_method_function) (Qevent_symbol_element_mask, last_event_timestamp): * src/dispextern.h (Voverflow_newline_into_fringe): * src/font.h (QCantialias, Qp, syms_of_ftfont, syms_of_xfns) (syms_of_ftxfont, syms_of_xftfont, syms_of_bdffont) (syms_of_w32font, syms_of_nsfont): * src/fontset.h (find_font_encoding, Qlatin): * src/frame.h (Qtooltip, Qrun_hook_with_args, Vmenu_bar_mode) (Vtool_bar_mode, set_frame_menubar): * src/ftfont.h (ftfont_font_format, ftfont_get_fc_charset): * src/xterm.h (Qx_gtk_map_stock): * src/keymap.h (meta_prefix_char): Add declarations. * src/lisp.h: Remove HAVE_SHM code, unused. (QCmap, QCrehash_size, QCrehash_threshold, QCsize, QCtest) (QCweakness, Qabove_handle, Qbackquote, Qbar, Qbelow_handle) (Qborder, Qbottom, Qbox, Qcircular_list, Qcomma, Qcomma_at) (Qcomma_dot, Qcursor, Qdefault, Qdown, Qend_scroll, Qeq, Qeql) (Qequal, Qfile_exists_p, Qfont_param, Qfringe, Qfunction) (Qfunction_documentation, Qhandle, Qhbar, Qheader_line, Qhollow) (Qidentity, Qleft_margin, Qmenu, Qmenu_bar_update_hook) (Qmode_line_inactive, Qmouse, Qoverriding_local_map) (Qoverriding_terminal_local_map, Qratio, Qregion, Qright_margin) (Qscroll_bar, Qtool_bar, Qtop, Qup, Qvertical_border, Qwhen) (Qwindow_scroll_functions, Vafter_load_alist) (Vauto_save_list_file_name, Vface_alternative_font_family_alist) (Vface_alternative_font_registry_alist, Vface_font_rescale_alist) (Vface_ignored_fonts, Vinhibit_redisplay, Vminibuffer_list) (Vprint_length, Vprint_level, Vscalable_fonts_allowed) (Vshell_file_name, Vsystem_name, Vwindow_scroll_functions) (Vwindow_system_version, Vx_no_window_manager, initial_argc) (initial_argv, last_nonmenu_event, load_in_progress) (noninteractive_need_newline, scroll_margin): Add declarations.
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h51
1 files changed, 41 insertions, 10 deletions
diff --git a/src/lisp.h b/src/lisp.h
index f278f856f5c..abed671bce0 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -508,12 +508,6 @@ extern Lisp_Object make_number (EMACS_INT);
508#define EQ(x, y) (XHASH (x) == XHASH (y)) 508#define EQ(x, y) (XHASH (x) == XHASH (y))
509 509
510#ifndef XPNTR 510#ifndef XPNTR
511#ifdef HAVE_SHM
512/* In this representation, data is found in two widely separated segments. */
513extern size_t pure_size;
514#define XPNTR(a) \
515 (XUINT (a) | (XUINT (a) > pure_size ? DATA_SEG_BITS : PURE_SEG_BITS))
516#else /* not HAVE_SHM */
517#ifdef DATA_SEG_BITS 511#ifdef DATA_SEG_BITS
518/* This case is used for the rt-pc. 512/* This case is used for the rt-pc.
519 In the diffs I was given, it checked for ptr = 0 513 In the diffs I was given, it checked for ptr = 0
@@ -528,7 +522,6 @@ extern size_t pure_size;
528 size. */ 522 size. */
529#define XPNTR(a) ((EMACS_INT) XUINT (a)) 523#define XPNTR(a) ((EMACS_INT) XUINT (a))
530#endif 524#endif
531#endif /* not HAVE_SHM */
532#endif /* no XPNTR */ 525#endif /* no XPNTR */
533 526
534/* Largest and smallest representable fixnum values. These are the C 527/* Largest and smallest representable fixnum values. These are the C
@@ -2270,7 +2263,7 @@ extern Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive;
2270extern Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; 2263extern Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only;
2271extern Lisp_Object Qtext_read_only; 2264extern Lisp_Object Qtext_read_only;
2272extern Lisp_Object Qinteractive_form; 2265extern Lisp_Object Qinteractive_form;
2273 2266extern Lisp_Object Qcircular_list;
2274extern Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; 2267extern Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp;
2275extern Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; 2268extern Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp;
2276extern Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; 2269extern Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp;
@@ -2449,6 +2442,7 @@ extern void init_syntax_once (void);
2449extern void syms_of_syntax (void); 2442extern void syms_of_syntax (void);
2450 2443
2451/* Defined in fns.c */ 2444/* Defined in fns.c */
2445extern Lisp_Object QCrehash_size, QCrehash_threshold;
2452extern int use_dialog_box; 2446extern int use_dialog_box;
2453extern int use_file_dialog; 2447extern int use_file_dialog;
2454extern int next_almost_prime (int); 2448extern int next_almost_prime (int);
@@ -2457,7 +2451,7 @@ extern void sweep_weak_hash_tables (void);
2457extern Lisp_Object Qcursor_in_echo_area; 2451extern Lisp_Object Qcursor_in_echo_area;
2458extern Lisp_Object Qstring_lessp; 2452extern Lisp_Object Qstring_lessp;
2459extern Lisp_Object Vfeatures; 2453extern Lisp_Object Vfeatures;
2460extern Lisp_Object QCsize, QCtest, QCweakness, Qequal, Qeq; 2454extern Lisp_Object QCsize, QCtest, QCweakness, Qequal, Qeq, Qeql;
2461unsigned sxhash (Lisp_Object, int); 2455unsigned sxhash (Lisp_Object, int);
2462Lisp_Object make_hash_table (Lisp_Object, Lisp_Object, Lisp_Object, 2456Lisp_Object make_hash_table (Lisp_Object, Lisp_Object, Lisp_Object,
2463 Lisp_Object, Lisp_Object, Lisp_Object, 2457 Lisp_Object, Lisp_Object, Lisp_Object,
@@ -2622,6 +2616,7 @@ extern void syms_of_insdel (void);
2622 2616
2623/* Defined in dispnew.c */ 2617/* Defined in dispnew.c */
2624extern Lisp_Object selected_frame; 2618extern Lisp_Object selected_frame;
2619extern Lisp_Object Vwindow_system_version;
2625extern EMACS_INT baud_rate; 2620extern EMACS_INT baud_rate;
2626EXFUN (Fding, 1); 2621EXFUN (Fding, 1);
2627EXFUN (Fredraw_frame, 1); 2622EXFUN (Fredraw_frame, 1);
@@ -2637,12 +2632,21 @@ extern Lisp_Object Qinhibit_point_motion_hooks;
2637extern Lisp_Object Qinhibit_redisplay, Qdisplay; 2632extern Lisp_Object Qinhibit_redisplay, Qdisplay;
2638extern Lisp_Object Qinhibit_eval_during_redisplay; 2633extern Lisp_Object Qinhibit_eval_during_redisplay;
2639extern Lisp_Object Qmessage_truncate_lines; 2634extern Lisp_Object Qmessage_truncate_lines;
2635extern Lisp_Object Qmenu_bar_update_hook;
2636extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
2637extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
2640extern Lisp_Object Qimage, Qtext, Qboth, Qboth_horiz, Qtext_image_horiz; 2638extern Lisp_Object Qimage, Qtext, Qboth, Qboth_horiz, Qtext_image_horiz;
2641extern Lisp_Object Qspace, Qcenter, QCalign_to; 2639extern Lisp_Object Qspace, Qcenter, QCalign_to;
2640extern Lisp_Object Qbar, Qhbar, Qbox, Qhollow;
2641extern Lisp_Object Qleft_margin, Qright_margin;
2642extern Lisp_Object Vmessage_log_max; 2642extern Lisp_Object Vmessage_log_max;
2643extern Lisp_Object QCdata, QCfile; 2643extern Lisp_Object QCdata, QCfile;
2644extern Lisp_Object QCmap;
2644extern Lisp_Object Qrisky_local_variable; 2645extern Lisp_Object Qrisky_local_variable;
2646extern Lisp_Object Vinhibit_redisplay;
2645extern int message_enable_multibyte; 2647extern int message_enable_multibyte;
2648extern int noninteractive_need_newline;
2649extern EMACS_INT scroll_margin;
2646extern Lisp_Object echo_area_buffer[2]; 2650extern Lisp_Object echo_area_buffer[2];
2647extern void add_to_log (const char *, Lisp_Object, Lisp_Object); 2651extern void add_to_log (const char *, Lisp_Object, Lisp_Object);
2648extern void check_message_stack (void); 2652extern void check_message_stack (void);
@@ -2789,7 +2793,7 @@ extern void syms_of_chartab (void);
2789 2793
2790/* Defined in print.c */ 2794/* Defined in print.c */
2791extern Lisp_Object Vprin1_to_string_buffer; 2795extern Lisp_Object Vprin1_to_string_buffer;
2792extern Lisp_Object Vprint_level; 2796extern Lisp_Object Vprint_level, Vprint_length;
2793extern void debug_print (Lisp_Object); 2797extern void debug_print (Lisp_Object);
2794EXFUN (Fprin1, 2); 2798EXFUN (Fprin1, 2);
2795EXFUN (Fprin1_to_string, 2); 2799EXFUN (Fprin1_to_string, 2);
@@ -2815,9 +2819,12 @@ extern void syms_of_print (void);
2815extern int doprnt (char *, int, const char *, const char *, va_list); 2819extern int doprnt (char *, int, const char *, const char *, va_list);
2816 2820
2817/* Defined in lread.c */ 2821/* Defined in lread.c */
2822extern Lisp_Object Vafter_load_alist;
2818extern Lisp_Object Qvariable_documentation, Qstandard_input; 2823extern Lisp_Object Qvariable_documentation, Qstandard_input;
2819extern Lisp_Object Qfunction; 2824extern Lisp_Object Qfunction;
2825extern Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction;
2820extern Lisp_Object Vobarray, initial_obarray, Vstandard_input; 2826extern Lisp_Object Vobarray, initial_obarray, Vstandard_input;
2827extern int load_in_progress;
2821EXFUN (Fread, 1); 2828EXFUN (Fread, 1);
2822EXFUN (Fread_from_string, 3); 2829EXFUN (Fread_from_string, 3);
2823EXFUN (Fintern, 2); 2830EXFUN (Fintern, 2);
@@ -2939,8 +2946,10 @@ extern void init_eval (void);
2939extern void syms_of_eval (void); 2946extern void syms_of_eval (void);
2940 2947
2941/* Defined in editfns.c */ 2948/* Defined in editfns.c */
2949extern Lisp_Object last_nonmenu_event;
2942extern Lisp_Object Qfield; 2950extern Lisp_Object Qfield;
2943extern Lisp_Object Vinhibit_field_text_motion; 2951extern Lisp_Object Vinhibit_field_text_motion;
2952extern Lisp_Object Vsystem_name;
2944extern Lisp_Object Vuser_login_name; 2953extern Lisp_Object Vuser_login_name;
2945EXFUN (Fpropertize, MANY); 2954EXFUN (Fpropertize, MANY);
2946EXFUN (Fcurrent_message, 0); 2955EXFUN (Fcurrent_message, 0);
@@ -3061,8 +3070,10 @@ extern void syms_of_marker (void);
3061/* Defined in fileio.c */ 3070/* Defined in fileio.c */
3062 3071
3063extern Lisp_Object Qfile_error; 3072extern Lisp_Object Qfile_error;
3073extern Lisp_Object Qfile_exists_p;
3064extern Lisp_Object Qfile_directory_p; 3074extern Lisp_Object Qfile_directory_p;
3065extern Lisp_Object Qinsert_file_contents; 3075extern Lisp_Object Qinsert_file_contents;
3076extern Lisp_Object Vauto_save_list_file_name;
3066EXFUN (Ffind_file_name_handler, 2); 3077EXFUN (Ffind_file_name_handler, 2);
3067EXFUN (Ffile_name_as_directory, 1); 3078EXFUN (Ffile_name_as_directory, 1);
3068EXFUN (Fmake_temp_name, 1); 3079EXFUN (Fmake_temp_name, 1);
@@ -3126,6 +3137,7 @@ extern Lisp_Object Qcompletion_ignore_case;
3126extern Lisp_Object Qcompletion_ignore_case; 3137extern Lisp_Object Qcompletion_ignore_case;
3127extern Lisp_Object Vcompletion_regexp_list; 3138extern Lisp_Object Vcompletion_regexp_list;
3128extern Lisp_Object Vhistory_length; 3139extern Lisp_Object Vhistory_length;
3140extern Lisp_Object Vminibuffer_list;
3129extern Lisp_Object last_minibuf_string; 3141extern Lisp_Object last_minibuf_string;
3130extern int completion_ignore_case; 3142extern int completion_ignore_case;
3131extern int history_delete_duplicates; 3143extern int history_delete_duplicates;
@@ -3148,6 +3160,7 @@ extern void syms_of_minibuf (void);
3148/* Defined in callint.c */ 3160/* Defined in callint.c */
3149 3161
3150extern Lisp_Object Qminus, Qplus, Vcurrent_prefix_arg; 3162extern Lisp_Object Qminus, Qplus, Vcurrent_prefix_arg;
3163extern Lisp_Object Qwhen;
3151extern Lisp_Object Vcommand_history; 3164extern Lisp_Object Vcommand_history;
3152extern Lisp_Object Vmark_even_if_inactive; 3165extern Lisp_Object Vmark_even_if_inactive;
3153extern Lisp_Object Qcall_interactively, Qmouse_leave_buffer_hook; 3166extern Lisp_Object Qcall_interactively, Qmouse_leave_buffer_hook;
@@ -3157,6 +3170,7 @@ extern void syms_of_callint (void);
3157 3170
3158/* Defined in casefiddle.c */ 3171/* Defined in casefiddle.c */
3159 3172
3173extern Lisp_Object Qidentity;
3160EXFUN (Fdowncase, 1); 3174EXFUN (Fdowncase, 1);
3161EXFUN (Fupcase, 1); 3175EXFUN (Fupcase, 1);
3162EXFUN (Fcapitalize, 1); 3176EXFUN (Fcapitalize, 1);
@@ -3180,6 +3194,9 @@ extern Lisp_Object echo_message_buffer;
3180extern struct kboard *echo_kboard; 3194extern struct kboard *echo_kboard;
3181extern void cancel_echoing (void); 3195extern void cancel_echoing (void);
3182extern Lisp_Object Qdisabled, QCfilter; 3196extern Lisp_Object Qdisabled, QCfilter;
3197extern Lisp_Object Qabove_handle, Qhandle, Qbelow_handle;
3198extern Lisp_Object Qup, Qdown, Qbottom, Qend_scroll;
3199extern Lisp_Object Qtop, Qratio;
3183extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level; 3200extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level;
3184extern Lisp_Object Vthrow_on_input; 3201extern Lisp_Object Vthrow_on_input;
3185extern int input_pending; 3202extern int input_pending;
@@ -3271,6 +3288,8 @@ extern void frames_bury_buffer (Lisp_Object);
3271extern void syms_of_frame (void); 3288extern void syms_of_frame (void);
3272 3289
3273/* Defined in emacs.c */ 3290/* Defined in emacs.c */
3291extern char **initial_argv;
3292extern int initial_argc;
3274#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS) 3293#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
3275extern int display_arg; 3294extern int display_arg;
3276#endif 3295#endif
@@ -3336,6 +3355,7 @@ extern void setup_process_coding_systems (Lisp_Object);
3336extern Lisp_Object Vexec_path, Vexec_suffixes, 3355extern Lisp_Object Vexec_path, Vexec_suffixes,
3337 Vexec_directory, Vdata_directory; 3356 Vexec_directory, Vdata_directory;
3338extern Lisp_Object Vdoc_directory; 3357extern Lisp_Object Vdoc_directory;
3358extern Lisp_Object Vshell_file_name;
3339EXFUN (Fcall_process, MANY); 3359EXFUN (Fcall_process, MANY);
3340extern int child_setup (int, int, int, char **, int, Lisp_Object); 3360extern int child_setup (int, int, int, char **, int, Lisp_Object);
3341extern void init_callproc_1 (void); 3361extern void init_callproc_1 (void);
@@ -3344,6 +3364,7 @@ extern void set_initial_environment (void);
3344extern void syms_of_callproc (void); 3364extern void syms_of_callproc (void);
3345 3365
3346/* Defined in doc.c */ 3366/* Defined in doc.c */
3367extern Lisp_Object Qfunction_documentation;
3347extern Lisp_Object Vdoc_file_name; 3368extern Lisp_Object Vdoc_file_name;
3348EXFUN (Fsubstitute_command_keys, 1); 3369EXFUN (Fsubstitute_command_keys, 1);
3349EXFUN (Fdocumentation, 2); 3370EXFUN (Fdocumentation, 2);
@@ -3504,16 +3525,26 @@ EXFUN (Fset_fontset_font, 5);
3504EXFUN (Fnew_fontset, 2); 3525EXFUN (Fnew_fontset, 2);
3505 3526
3506/* Defined in xfns.c, w32fns.c, or macfns.c */ 3527/* Defined in xfns.c, w32fns.c, or macfns.c */
3528extern Lisp_Object Qfont_param;
3529extern Lisp_Object Vx_no_window_manager;
3507EXFUN (Fxw_display_color_p, 1); 3530EXFUN (Fxw_display_color_p, 1);
3508EXFUN (Fx_file_dialog, 5); 3531EXFUN (Fx_file_dialog, 5);
3509EXFUN (Fx_focus_frame, 1); 3532EXFUN (Fx_focus_frame, 1);
3510#endif 3533#endif
3511 3534
3512/* Defined in xfaces.c */ 3535/* Defined in xfaces.c */
3536extern Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe;
3537extern Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu;
3538extern Lisp_Object Qmode_line_inactive, Qvertical_border;
3513extern Lisp_Object Qface; 3539extern Lisp_Object Qface;
3514extern Lisp_Object Qnormal; 3540extern Lisp_Object Qnormal;
3515extern Lisp_Object QCfamily, QCweight, QCslant, QCwidth; 3541extern Lisp_Object QCfamily, QCweight, QCslant, QCwidth;
3516extern Lisp_Object QCheight, QCsize, QCname, QCwidth, QCforeground, QCbackground; 3542extern Lisp_Object QCheight, QCsize, QCname, QCwidth, QCforeground, QCbackground;
3543extern Lisp_Object Vface_alternative_font_family_alist;
3544extern Lisp_Object Vface_font_rescale_alist;
3545extern Lisp_Object Vface_ignored_fonts;
3546extern Lisp_Object Vface_alternative_font_registry_alist;
3547extern Lisp_Object Vscalable_fonts_allowed;
3517EXFUN (Fclear_face_cache, 1); 3548EXFUN (Fclear_face_cache, 1);
3518EXFUN (Fx_load_color_file, 1); 3549EXFUN (Fx_load_color_file, 1);
3519extern void syms_of_xfaces (void); 3550extern void syms_of_xfaces (void);