From 16a97296c05ec9d5bb4ffeae9dce90fc63f578ed Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 10 Apr 2011 18:41:15 -0700 Subject: Make Emacs functions such as Fatom 'static' by default. This makes it easier for human readers (and static analyzers) to see whether these functions can be called from other modules. DEFUN now defines a static function. To make the function external so that it can be used in other C modules, use the new macro DEFUE. * lisp.h (DEFINE_FUNC): New macro, with the old contents of DEFUN. (DEFUN): Rewrite in terms of DEFINE_FUNC. It now generates a static function definition. Use DEFUE if you want an extern one. (DEFUE, INFUN): New macros. (Funibyte_char_to_multibyte, Fsyntax_table_p, Finit_image_library): (Feval_region, Fbacktrace, Ffetch_bytecode, Fswitch_to_buffer): (Ffile_executable_p, Fmake_symbolic_link, Fcommand_execute): (Fget_process, Fdocumentation_property, Fbyte_code, Ffile_attributes): Remove decls, since these functions are now static. (Funintern, Fget_internal_run_time): New decls, since these functions were already external. * alloc.c, buffer.c, callint.c, callproc.c, casefiddle.c, casetab.c: * ccl.c, character.c, chartab.c, cmds.c, coding.c, data.c, dispnew.c: * doc.c, editfns.c, emacs.c, eval.c, fileio.c, filelock.c, floatfns.c: * fns.c, font.c, fontset.c, frame.c, image.c, indent.c: * keyboard.c, keymap.c, lread.c: * macros.c, marker.c, menu.c, minibuf.c, print.c, process.c, search.c: * syntax.c, term.c, terminal.c, textprop.c, undo.c: * window.c, xdisp.c, xfaces.c, xfns.c, xmenu.c, xsettings.c: Mark functions with DEFUE instead of DEFUN, if they are used in other modules. * buffer.c (Fset_buffer_major_mode, Fdelete_overlay): New forward decls for now-static functions. * buffer.h (Fdelete_overlay): Remove decl. * callproc.c (Fgetenv_internal): Mark as internal. * composite.c (Fremove_list_of_text_properties): Remove decl. (Fcomposition_get_gstring): New forward static decl. * composite.h (Fcomposite_get_gstring): Remove decl. * dired.c (Ffile_attributes): New forward static decl. * doc.c (Fdocumntation_property): New forward static decl. * eval.c (Ffetch_bytecode): New forward static decl. (Funintern): Remove extern decl; now in .h file where it belongs. * fileio.c (Fmake_symbolic_link): New forward static decl. * image.c (Finit_image_library): New forward static decl. * insdel.c (Fcombine_after_change_execute): Make forward decl static. * intervals.h (Fprevious_property_change): (Fremove_list_of_text_properties): Remove decls. * keyboard.c (Fthis_command_keys): Remove decl. (Fcommand_execute): New forward static decl. * keymap.c (Flookup_key): New forward static decl. (Fcopy_keymap): Now static. * keymap.h (Flookup_key): Remove decl. * process.c (Fget_process): New forward static decl. (Fprocess_datagram_address): Mark as internal. * syntax.c (Fsyntax_table_p): New forward static decl. (skip_chars): Remove duplicate decl. * textprop.c (Fprevious_property_change): New forward static decl. * window.c (Fset_window_fringes, Fset_window_scroll_bars): Now internal. (Fset_window_margins, Fset_window_vscroll): New forward static decls. * window.h (Fset_window_vscroll, Fset_window_margins): Remove decls. --- src/coding.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/coding.c') diff --git a/src/coding.c b/src/coding.c index 711ada59c85..13fcb7fb8a5 100644 --- a/src/coding.c +++ b/src/coding.c @@ -7991,7 +7991,7 @@ preferred_coding_system (void) #ifdef emacs /*** 8. Emacs Lisp library functions ***/ -DEFUN ("coding-system-p", Fcoding_system_p, Scoding_system_p, 1, 1, 0, +DEFUE ("coding-system-p", Fcoding_system_p, Scoding_system_p, 1, 1, 0, doc: /* Return t if OBJECT is nil or a coding-system. See the documentation of `define-coding-system' for information about coding-system objects. */) @@ -8006,7 +8006,7 @@ about coding-system objects. */) return Qt; } -DEFUN ("read-non-nil-coding-system", Fread_non_nil_coding_system, +DEFUE ("read-non-nil-coding-system", Fread_non_nil_coding_system, Sread_non_nil_coding_system, 1, 1, 0, doc: /* Read a coding system from the minibuffer, prompting with string PROMPT. */) (Lisp_Object prompt) @@ -8021,7 +8021,7 @@ DEFUN ("read-non-nil-coding-system", Fread_non_nil_coding_system, return (Fintern (val, Qnil)); } -DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 2, 0, +DEFUE ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 2, 0, doc: /* Read a coding system from the minibuffer, prompting with string PROMPT. If the user enters null input, return second argument DEFAULT-CODING-SYSTEM. Ignores case when completing coding systems (all Emacs coding systems @@ -8041,7 +8041,7 @@ are lower-case). */) return (SCHARS (val) == 0 ? Qnil : Fintern (val, Qnil)); } -DEFUN ("check-coding-system", Fcheck_coding_system, Scheck_coding_system, +DEFUE ("check-coding-system", Fcheck_coding_system, Scheck_coding_system, 1, 1, 0, doc: /* Check validity of CODING-SYSTEM. If valid, return CODING-SYSTEM, else signal a `coding-system-error' error. @@ -8976,7 +8976,7 @@ code_convert_string_norecord (Lisp_Object string, Lisp_Object coding_system, } -DEFUN ("decode-coding-string", Fdecode_coding_string, Sdecode_coding_string, +DEFUE ("decode-coding-string", Fdecode_coding_string, Sdecode_coding_string, 2, 4, 0, doc: /* Decode STRING which is encoded in CODING-SYSTEM, and return the result. @@ -9250,7 +9250,7 @@ DEFUN ("keyboard-coding-system", } -DEFUN ("find-operation-coding-system", Ffind_operation_coding_system, +DEFUE ("find-operation-coding-system", Ffind_operation_coding_system, Sfind_operation_coding_system, 1, MANY, 0, doc: /* Choose a coding system for an operation based on the target name. The value names a pair of coding systems: (DECODING-SYSTEM . ENCODING-SYSTEM). @@ -10093,7 +10093,7 @@ DEFUN ("define-coding-system-alias", Fdefine_coding_system_alias, return Qnil; } -DEFUN ("coding-system-base", Fcoding_system_base, Scoding_system_base, +DEFUE ("coding-system-base", Fcoding_system_base, Scoding_system_base, 1, 1, 0, doc: /* Return the base of CODING-SYSTEM. Any alias or subsidiary coding system is not a base coding system. */) @@ -10136,7 +10136,7 @@ DEFUN ("coding-system-aliases", Fcoding_system_aliases, Scoding_system_aliases, return AREF (spec, 1); } -DEFUN ("coding-system-eol-type", Fcoding_system_eol_type, +DEFUE ("coding-system-eol-type", Fcoding_system_eol_type, Scoding_system_eol_type, 1, 1, 0, doc: /* Return eol-type of CODING-SYSTEM. An eol-type is an integer 0, 1, 2, or a vector of coding systems. -- cgit v1.3 From 955cbe7b1720f09b2991b7d981147d9cc79d52e3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 10 Apr 2011 20:39:45 -0700 Subject: Declare Lisp_Object Q* variables to be 'static' if not exproted. This makes it easier for human readers (and static analyzers) to see whether these variables are used from other modules. * alloc.c, buffer.c, bytecode.c, callint.c, casetab.c, category.c: * ccl.c, character.c, charset.c, cmds.c, coding.c, composite.c: * data.c, dbusbind.c, dired.c, editfns.c, eval.c, fileio.c, fns.c: * font.c, frame.c, fringe.c, ftfont.c, image.c, keyboard.c, keymap.c: * lread.c, macros.c, minibuf.c, print.c, process.c, search.c: * sound.c, syntax.c, textprop.c, window.c, xdisp.c, xfaces.c, xfns.c: * xmenu.c, xselect.c: Declare Q* vars static if they are not used in other modules. * ccl.h, character.h, charset.h, coding.h, composite.h, font.h: * frame.h, intervals.h, keyboard.h, lisp.h, process.h, syntax.h: Remove decls of unexported vars. * keyboard.h (EVENT_HEAD_UNMODIFIED): Remove now-unused macro. --- src/ChangeLog | 16 ++++++++++ src/alloc.c | 5 ++-- src/buffer.c | 23 +++++++------- src/bytecode.c | 1 - src/callint.c | 9 +++--- src/casetab.c | 2 +- src/category.c | 2 +- src/ccl.c | 8 ++--- src/ccl.h | 5 ---- src/character.c | 2 +- src/character.h | 2 +- src/charset.c | 10 +++---- src/charset.h | 2 +- src/cmds.c | 4 +-- src/coding.c | 35 ++++++++++++---------- src/coding.h | 4 +-- src/composite.c | 4 +-- src/composite.h | 2 -- src/data.c | 27 ++++++++++------- src/dbusbind.c | 58 +++++++++++++++++------------------ src/dired.c | 14 ++++----- src/editfns.c | 4 +-- src/eval.c | 9 +++--- src/fileio.c | 83 +++++++++++++++++++++++++------------------------- src/fns.c | 16 +++++----- src/font.c | 10 ++++--- src/font.h | 3 +- src/frame.c | 17 ++++++----- src/frame.h | 3 +- src/fringe.c | 6 ++-- src/ftfont.c | 2 +- src/image.c | 30 +++++++++++-------- src/intervals.h | 6 ++-- src/keyboard.c | 93 ++++++++++++++++++++++++++++++++------------------------- src/keyboard.h | 13 ++------ src/keymap.c | 9 +++--- src/lisp.h | 34 +++++++++------------ src/lread.c | 25 ++++++++-------- src/macros.c | 3 +- src/minibuf.c | 28 ++++++++--------- src/print.c | 6 ++-- src/process.c | 26 ++++++++-------- src/process.h | 3 +- src/search.c | 4 +-- src/sound.c | 6 ++-- src/syntax.c | 3 +- src/syntax.h | 2 -- src/textprop.c | 11 ++++--- src/window.c | 11 +++---- src/xdisp.c | 63 ++++++++++++++++++++------------------ src/xfaces.c | 57 +++++++++++++++++++---------------- src/xfns.c | 8 ++--- src/xmenu.c | 2 +- src/xselect.c | 8 ++--- 54 files changed, 441 insertions(+), 398 deletions(-) (limited to 'src/coding.c') diff --git a/src/ChangeLog b/src/ChangeLog index 8d492d1cdf5..0be406a6e7b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,21 @@ 2011-04-11 Paul Eggert + Declare Lisp_Object Q* variables to be 'static' if not exproted. + This makes it easier for human readers (and static analyzers) + to see whether these variables are used from other modules. + * alloc.c, buffer.c, bytecode.c, callint.c, casetab.c, category.c: + * ccl.c, character.c, charset.c, cmds.c, coding.c, composite.c: + * data.c, dbusbind.c, dired.c, editfns.c, eval.c, fileio.c, fns.c: + * font.c, frame.c, fringe.c, ftfont.c, image.c, keyboard.c, keymap.c: + * lread.c, macros.c, minibuf.c, print.c, process.c, search.c: + * sound.c, syntax.c, textprop.c, window.c, xdisp.c, xfaces.c, xfns.c: + * xmenu.c, xselect.c: + Declare Q* vars static if they are not used in other modules. + * ccl.h, character.h, charset.h, coding.h, composite.h, font.h: + * frame.h, intervals.h, keyboard.h, lisp.h, process.h, syntax.h: + Remove decls of unexported vars. + * keyboard.h (EVENT_HEAD_UNMODIFIED): Remove now-unused macro. + * lisp.h (DEFINE_FUNC): Make sname 'static'. Make Emacs functions such as Fatom 'static' by default. diff --git a/src/alloc.c b/src/alloc.c index 1396586ba3e..ad3dfa96cd2 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -264,11 +264,12 @@ static size_t stack_copy_size; static int ignore_warnings; -Lisp_Object Qgc_cons_threshold, Qchar_table_extra_slots; +static Lisp_Object Qgc_cons_threshold; +Lisp_Object Qchar_table_extra_slots; /* Hook run after GC has finished. */ -Lisp_Object Qpost_gc_hook; +static Lisp_Object Qpost_gc_hook; static void mark_buffer (Lisp_Object); static void mark_terminals (void); diff --git a/src/buffer.c b/src/buffer.c index a88afbb36e6..82913ac20e7 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -113,30 +113,31 @@ static void reset_buffer_local_variables (struct buffer *b, int permanent_too); to prevent lossage due to user rplac'ing this alist or its elements. */ Lisp_Object Vbuffer_alist; -Lisp_Object Qkill_buffer_query_functions; +static Lisp_Object Qkill_buffer_query_functions; /* Hook run before changing a major mode. */ -Lisp_Object Qchange_major_mode_hook; +static Lisp_Object Qchange_major_mode_hook; Lisp_Object Qfirst_change_hook; Lisp_Object Qbefore_change_functions; Lisp_Object Qafter_change_functions; -Lisp_Object Qucs_set_table_for_input; +static Lisp_Object Qucs_set_table_for_input; -Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; -Lisp_Object Qpermanent_local_hook; +static Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; +static Lisp_Object Qpermanent_local_hook; -Lisp_Object Qprotected_field; +static Lisp_Object Qprotected_field; -Lisp_Object QSFundamental; /* A string "Fundamental" */ +static Lisp_Object QSFundamental; /* A string "Fundamental" */ -Lisp_Object Qkill_buffer_hook; +static Lisp_Object Qkill_buffer_hook; -Lisp_Object Qget_file_buffer; +static Lisp_Object Qget_file_buffer; -Lisp_Object Qoverlayp; +static Lisp_Object Qoverlayp; -Lisp_Object Qpriority, Qevaporate, Qbefore_string, Qafter_string; +Lisp_Object Qpriority, Qbefore_string, Qafter_string; +static Lisp_Object Qevaporate; Lisp_Object Qmodification_hooks; Lisp_Object Qinsert_in_front_hooks; diff --git a/src/bytecode.c b/src/bytecode.c index b4a5354a0a4..581e16678a6 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -80,7 +80,6 @@ Lisp_Object Qbyte_code_meter; Lisp_Object Qbytecode; -extern Lisp_Object Qand_optional, Qand_rest; /* Byte codes: */ diff --git a/src/callint.c b/src/callint.c index 1de1f607878..e491e4e5952 100644 --- a/src/callint.c +++ b/src/callint.c @@ -30,14 +30,15 @@ along with GNU Emacs. If not, see . */ Lisp_Object Qminus, Qplus; Lisp_Object Qcall_interactively; -Lisp_Object Qcommand_debug_status; -Lisp_Object Qenable_recursive_minibuffers; +static Lisp_Object Qcommand_debug_status; +static Lisp_Object Qenable_recursive_minibuffers; -Lisp_Object Qhandle_shift_selection; +static Lisp_Object Qhandle_shift_selection; Lisp_Object Qmouse_leave_buffer_hook; -Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif, Qwhen; +static Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif; +Lisp_Object Qwhen; static Lisp_Object preserved_fns; /* Marker used within call-interactively to refer to point. */ diff --git a/src/casetab.c b/src/casetab.c index 7acefbceba9..691dbc8c08b 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -24,7 +24,7 @@ along with GNU Emacs. If not, see . */ #include "buffer.h" #include "character.h" -Lisp_Object Qcase_table_p, Qcase_table; +static Lisp_Object Qcase_table_p, Qcase_table; Lisp_Object Vascii_downcase_table, Vascii_upcase_table; Lisp_Object Vascii_canon_table, Vascii_eqv_table; diff --git a/src/category.c b/src/category.c index bba030360c4..5dcc4894f0e 100644 --- a/src/category.c +++ b/src/category.c @@ -48,7 +48,7 @@ along with GNU Emacs. If not, see . */ For the moment, we are not using this feature. */ static int category_table_version; -Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p; +static Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p; /* Temporary internal variable used in macro CHAR_HAS_CATEGORY. */ Lisp_Object _temp_category_set; diff --git a/src/ccl.c b/src/ccl.c index 2f7c4b07319..e09cf4f86d9 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -38,16 +38,16 @@ Lisp_Object Qccl, Qcclp; /* This symbol is a property which associates with ccl program vector. Ex: (get 'ccl-big5-encoder 'ccl-program) returns ccl program vector. */ -Lisp_Object Qccl_program; +static Lisp_Object Qccl_program; /* These symbols are properties which associate with code conversion map and their ID respectively. */ -Lisp_Object Qcode_conversion_map; -Lisp_Object Qcode_conversion_map_id; +static Lisp_Object Qcode_conversion_map; +static Lisp_Object Qcode_conversion_map_id; /* Symbols of ccl program have this property, a value of the property is an index for Vccl_protram_table. */ -Lisp_Object Qccl_program_idx; +static Lisp_Object Qccl_program_idx; /* Table of registered CCL programs. Each element is a vector of NAME, CCL_PROG, RESOLVEDP, and UPDATEDP, where NAME (symbol) is the diff --git a/src/ccl.h b/src/ccl.h index 8c1f5e5cbd7..98a4008e59f 100644 --- a/src/ccl.h +++ b/src/ccl.h @@ -105,10 +105,6 @@ extern void ccl_driver (struct ccl_program *, int *, int *, int, int, /* Vector of CCL program names vs corresponding program data. */ extern Lisp_Object Vccl_program_table; -/* Symbols of ccl program have this property, a value of the property - is an index for Vccl_protram_table. */ -extern Lisp_Object Qccl_program_idx; - extern Lisp_Object Qccl, Qcclp; EXFUN (Fccl_program_p, 1); @@ -120,4 +116,3 @@ EXFUN (Fccl_program_p, 1); } while (0); #endif /* EMACS_CCL_H */ - diff --git a/src/character.c b/src/character.c index 636601c7452..e00168c6abc 100644 --- a/src/character.c +++ b/src/character.c @@ -50,7 +50,7 @@ along with GNU Emacs. If not, see . */ Lisp_Object Qcharacterp; -Lisp_Object Qauto_fill_chars; +static Lisp_Object Qauto_fill_chars; /* Char-table of information about which character to unify to which Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */ diff --git a/src/character.h b/src/character.h index 7a75ac186fa..864882db7f6 100644 --- a/src/character.h +++ b/src/character.h @@ -615,7 +615,7 @@ extern EMACS_INT c_string_width (const unsigned char *, EMACS_INT, int, extern EMACS_INT lisp_string_width (Lisp_Object, int, EMACS_INT *, EMACS_INT *); -extern Lisp_Object Qcharacterp, Qauto_fill_chars; +extern Lisp_Object Qcharacterp; extern Lisp_Object Vchar_unify_table; extern Lisp_Object string_escape_byte8 (Lisp_Object); diff --git a/src/charset.c b/src/charset.c index 00206cccf0b..dc91cea2e12 100644 --- a/src/charset.c +++ b/src/charset.c @@ -68,10 +68,10 @@ Lisp_Object Qcharsetp; /* Special charset symbols. */ Lisp_Object Qascii; -Lisp_Object Qeight_bit; -Lisp_Object Qiso_8859_1; -Lisp_Object Qunicode; -Lisp_Object Qemacs; +static Lisp_Object Qeight_bit; +static Lisp_Object Qiso_8859_1; +static Lisp_Object Qunicode; +static Lisp_Object Qemacs; /* The corresponding charsets. */ int charset_ascii; @@ -87,7 +87,7 @@ int charset_jisx0208; int charset_ksc5601; /* Value of charset attribute `charset-iso-plane'. */ -Lisp_Object Qgl, Qgr; +static Lisp_Object Qgl, Qgr; /* Charset of unibyte characters. */ int charset_unibyte; diff --git a/src/charset.h b/src/charset.h index 8c87ffe6c3d..fef50394e6e 100644 --- a/src/charset.h +++ b/src/charset.h @@ -517,7 +517,7 @@ extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL]; extern Lisp_Object Qcharsetp; -extern Lisp_Object Qascii, Qunicode; +extern Lisp_Object Qascii; extern int charset_ascii, charset_eight_bit; extern int charset_iso_8859_1; extern int charset_unicode; diff --git a/src/cmds.c b/src/cmds.c index 60318225831..baf14778141 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -31,10 +31,10 @@ along with GNU Emacs. If not, see . */ #include "dispextern.h" #include "frame.h" -Lisp_Object Qkill_forward_chars, Qkill_backward_chars; +static Lisp_Object Qkill_forward_chars, Qkill_backward_chars; /* A possible value for a buffer's overwrite-mode variable. */ -Lisp_Object Qoverwrite_mode_binary; +static Lisp_Object Qoverwrite_mode_binary; static int internal_self_insert (int, EMACS_INT); diff --git a/src/coding.c b/src/coding.c index 13fcb7fb8a5..d2124db73f2 100644 --- a/src/coding.c +++ b/src/coding.c @@ -300,27 +300,30 @@ encode_coding_XXX (struct coding_system *coding) Lisp_Object Vcoding_system_hash_table; -Lisp_Object Qcoding_system, Qcoding_aliases, Qeol_type; +static Lisp_Object Qcoding_system, Qeol_type; +static Lisp_Object Qcoding_aliases; Lisp_Object Qunix, Qdos; Lisp_Object Qbuffer_file_coding_system; -Lisp_Object Qpost_read_conversion, Qpre_write_conversion; -Lisp_Object Qdefault_char; +static Lisp_Object Qpost_read_conversion, Qpre_write_conversion; +static Lisp_Object Qdefault_char; Lisp_Object Qno_conversion, Qundecided; -Lisp_Object Qcharset, Qiso_2022, Qutf_8, Qutf_16, Qshift_jis, Qbig5; -Lisp_Object Qbig, Qlittle; -Lisp_Object Qcoding_system_history; -Lisp_Object Qvalid_codes; -Lisp_Object QCcategory, QCmnemonic, QCdefault_char; -Lisp_Object QCdecode_translation_table, QCencode_translation_table; -Lisp_Object QCpost_read_conversion, QCpre_write_conversion; -Lisp_Object QCascii_compatible_p; +Lisp_Object Qcharset, Qutf_8; +static Lisp_Object Qiso_2022; +static Lisp_Object Qutf_16, Qshift_jis, Qbig5; +static Lisp_Object Qbig, Qlittle; +static Lisp_Object Qcoding_system_history; +static Lisp_Object Qvalid_codes; +static Lisp_Object QCcategory, QCmnemonic, QCdefault_char; +static Lisp_Object QCdecode_translation_table, QCencode_translation_table; +static Lisp_Object QCpost_read_conversion, QCpre_write_conversion; +static Lisp_Object QCascii_compatible_p; Lisp_Object Qcall_process, Qcall_process_region; Lisp_Object Qstart_process, Qopen_network_stream; -Lisp_Object Qtarget_idx; +static Lisp_Object Qtarget_idx; -Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source; -Lisp_Object Qinterrupted, Qinsufficient_memory; +static Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source; +static Lisp_Object Qinterrupted, Qinsufficient_memory; /* If a symbol has this property, evaluate the value to define the symbol as a coding system. */ @@ -351,8 +354,8 @@ struct coding_system safe_terminal_coding; Lisp_Object Qtranslation_table; Lisp_Object Qtranslation_table_id; -Lisp_Object Qtranslation_table_for_decode; -Lisp_Object Qtranslation_table_for_encode; +static Lisp_Object Qtranslation_table_for_decode; +static Lisp_Object Qtranslation_table_for_encode; /* Two special coding systems. */ Lisp_Object Vsjis_coding_system; diff --git a/src/coding.h b/src/coding.h index 8414a2fe133..ff7fcc7c3ac 100644 --- a/src/coding.h +++ b/src/coding.h @@ -757,10 +757,9 @@ extern Lisp_Object preferred_coding_system (void); extern Lisp_Object Qutf_8, Qutf_8_emacs; -extern Lisp_Object Qcoding_system, Qeol_type, Qcoding_category_index; +extern Lisp_Object Qcoding_category_index; extern Lisp_Object Qcoding_system_p; extern Lisp_Object Qraw_text, Qemacs_mule, Qno_conversion, Qundecided; -extern Lisp_Object Qiso_2022; extern Lisp_Object Qbuffer_file_coding_system; extern Lisp_Object Qunix, Qdos, Qmac; @@ -789,4 +788,3 @@ extern char emacs_mule_bytes[256]; extern int emacs_mule_string_char (unsigned char *); #endif /* EMACS_CODING_H */ - diff --git a/src/composite.c b/src/composite.c index 367606f5142..cccc75cc1b9 100644 --- a/src/composite.c +++ b/src/composite.c @@ -152,8 +152,8 @@ int n_compositions; COMPOSITION-ID. */ Lisp_Object composition_hash_table; -Lisp_Object Qauto_composed; -Lisp_Object Qauto_composition_function; +static Lisp_Object Qauto_composed; +static Lisp_Object Qauto_composition_function; /* Maximum number of characters to look back for auto-compositions. */ #define MAX_AUTO_COMPOSITION_LOOKBACK 3 diff --git a/src/composite.h b/src/composite.h index 1f708e93b8e..5188f981d9c 100644 --- a/src/composite.h +++ b/src/composite.h @@ -216,8 +216,6 @@ extern int n_compositions; extern Lisp_Object Qcomposition; extern Lisp_Object composition_hash_table; -extern Lisp_Object Qauto_composed; -extern Lisp_Object Qauto_composition_function; extern int get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT, Lisp_Object, Lisp_Object); extern int find_composition (EMACS_INT, EMACS_INT, EMACS_INT *, EMACS_INT *, diff --git a/src/data.c b/src/data.c index 25e260c8686..68ceff4d23e 100644 --- a/src/data.c +++ b/src/data.c @@ -52,26 +52,33 @@ along with GNU Emacs. If not, see . */ extern double atof (const char *); #endif /* !atof */ -Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; +Lisp_Object Qnil, Qt, Qquote, Qlambda, Qunbound; +static Lisp_Object Qsubr; Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; -Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; -Lisp_Object Qvoid_variable, Qvoid_function, Qcyclic_function_indirection; -Lisp_Object Qcyclic_variable_indirection, Qcircular_list; -Lisp_Object Qsetting_constant, Qinvalid_read_syntax; +Lisp_Object Qerror, Qquit, Qargs_out_of_range; +static Lisp_Object Qwrong_type_argument; +Lisp_Object Qvoid_variable, Qvoid_function; +static Lisp_Object Qcyclic_function_indirection; +static Lisp_Object Qcyclic_variable_indirection; +Lisp_Object Qcircular_list; +static Lisp_Object Qsetting_constant; +Lisp_Object Qinvalid_read_syntax; Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; Lisp_Object Qtext_read_only; -Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; +Lisp_Object Qintegerp, Qwholenump, Qsymbolp, Qlistp, Qconsp; +static Lisp_Object Qnatnump; Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; -Lisp_Object Qbuffer_or_string_p, Qkeywordp; -Lisp_Object Qboundp, Qfboundp; +Lisp_Object Qbuffer_or_string_p; +static Lisp_Object Qkeywordp, Qboundp; +Lisp_Object Qfboundp; Lisp_Object Qchar_table_p, Qvector_or_char_table_p; Lisp_Object Qcdr; -Lisp_Object Qad_advice_info, Qad_activate_internal; +static Lisp_Object Qad_advice_info, Qad_activate_internal; Lisp_Object Qrange_error, Qdomain_error, Qsingularity_error; Lisp_Object Qoverflow_error, Qunderflow_error; @@ -83,7 +90,7 @@ Lisp_Object Qinteger; static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; Lisp_Object Qwindow; static Lisp_Object Qfloat, Qwindow_configuration; -Lisp_Object Qprocess; +static Lisp_Object Qprocess; static Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector; static Lisp_Object Qchar_table, Qbool_vector, Qhash_table; static Lisp_Object Qsubrp, Qmany, Qunevalled; diff --git a/src/dbusbind.c b/src/dbusbind.c index 8a6870555d0..b986724d792 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -30,50 +30,50 @@ along with GNU Emacs. If not, see . */ /* Subroutines. */ -Lisp_Object Qdbus_init_bus; -Lisp_Object Qdbus_close_bus; -Lisp_Object Qdbus_get_unique_name; -Lisp_Object Qdbus_call_method; -Lisp_Object Qdbus_call_method_asynchronously; -Lisp_Object Qdbus_method_return_internal; -Lisp_Object Qdbus_method_error_internal; -Lisp_Object Qdbus_send_signal; -Lisp_Object Qdbus_register_service; -Lisp_Object Qdbus_register_signal; -Lisp_Object Qdbus_register_method; +static Lisp_Object Qdbus_init_bus; +static Lisp_Object Qdbus_close_bus; +static Lisp_Object Qdbus_get_unique_name; +static Lisp_Object Qdbus_call_method; +static Lisp_Object Qdbus_call_method_asynchronously; +static Lisp_Object Qdbus_method_return_internal; +static Lisp_Object Qdbus_method_error_internal; +static Lisp_Object Qdbus_send_signal; +static Lisp_Object Qdbus_register_service; +static Lisp_Object Qdbus_register_signal; +static Lisp_Object Qdbus_register_method; /* D-Bus error symbol. */ -Lisp_Object Qdbus_error; +static Lisp_Object Qdbus_error; /* Lisp symbols of the system and session buses. */ -Lisp_Object QCdbus_system_bus, QCdbus_session_bus; +static Lisp_Object QCdbus_system_bus, QCdbus_session_bus; /* Lisp symbol for method call timeout. */ -Lisp_Object QCdbus_timeout; +static Lisp_Object QCdbus_timeout; /* Lisp symbols for name request flags. */ -Lisp_Object QCdbus_request_name_allow_replacement; -Lisp_Object QCdbus_request_name_replace_existing; -Lisp_Object QCdbus_request_name_do_not_queue; +static Lisp_Object QCdbus_request_name_allow_replacement; +static Lisp_Object QCdbus_request_name_replace_existing; +static Lisp_Object QCdbus_request_name_do_not_queue; /* Lisp symbols for name request replies. */ -Lisp_Object QCdbus_request_name_reply_primary_owner; -Lisp_Object QCdbus_request_name_reply_in_queue; -Lisp_Object QCdbus_request_name_reply_exists; -Lisp_Object QCdbus_request_name_reply_already_owner; +static Lisp_Object QCdbus_request_name_reply_primary_owner; +static Lisp_Object QCdbus_request_name_reply_in_queue; +static Lisp_Object QCdbus_request_name_reply_exists; +static Lisp_Object QCdbus_request_name_reply_already_owner; /* Lisp symbols of D-Bus types. */ -Lisp_Object QCdbus_type_byte, QCdbus_type_boolean; -Lisp_Object QCdbus_type_int16, QCdbus_type_uint16; -Lisp_Object QCdbus_type_int32, QCdbus_type_uint32; -Lisp_Object QCdbus_type_int64, QCdbus_type_uint64; -Lisp_Object QCdbus_type_double, QCdbus_type_string; -Lisp_Object QCdbus_type_object_path, QCdbus_type_signature; +static Lisp_Object QCdbus_type_byte, QCdbus_type_boolean; +static Lisp_Object QCdbus_type_int16, QCdbus_type_uint16; +static Lisp_Object QCdbus_type_int32, QCdbus_type_uint32; +static Lisp_Object QCdbus_type_int64, QCdbus_type_uint64; +static Lisp_Object QCdbus_type_double, QCdbus_type_string; +static Lisp_Object QCdbus_type_object_path, QCdbus_type_signature; #ifdef DBUS_TYPE_UNIX_FD Lisp_Object QCdbus_type_unix_fd; #endif -Lisp_Object QCdbus_type_array, QCdbus_type_variant; -Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; +static Lisp_Object QCdbus_type_array, QCdbus_type_variant; +static Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; /* Whether we are reading a D-Bus event. */ int xd_in_read_queued_messages = 0; diff --git a/src/dired.c b/src/dired.c index f5fc1e3a62d..2b0ef275cde 100644 --- a/src/dired.c +++ b/src/dired.c @@ -79,12 +79,12 @@ extern struct direct *readdir (DIR *); #include "regex.h" #include "blockinput.h" -Lisp_Object Qdirectory_files; -Lisp_Object Qdirectory_files_and_attributes; -Lisp_Object Qfile_name_completion; -Lisp_Object Qfile_name_all_completions; -Lisp_Object Qfile_attributes; -Lisp_Object Qfile_attributes_lessp; +static Lisp_Object Qdirectory_files; +static Lisp_Object Qdirectory_files_and_attributes; +static Lisp_Object Qfile_name_completion; +static Lisp_Object Qfile_name_all_completions; +static Lisp_Object Qfile_attributes; +static Lisp_Object Qfile_attributes_lessp; static int scmp (const char *, const char *, int); INFUN (Ffile_attributes, 2); @@ -439,7 +439,7 @@ These are all file names in directory DIRECTORY which begin with FILE. */) } static int file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_addr); -Lisp_Object Qdefault_directory; +static Lisp_Object Qdefault_directory; Lisp_Object file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, Lisp_Object predicate) diff --git a/src/editfns.c b/src/editfns.c index 0c34a95b949..afb1e8ebc18 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -107,7 +107,7 @@ static Lisp_Object subst_char_in_region_unwind_1 (Lisp_Object); static void transpose_markers (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT); -Lisp_Object Qbuffer_access_fontify_functions; +static Lisp_Object Qbuffer_access_fontify_functions; INFUN (Fuser_full_name, 1); /* Symbol for the text property used to mark fields. */ @@ -116,7 +116,7 @@ Lisp_Object Qfield; /* A special value for Qfield properties. */ -Lisp_Object Qboundary; +static Lisp_Object Qboundary; void diff --git a/src/eval.c b/src/eval.c index d6d62aa4afb..cefdf784faf 100644 --- a/src/eval.c +++ b/src/eval.c @@ -66,12 +66,13 @@ int gcpro_level; Lisp_Object Qautoload, Qmacro, Qexit, Qinteractive, Qcommandp, Qdefun; Lisp_Object Qinhibit_quit; -Lisp_Object Qand_rest, Qand_optional; -Lisp_Object Qdebug_on_error; -Lisp_Object Qdeclare; +Lisp_Object Qand_rest; +static Lisp_Object Qand_optional; +static Lisp_Object Qdebug_on_error; +static Lisp_Object Qdeclare; Lisp_Object Qinternal_interpreter_environment, Qclosure; -Lisp_Object Qdebug; +static Lisp_Object Qdebug; /* This holds either the symbol `run-hooks' or nil. It is nil at an early stage of startup, and when Emacs diff --git a/src/fileio.c b/src/fileio.c index 5ad8b0a33a1..fb16decaaa3 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -102,20 +102,20 @@ int auto_save_error_occurred; an actual coding system name, but just an indicator to tell insert-file-contents to use `emacs-mule' with a special flag for auto saving and recovering a file. */ -Lisp_Object Qauto_save_coding; +static Lisp_Object Qauto_save_coding; /* Property name of a file name handler, which gives a list of operations it handles.. */ -Lisp_Object Qoperations; +static Lisp_Object Qoperations; /* Lisp functions for translating file formats */ -Lisp_Object Qformat_decode, Qformat_annotate_function; +static Lisp_Object Qformat_decode, Qformat_annotate_function; /* Lisp function for setting buffer-file-coding-system and the multibyteness of the current buffer after inserting a file. */ -Lisp_Object Qafter_insert_file_set_coding; +static Lisp_Object Qafter_insert_file_set_coding; -Lisp_Object Qwrite_region_annotate_functions; +static Lisp_Object Qwrite_region_annotate_functions; /* Each time an annotation function changes the buffer, the new buffer is added here. */ Lisp_Object Vwrite_region_annotation_buffers; @@ -123,25 +123,26 @@ Lisp_Object Vwrite_region_annotation_buffers; #ifdef HAVE_FSYNC #endif -Lisp_Object Qdelete_by_moving_to_trash; +static Lisp_Object Qdelete_by_moving_to_trash; /* Lisp function for moving files to trash. */ -Lisp_Object Qmove_file_to_trash; +static Lisp_Object Qmove_file_to_trash; /* Lisp function for recursively copying directories. */ -Lisp_Object Qcopy_directory; +static Lisp_Object Qcopy_directory; /* Lisp function for recursively deleting directories. */ -Lisp_Object Qdelete_directory; +static Lisp_Object Qdelete_directory; #ifdef WINDOWSNT #endif -Lisp_Object Qfile_error, Qfile_already_exists, Qfile_date_error; -Lisp_Object Qexcl; +Lisp_Object Qfile_error; +static Lisp_Object Qfile_already_exists, Qfile_date_error; +static Lisp_Object Qexcl; Lisp_Object Qfile_name_history; -Lisp_Object Qcar_less_than_car; +static Lisp_Object Qcar_less_than_car; INFUN (Fmake_symbolic_link, 3); static int a_write (int, Lisp_Object, int, int, @@ -205,40 +206,40 @@ restore_point_unwind (Lisp_Object location) } -Lisp_Object Qexpand_file_name; -Lisp_Object Qsubstitute_in_file_name; -Lisp_Object Qdirectory_file_name; -Lisp_Object Qfile_name_directory; -Lisp_Object Qfile_name_nondirectory; -Lisp_Object Qunhandled_file_name_directory; -Lisp_Object Qfile_name_as_directory; -Lisp_Object Qcopy_file; -Lisp_Object Qmake_directory_internal; -Lisp_Object Qmake_directory; -Lisp_Object Qdelete_directory_internal; +static Lisp_Object Qexpand_file_name; +static Lisp_Object Qsubstitute_in_file_name; +static Lisp_Object Qdirectory_file_name; +static Lisp_Object Qfile_name_directory; +static Lisp_Object Qfile_name_nondirectory; +static Lisp_Object Qunhandled_file_name_directory; +static Lisp_Object Qfile_name_as_directory; +static Lisp_Object Qcopy_file; +static Lisp_Object Qmake_directory_internal; +static Lisp_Object Qmake_directory; +static Lisp_Object Qdelete_directory_internal; Lisp_Object Qdelete_file; -Lisp_Object Qrename_file; -Lisp_Object Qadd_name_to_file; -Lisp_Object Qmake_symbolic_link; +static Lisp_Object Qrename_file; +static Lisp_Object Qadd_name_to_file; +static Lisp_Object Qmake_symbolic_link; Lisp_Object Qfile_exists_p; -Lisp_Object Qfile_executable_p; -Lisp_Object Qfile_readable_p; -Lisp_Object Qfile_writable_p; -Lisp_Object Qfile_symlink_p; -Lisp_Object Qaccess_file; +static Lisp_Object Qfile_executable_p; +static Lisp_Object Qfile_readable_p; +static Lisp_Object Qfile_writable_p; +static Lisp_Object Qfile_symlink_p; +static Lisp_Object Qaccess_file; Lisp_Object Qfile_directory_p; -Lisp_Object Qfile_regular_p; -Lisp_Object Qfile_accessible_directory_p; -Lisp_Object Qfile_modes; -Lisp_Object Qset_file_modes; -Lisp_Object Qset_file_times; -Lisp_Object Qfile_selinux_context; -Lisp_Object Qset_file_selinux_context; -Lisp_Object Qfile_newer_than_file_p; +static Lisp_Object Qfile_regular_p; +static Lisp_Object Qfile_accessible_directory_p; +static Lisp_Object Qfile_modes; +static Lisp_Object Qset_file_modes; +static Lisp_Object Qset_file_times; +static Lisp_Object Qfile_selinux_context; +static Lisp_Object Qset_file_selinux_context; +static Lisp_Object Qfile_newer_than_file_p; Lisp_Object Qinsert_file_contents; Lisp_Object Qwrite_region; -Lisp_Object Qverify_visited_file_modtime; -Lisp_Object Qset_visited_file_modtime; +static Lisp_Object Qverify_visited_file_modtime; +static Lisp_Object Qset_visited_file_modtime; DEFUE ("find-file-name-handler", Ffind_file_name_handler, Sfind_file_name_handler, 2, 2, 0, diff --git a/src/fns.c b/src/fns.c index f4eaaccda33..9ced09c38f6 100644 --- a/src/fns.c +++ b/src/fns.c @@ -49,11 +49,12 @@ along with GNU Emacs. If not, see . */ #define NULL ((POINTER_TYPE *)0) #endif -Lisp_Object Qstring_lessp, Qprovide, Qrequire; -Lisp_Object Qyes_or_no_p_history; +Lisp_Object Qstring_lessp; +static Lisp_Object Qprovide, Qrequire; +static Lisp_Object Qyes_or_no_p_history; Lisp_Object Qcursor_in_echo_area; -Lisp_Object Qwidget_type; -Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper; +static Lisp_Object Qwidget_type; +static Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper; static int internal_equal (Lisp_Object , Lisp_Object, int, int); @@ -2541,7 +2542,7 @@ advisable. */) return ret; } -Lisp_Object Qsubfeatures; +static Lisp_Object Qsubfeatures; DEFUN ("featurep", Ffeaturep, Sfeaturep, 1, 2, 0, doc: /* Return t if FEATURE is present in this Emacs. @@ -3354,9 +3355,10 @@ struct Lisp_Hash_Table *weak_hash_tables; /* Various symbols. */ -Lisp_Object Qhash_table_p, Qeq, Qeql, Qequal, Qkey, Qvalue; +static Lisp_Object Qhash_table_p, Qkey, Qvalue; +Lisp_Object Qeq, Qeql, Qequal; Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness; -Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value; +static Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value; /* Function prototypes. */ diff --git a/src/font.c b/src/font.c index a31a418e641..91cb0a2d52b 100644 --- a/src/font.c +++ b/src/font.c @@ -48,7 +48,7 @@ along with GNU Emacs. If not, see . */ #include "nsterm.h" #endif /* HAVE_NS */ -Lisp_Object Qopentype; +static Lisp_Object Qopentype; /* Important character set strings. */ Lisp_Object Qascii_0, Qiso8859_1, Qiso10646_1, Qunicode_bmp, Qunicode_sip; @@ -125,14 +125,16 @@ Lisp_Object QCfoundry; static Lisp_Object QCadstyle, QCregistry; /* Symbols representing keys of font extra info. */ Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript, QCavgwidth; -Lisp_Object QCantialias, QCfont_entity, QCfc_unknown_spec; +Lisp_Object QCantialias, QCfont_entity; +static Lisp_Object QCfc_unknown_spec; /* Symbols representing values of font spacing property. */ -Lisp_Object Qc, Qm, Qp, Qd; +static Lisp_Object Qc, Qm, Qd; +Lisp_Object Qp; /* Special ADSTYLE properties to avoid fonts used for Latin characters; used in xfont.c and ftfont.c. */ Lisp_Object Qja, Qko; -Lisp_Object QCuser_spec; +static Lisp_Object QCuser_spec; /* Alist of font registry symbol and the corresponding charsets information. The information is retrieved from diff --git a/src/font.h b/src/font.h index 511a7de3a16..a9b58eb7c76 100644 --- a/src/font.h +++ b/src/font.h @@ -239,7 +239,7 @@ enum font_property_index ASET ((font), prop, make_number (font_style_to_value (prop, val, 1))) extern Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript; -extern Lisp_Object QCavgwidth, QCantialias, QCfont_entity, QCfc_unknown_spec; +extern Lisp_Object QCavgwidth, QCantialias, QCfont_entity; extern Lisp_Object Qp; @@ -871,4 +871,3 @@ extern void font_deferred_log (const char *, Lisp_Object, Lisp_Object); #endif /* not FONT_DEBUG */ #endif /* not EMACS_FONT_H */ - diff --git a/src/frame.c b/src/frame.c index 6e0e9c4ffc0..5493600ce5b 100644 --- a/src/frame.c +++ b/src/frame.c @@ -69,10 +69,10 @@ Lisp_Object Qonly; Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; Lisp_Object Qvisible; Lisp_Object Qdisplay_type; -Lisp_Object Qbackground_mode; +static Lisp_Object Qbackground_mode; Lisp_Object Qnoelisp; -Lisp_Object Qx_frame_parameter; +static Lisp_Object Qx_frame_parameter; Lisp_Object Qx_resource_name; Lisp_Object Qterminal; Lisp_Object Qterminal_live_p; @@ -82,7 +82,7 @@ Lisp_Object Qterminal_live_p; Lisp_Object Qauto_raise, Qauto_lower; Lisp_Object Qborder_color, Qborder_width; Lisp_Object Qcursor_color, Qcursor_type; -Lisp_Object Qgeometry; /* Not used */ +static Lisp_Object Qgeometry; /* Not used */ Lisp_Object Qheight, Qwidth; Lisp_Object Qleft, Qright; Lisp_Object Qicon_left, Qicon_top, Qicon_type, Qicon_name; @@ -95,19 +95,20 @@ Lisp_Object Qvisibility; Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background; Lisp_Object Qscreen_gamma; Lisp_Object Qline_spacing; -Lisp_Object Quser_position, Quser_size; +static Lisp_Object Quser_position, Quser_size; Lisp_Object Qwait_for_wm; -Lisp_Object Qwindow_id; +static Lisp_Object Qwindow_id; #ifdef HAVE_X_WINDOWS -Lisp_Object Qouter_window_id; +static Lisp_Object Qouter_window_id; #endif Lisp_Object Qparent_id; Lisp_Object Qtitle, Qname; -Lisp_Object Qexplicit_name; +static Lisp_Object Qexplicit_name; Lisp_Object Qunsplittable; Lisp_Object Qmenu_bar_lines, Qtool_bar_lines, Qtool_bar_position; Lisp_Object Qleft_fringe, Qright_fringe; -Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; +Lisp_Object Qbuffer_predicate; +static Lisp_Object Qbuffer_list, Qburied_buffer_list; Lisp_Object Qtty_color_mode; Lisp_Object Qtty, Qtty_type; diff --git a/src/frame.h b/src/frame.h index 756e121f678..a82de35efb1 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1047,7 +1047,7 @@ extern Lisp_Object selected_frame; extern Lisp_Object Qauto_raise, Qauto_lower; extern Lisp_Object Qborder_color, Qborder_width; -extern Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; +extern Lisp_Object Qbuffer_predicate; extern Lisp_Object Qcursor_color, Qcursor_type; extern Lisp_Object Qfont; extern Lisp_Object Qbackground_color, Qforeground_color; @@ -1076,7 +1076,6 @@ extern Lisp_Object Qminibuffer, Qmodeline; extern Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; extern Lisp_Object Qvisible; extern Lisp_Object Qdisplay_type; -extern Lisp_Object Qbackground_mode; extern Lisp_Object Qx_resource_name; diff --git a/src/fringe.c b/src/fringe.c index ce75df766ee..281b563c9b7 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -64,9 +64,9 @@ along with GNU Emacs. If not, see . */ must specify physical bitmap symbols. */ -Lisp_Object Qtruncation, Qcontinuation, Qoverlay_arrow; -Lisp_Object Qempty_line, Qtop_bottom; -Lisp_Object Qhollow_small; +static Lisp_Object Qtruncation, Qcontinuation, Qoverlay_arrow; +static Lisp_Object Qempty_line, Qtop_bottom; +static Lisp_Object Qhollow_small; enum fringe_bitmap_align { diff --git a/src/ftfont.c b/src/ftfont.c index 2e66222d268..47425e853da 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -39,7 +39,7 @@ along with GNU Emacs. If not, see . */ #include "ftfont.h" /* Symbolic type of this font-driver. */ -Lisp_Object Qfreetype; +static Lisp_Object Qfreetype; /* Fontconfig's generic families and their aliases. */ static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif; diff --git a/src/image.c b/src/image.c index 20ca3cf1d6b..f1c3d5d84f0 100644 --- a/src/image.c +++ b/src/image.c @@ -124,7 +124,7 @@ typedef struct ns_bitmap_record Bitmap_Record; /* The symbol `postscript' identifying images of this type. */ -Lisp_Object Qpostscript; +static Lisp_Object Qpostscript; static void x_disable_image (struct frame *, struct image *); static void x_edge_detection (struct frame *, struct image *, Lisp_Object, @@ -562,17 +562,21 @@ static Lisp_Object Vimage_type_cache; /* The symbol `xbm' which is used as the type symbol for XBM images. */ -Lisp_Object Qxbm; +static Lisp_Object Qxbm; /* Keywords. */ -Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; -Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; -Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask, QCgeometry, QCcrop, QCrotation; +Lisp_Object QCascent, QCmargin, QCrelief; +static Lisp_Object Qcount, Qextension_data; +Lisp_Object QCconversion; +static Lisp_Object QCheuristic_mask; +static Lisp_Object QCcolor_symbols; +static Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask, QCgeometry; +static Lisp_Object QCcrop, QCrotation; /* Other symbols. */ -Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic; +static Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic; /* Function prototypes. */ @@ -3001,7 +3005,7 @@ static int xpm_valid_color_symbols_p (Lisp_Object); #if defined (HAVE_XPM) || defined (HAVE_NS) /* The symbol `xpm' identifying XPM-format images. */ -Lisp_Object Qxpm; +static Lisp_Object Qxpm; /* Indices of image specification fields in xpm_format, below. */ @@ -4925,7 +4929,7 @@ static int pbm_scan_number (unsigned char **, unsigned char *); /* The symbol `pbm' identifying images of this type. */ -Lisp_Object Qpbm; +static Lisp_Object Qpbm; /* Indices of image specification fields in gs_format, below. */ @@ -5342,7 +5346,7 @@ static int png_load (struct frame *f, struct image *img); /* The symbol `png' identifying images of this type. */ -Lisp_Object Qpng; +static Lisp_Object Qpng; /* Indices of image specification fields in png_format, below. */ @@ -5956,7 +5960,7 @@ static int jpeg_load (struct frame *f, struct image *img); /* The symbol `jpeg' identifying images of this type. */ -Lisp_Object Qjpeg; +static Lisp_Object Qjpeg; /* Indices of image specification fields in gs_format, below. */ @@ -6505,7 +6509,7 @@ static int tiff_load (struct frame *f, struct image *img); /* The symbol `tiff' identifying images of this type. */ -Lisp_Object Qtiff; +static Lisp_Object Qtiff; /* Indices of image specification fields in tiff_format, below. */ @@ -6933,7 +6937,7 @@ static void gif_clear_image (struct frame *f, struct image *img); /* The symbol `gif' identifying images of this type. */ -Lisp_Object Qgif; +static Lisp_Object Qgif; /* Indices of image specification fields in gif_format, below. */ @@ -8302,7 +8306,7 @@ static void gs_clear_image (struct frame *f, struct image *img); /* Keyword symbols. */ -Lisp_Object QCloader, QCbounding_box, QCpt_width, QCpt_height; +static Lisp_Object QCloader, QCbounding_box, QCpt_width, QCpt_height; /* Indices of image specification fields in gs_format, below. */ diff --git a/src/intervals.h b/src/intervals.h index b2d755036ba..3a9ee87b921 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -295,8 +295,6 @@ extern int invisible_p (Lisp_Object, Lisp_Object); /* Declared in textprop.c */ /* Types of hooks. */ -extern Lisp_Object Qmouse_left; -extern Lisp_Object Qmouse_entered; extern Lisp_Object Qpoint_left; extern Lisp_Object Qpoint_entered; extern Lisp_Object Qmodification_hooks; @@ -305,8 +303,8 @@ extern Lisp_Object Qlocal_map; extern Lisp_Object Qkeymap; /* Visual properties text (including strings) may have. */ -extern Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple; -extern Lisp_Object Qinvisible, Qintangible, Qread_only; +extern Lisp_Object Qfont; +extern Lisp_Object Qinvisible, Qintangible; /* Sticky properties */ extern Lisp_Object Qfront_sticky, Qrear_nonsticky; diff --git a/src/keyboard.c b/src/keyboard.c index 97989fc1c15..f4afe000685 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -100,7 +100,8 @@ int single_kboard; /* Non-nil disable property on a command means do not execute it; call disabled-command-function's value instead. */ -Lisp_Object Qdisabled, Qdisabled_command_function; +Lisp_Object Qdisabled; +static Lisp_Object Qdisabled_command_function; #define NUM_RECENT_KEYS (300) int recent_keys_index; /* Index for storing next element into recent_keys */ @@ -231,36 +232,37 @@ Lisp_Object internal_last_event_frame; X Windows wants this for selection ownership. */ unsigned long last_event_timestamp; -Lisp_Object Qx_set_selection, QPRIMARY, Qhandle_switch_frame; +static Lisp_Object Qx_set_selection, Qhandle_switch_frame; +Lisp_Object QPRIMARY; -Lisp_Object Qself_insert_command; -Lisp_Object Qforward_char; -Lisp_Object Qbackward_char; -Lisp_Object Qundefined; -Lisp_Object Qtimer_event_handler; +static Lisp_Object Qself_insert_command; +static Lisp_Object Qforward_char; +static Lisp_Object Qbackward_char; +static Lisp_Object Qundefined; +static Lisp_Object Qtimer_event_handler; /* read_key_sequence stores here the command definition of the key sequence that it reads. */ Lisp_Object read_key_sequence_cmd; -Lisp_Object Qinput_method_function; +static Lisp_Object Qinput_method_function; -Lisp_Object Qdeactivate_mark; +static Lisp_Object Qdeactivate_mark; Lisp_Object Qrecompute_lucid_menubar, Qactivate_menubar_hook; -Lisp_Object Qecho_area_clear_hook; +static Lisp_Object Qecho_area_clear_hook; /* Hooks to run before and after each command. */ -Lisp_Object Qpre_command_hook; -Lisp_Object Qpost_command_hook; +static Lisp_Object Qpre_command_hook; +static Lisp_Object Qpost_command_hook; -Lisp_Object Qdeferred_action_function; +static Lisp_Object Qdeferred_action_function; -Lisp_Object Qinput_method_exit_on_first_char; -Lisp_Object Qinput_method_use_echo_area; +static Lisp_Object Qinput_method_exit_on_first_char; +static Lisp_Object Qinput_method_use_echo_area; -Lisp_Object Qhelp_form_show; +static Lisp_Object Qhelp_form_show; /* File in which we write all commands we read. */ FILE *dribble; @@ -293,42 +295,49 @@ static struct input_event * volatile kbd_store_ptr; at inopportune times. */ /* Symbols to head events. */ -Lisp_Object Qmouse_movement; -Lisp_Object Qscroll_bar_movement; +static Lisp_Object Qmouse_movement; +static Lisp_Object Qscroll_bar_movement; Lisp_Object Qswitch_frame; -Lisp_Object Qdelete_frame; -Lisp_Object Qiconify_frame; -Lisp_Object Qmake_frame_visible; -Lisp_Object Qselect_window; +static Lisp_Object Qdelete_frame; +static Lisp_Object Qiconify_frame; +static Lisp_Object Qmake_frame_visible; +static Lisp_Object Qselect_window; Lisp_Object Qhelp_echo; #if defined (HAVE_MOUSE) || defined (HAVE_GPM) -Lisp_Object Qmouse_fixup_help_message; +static Lisp_Object Qmouse_fixup_help_message; #endif /* Symbols to denote kinds of events. */ -Lisp_Object Qfunction_key; +static Lisp_Object Qfunction_key; Lisp_Object Qmouse_click; #if defined (WINDOWSNT) Lisp_Object Qlanguage_change; #endif -Lisp_Object Qdrag_n_drop; -Lisp_Object Qsave_session; +static Lisp_Object Qdrag_n_drop; +static Lisp_Object Qsave_session; #ifdef HAVE_DBUS -Lisp_Object Qdbus_event; +static Lisp_Object Qdbus_event; #endif -Lisp_Object Qconfig_changed_event; +static Lisp_Object Qconfig_changed_event; /* Lisp_Object Qmouse_movement; - also an event header */ /* Properties of event headers. */ Lisp_Object Qevent_kind; -Lisp_Object Qevent_symbol_elements; +static Lisp_Object Qevent_symbol_elements; /* menu and tool bar item parts */ -Lisp_Object Qmenu_enable; -Lisp_Object QCenable, QCvisible, QChelp, QCfilter, QCkeys, QCkey_sequence; -Lisp_Object QCbutton, QCtoggle, QCradio, QClabel, QCvert_only; +static Lisp_Object Qmenu_enable; +static Lisp_Object QCenable, QCvisible, QChelp, QCkeys, QCkey_sequence; +Lisp_Object QCfilter; + +/* Non-nil disable property on a command means + do not execute it; call disabled-command-function's value instead. */ +Lisp_Object QCtoggle, QCradio; +static Lisp_Object QCbutton, QClabel; + +static Lisp_Object QCvert_only; /* An event header symbol HEAD may have a property named Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS); @@ -341,22 +350,22 @@ Lisp_Object Qevent_symbol_element_mask; Qmodifier_cache, which is an alist mapping modifier masks onto modified versions of BASE. If present, this helps speed up apply_modifiers. */ -Lisp_Object Qmodifier_cache; +static Lisp_Object Qmodifier_cache; /* Symbols to use for parts of windows. */ Lisp_Object Qmode_line; Lisp_Object Qvertical_line; -Lisp_Object Qvertical_scroll_bar; +static Lisp_Object Qvertical_scroll_bar; Lisp_Object Qmenu_bar; Lisp_Object recursive_edit_unwind (Lisp_Object buffer), command_loop (void); -Lisp_Object Qextended_command_history; +static Lisp_Object Qextended_command_history; EMACS_TIME timer_check (void); static void record_menu_key (Lisp_Object c); static int echo_length (void); -Lisp_Object Qpolling_period; +static Lisp_Object Qpolling_period; /* Incremented whenever a timer is run. */ int timers_run; @@ -5032,9 +5041,11 @@ static const char *const lispy_drag_n_drop_names[] = }; /* Scroll bar parts. */ -Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; -Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; -Lisp_Object Qtop, Qratio; +static Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; +Lisp_Object Qup, Qdown, Qbottom; +static Lisp_Object Qend_scroll; +Lisp_Object Qtop; +static Lisp_Object Qratio; /* An array of scroll bar parts, indexed by an enum scroll_bar_part value. */ static Lisp_Object *const scroll_bar_parts[] = { @@ -7889,8 +7900,8 @@ static int ntool_bar_items; /* The symbols `:image' and `:rtl'. */ -Lisp_Object QCimage; -Lisp_Object Qrtl; +static Lisp_Object QCimage; +static Lisp_Object Qrtl; /* Function prototypes. */ diff --git a/src/keyboard.h b/src/keyboard.h index 72bb821b2eb..d945de5de20 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -408,15 +408,10 @@ typedef struct _widget_value extern Lisp_Object Qswitch_frame; /* Properties on event heads. */ -extern Lisp_Object Qevent_kind, Qevent_symbol_elements; - -/* Getting an unmodified version of an event head. */ -#define EVENT_HEAD_UNMODIFIED(event_head) \ - (Fcar (Fget ((event_head), Qevent_symbol_elements))) +extern Lisp_Object Qevent_kind; /* The values of Qevent_kind properties. */ -extern Lisp_Object Qfunction_key, Qmouse_click, Qmouse_movement; -extern Lisp_Object Qscroll_bar_movement; +extern Lisp_Object Qmouse_click; extern Lisp_Object Qhelp_echo; @@ -454,9 +449,7 @@ extern Lisp_Object real_this_command; /* Non-nil disable property on a command means do not execute it; call disabled-command-function's value instead. */ -extern Lisp_Object QCbutton, QCtoggle, QCradio, QClabel; - -extern Lisp_Object Qinput_method_function; +extern Lisp_Object QCtoggle, QCradio; /* An event header symbol HEAD may have a property named Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS); diff --git a/src/keymap.c b/src/keymap.c index 9adf2898736..741fa4f6dfc 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -56,8 +56,9 @@ Lisp_Object control_x_map; /* The keymap used for globally bound /* keymap used for minibuffers when doing completion */ /* keymap used for minibuffers when doing completion and require a match */ -Lisp_Object Qkeymapp, Qkeymap, Qnon_ascii, Qmenu_item, Qremap; -Lisp_Object QCadvertised_binding; +static Lisp_Object Qkeymapp, Qnon_ascii; +Lisp_Object Qkeymap, Qmenu_item, Qremap; +static Lisp_Object QCadvertised_binding; /* Alist of elements like (DEL . "\d"). */ static Lisp_Object exclude_keys; @@ -659,7 +660,7 @@ map_keymap (Lisp_Object map, map_keymap_function_t fun, Lisp_Object args, void * UNGCPRO; } -Lisp_Object Qkeymap_canonicalize; +static Lisp_Object Qkeymap_canonicalize; /* Same as map_keymap, but does it right, properly eliminating duplicate bindings due to inheritance. */ @@ -2175,7 +2176,7 @@ then the value includes only maps for prefixes that start with PREFIX. */) } return maps; } -Lisp_Object Qsingle_key_description, Qkey_description; +static Lisp_Object Qsingle_key_description, Qkey_description; /* This function cannot GC. */ diff --git a/src/lisp.h b/src/lisp.h index 10fc66f4406..fb44002b6a6 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2291,22 +2291,22 @@ struct window; struct frame; /* Defined in data.c. */ -extern Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; +extern Lisp_Object Qnil, Qt, Qquote, Qlambda, Qunbound; extern Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; -extern Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; +extern Lisp_Object Qerror, Qquit, Qargs_out_of_range; extern Lisp_Object Qvoid_variable, Qvoid_function; -extern Lisp_Object Qsetting_constant, Qinvalid_read_syntax; +extern Lisp_Object Qinvalid_read_syntax; extern Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; extern Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; extern Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; extern Lisp_Object Qtext_read_only; extern Lisp_Object Qinteractive_form; extern Lisp_Object Qcircular_list; -extern Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; +extern Lisp_Object Qintegerp, Qwholenump, Qsymbolp, Qlistp, Qconsp; extern Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; extern Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; extern Lisp_Object Qbuffer_or_string_p; -extern Lisp_Object Qboundp, Qfboundp; +extern Lisp_Object Qfboundp; extern Lisp_Object Qchar_table_p, Qvector_or_char_table_p; extern Lisp_Object Qcdr; @@ -2530,9 +2530,8 @@ extern void init_fringe_once (void); #endif /* HAVE_WINDOW_SYSTEM */ /* Defined in image.c */ -extern Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; -extern Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; -extern Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask; +extern Lisp_Object QCascent, QCmargin, QCrelief; +extern Lisp_Object QCconversion; extern int x_bitmap_mask (struct frame *, int); extern void syms_of_image (void); extern void init_image (void); @@ -2602,8 +2601,6 @@ extern void syms_of_display (void); /* Defined in xdisp.c */ extern Lisp_Object Qinhibit_point_motion_hooks; extern Lisp_Object Qinhibit_redisplay, Qdisplay; -extern Lisp_Object Qinhibit_eval_during_redisplay; -extern Lisp_Object Qmessage_truncate_lines; extern Lisp_Object Qmenu_bar_update_hook; extern Lisp_Object Qwindow_scroll_functions; extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; @@ -2821,6 +2818,7 @@ extern void syms_of_lread (void); /* Defined in eval.c. */ extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro; extern Lisp_Object Qinhibit_quit, Qclosure; +extern Lisp_Object Qand_rest; extern Lisp_Object Vautoload_queue; extern Lisp_Object Vsignaling_function; extern int handling_signal; @@ -2963,8 +2961,7 @@ EXFUN (Fkill_buffer, 1); EXFUN (Fkill_all_local_variables, 0); EXFUN (Fbuffer_enable_undo, 1); EXFUN (Ferase_buffer, 0); -extern Lisp_Object Qoverlayp; -extern Lisp_Object Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string; +extern Lisp_Object Qpriority, Qwindow, Qbefore_string, Qafter_string; extern Lisp_Object get_truename_buffer (Lisp_Object); extern struct buffer *all_buffers; EXFUN (Fprevious_overlay_change, 1); @@ -3111,16 +3108,14 @@ extern Lisp_Object echo_message_buffer; extern struct kboard *echo_kboard; extern void cancel_echoing (void); extern Lisp_Object Qdisabled, QCfilter; -extern Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; -extern Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; -extern Lisp_Object Qtop, Qratio; +extern Lisp_Object Qup, Qdown, Qbottom; +extern Lisp_Object Qtop; extern int input_pending; EXFUN (Fdiscard_input, 0); EXFUN (Frecursive_edit, 0); EXFUN (Ftop_level, 0) NO_RETURN; extern Lisp_Object menu_bar_items (Lisp_Object); extern Lisp_Object tool_bar_items (Lisp_Object, int *); -extern Lisp_Object Qvertical_scroll_bar; extern void discard_mouse_events (void); EXFUN (Fevent_convert_list, 1); EXFUN (Fread_key_sequence, 5); @@ -3223,7 +3218,6 @@ EXFUN (Fget_buffer_process, 1); EXFUN (Fprocess_status, 1); EXFUN (Fkill_process, 2); EXFUN (Fwaiting_for_user_input_p, 0); -extern Lisp_Object Qprocessp; extern void kill_buffer_processes (Lisp_Object); extern int wait_reading_process_output (int, int, int, int, Lisp_Object, @@ -3411,9 +3405,9 @@ EXFUN (Fx_focus_frame, 1); #endif /* Defined in xfaces.c */ -extern Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; -extern Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; -extern Lisp_Object Qmode_line_inactive, Qvertical_border; +extern Lisp_Object Qdefault, Qtool_bar, Qfringe; +extern Lisp_Object Qheader_line, Qscroll_bar, Qcursor; +extern Lisp_Object Qmode_line_inactive; extern Lisp_Object Qface; extern Lisp_Object Qnormal; extern Lisp_Object QCfamily, QCweight, QCslant; diff --git a/src/lread.c b/src/lread.c index 7d12f5a85d3..2d383350ec1 100644 --- a/src/lread.c +++ b/src/lread.c @@ -61,20 +61,21 @@ along with GNU Emacs. If not, see . */ #endif /* hash table read constants */ -Lisp_Object Qhash_table, Qdata; -Lisp_Object Qtest, Qsize; -Lisp_Object Qweakness; -Lisp_Object Qrehash_size; -Lisp_Object Qrehash_threshold; - -Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; +static Lisp_Object Qhash_table, Qdata; +static Lisp_Object Qtest, Qsize; +static Lisp_Object Qweakness; +static Lisp_Object Qrehash_size; +static Lisp_Object Qrehash_threshold; + +static Lisp_Object Qread_char, Qget_file_char, Qcurrent_load_list; +Lisp_Object Qstandard_input; Lisp_Object Qvariable_documentation; -Lisp_Object Qascii_character, Qload, Qload_file_name; +static Lisp_Object Qascii_character, Qload, Qload_file_name; Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction; -Lisp_Object Qinhibit_file_name_operation; -Lisp_Object Qeval_buffer_list; -Lisp_Object Qlexical_binding; -Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ +static Lisp_Object Qinhibit_file_name_operation; +static Lisp_Object Qeval_buffer_list; +static Lisp_Object Qlexical_binding; +static Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ /* Used instead of Qget_file_char while loading *.elc files compiled by Emacs 21 or older. */ diff --git a/src/macros.c b/src/macros.c index fd771b52dee..e5de4a14136 100644 --- a/src/macros.c +++ b/src/macros.c @@ -27,7 +27,8 @@ along with GNU Emacs. If not, see . */ #include "window.h" #include "keyboard.h" -Lisp_Object Qexecute_kbd_macro, Qkbd_macro_termination_hook; +Lisp_Object Qexecute_kbd_macro; +static Lisp_Object Qkbd_macro_termination_hook; /* Number of successful iterations so far for innermost keyboard macro. diff --git a/src/minibuf.c b/src/minibuf.c index 3e8fc0c2424..ae4372746bc 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -53,35 +53,35 @@ int minibuf_level; /* The maximum length of a minibuffer history. */ -Lisp_Object Qhistory_length; +static Lisp_Object Qhistory_length; /* Fread_minibuffer leaves the input here as a string. */ Lisp_Object last_minibuf_string; -Lisp_Object Qminibuffer_history, Qbuffer_name_history; +static Lisp_Object Qminibuffer_history, Qbuffer_name_history; -Lisp_Object Qread_file_name_internal; +static Lisp_Object Qread_file_name_internal; /* Normal hooks for entry to and exit from minibuffer. */ -Lisp_Object Qminibuffer_setup_hook; -Lisp_Object Qminibuffer_exit_hook; +static Lisp_Object Qminibuffer_setup_hook; +static Lisp_Object Qminibuffer_exit_hook; Lisp_Object Qcompletion_ignore_case; -Lisp_Object Qminibuffer_completion_table; -Lisp_Object Qminibuffer_completion_predicate; -Lisp_Object Qminibuffer_completion_confirm; -Lisp_Object Qcompleting_read_default; -Lisp_Object Quser_variable_p; +static Lisp_Object Qminibuffer_completion_table; +static Lisp_Object Qminibuffer_completion_predicate; +static Lisp_Object Qminibuffer_completion_confirm; +static Lisp_Object Qcompleting_read_default; +static Lisp_Object Quser_variable_p; -Lisp_Object Qminibuffer_default; +static Lisp_Object Qminibuffer_default; -Lisp_Object Qcurrent_input_method, Qactivate_input_method; +static Lisp_Object Qcurrent_input_method, Qactivate_input_method; -Lisp_Object Qcase_fold_search; +static Lisp_Object Qcase_fold_search; -Lisp_Object Qread_expression_history; +static Lisp_Object Qread_expression_history; /* Prompt to display in front of the mini-buffer contents. */ diff --git a/src/print.c b/src/print.c index f039b40aa60..82040555921 100644 --- a/src/print.c +++ b/src/print.c @@ -39,11 +39,11 @@ along with GNU Emacs. If not, see . */ Lisp_Object Qstandard_output; -Lisp_Object Qtemp_buffer_setup_hook; +static Lisp_Object Qtemp_buffer_setup_hook; /* These are used to print like we read. */ -Lisp_Object Qfloat_output_format; +static Lisp_Object Qfloat_output_format; #include @@ -79,7 +79,7 @@ EMACS_INT print_buffer_pos; EMACS_INT print_buffer_pos_byte; Lisp_Object Qprint_escape_newlines; -Lisp_Object Qprint_escape_multibyte, Qprint_escape_nonascii; +static Lisp_Object Qprint_escape_multibyte, Qprint_escape_nonascii; /* Vprint_number_table is a table, that keeps objects that are going to be printed, to allow use of #n= and #n# to express sharing. diff --git a/src/process.c b/src/process.c index ec96c1aa67e..89d04081eb7 100644 --- a/src/process.c +++ b/src/process.c @@ -127,22 +127,24 @@ int inhibit_sentinels; #ifdef subprocesses -Lisp_Object Qprocessp; -Lisp_Object Qrun, Qstop, Qsignal; -Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten; -Lisp_Object Qlocal, Qipv4, Qdatagram, Qseqpacket; -Lisp_Object Qreal, Qnetwork, Qserial; +static Lisp_Object Qprocessp; +static Lisp_Object Qrun, Qstop, Qsignal; +static Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten; +Lisp_Object Qlocal; +static Lisp_Object Qipv4, Qdatagram, Qseqpacket; +static Lisp_Object Qreal, Qnetwork, Qserial; #ifdef AF_INET6 -Lisp_Object Qipv6; +static Lisp_Object Qipv6; #endif -Lisp_Object QCport, QCspeed, QCprocess; +static Lisp_Object QCport, QCprocess; +Lisp_Object QCspeed; Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven; Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; -Lisp_Object QCbuffer, QChost, QCservice; -Lisp_Object QClocal, QCremote, QCcoding; -Lisp_Object QCserver, QCnowait, QCnoquery, QCstop; -Lisp_Object QCsentinel, QClog, QCoptions, QCplist; -Lisp_Object Qlast_nonmenu_event; +static Lisp_Object QCbuffer, QChost, QCservice; +static Lisp_Object QClocal, QCremote, QCcoding; +static Lisp_Object QCserver, QCnowait, QCnoquery, QCstop; +static Lisp_Object QCsentinel, QClog, QCoptions, QCplist; +static Lisp_Object Qlast_nonmenu_event; /* QCfamily is declared and initialized in xfaces.c, QCfilter in keyboard.c. */ extern Lisp_Object QCfamily, QCfilter; diff --git a/src/process.h b/src/process.h index 6bf1084afcd..1e90f553b38 100644 --- a/src/process.h +++ b/src/process.h @@ -181,7 +181,7 @@ extern Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime; extern Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; extern Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime; extern Lisp_Object Qtime, Qctime; -extern Lisp_Object QCport, QCspeed, QCprocess; +extern Lisp_Object QCspeed; extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven; extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; @@ -198,4 +198,3 @@ extern void add_read_fd (int fd, fd_callback func, void *data); extern void delete_read_fd (int fd); extern void add_write_fd (int fd, fd_callback func, void *data); extern void delete_write_fd (int fd); - diff --git a/src/search.c b/src/search.c index 34f02e6cd65..ea10e47f556 100644 --- a/src/search.c +++ b/src/search.c @@ -85,10 +85,10 @@ static Lisp_Object last_thing_searched; /* error condition signaled when regexp compile_pattern fails */ -Lisp_Object Qinvalid_regexp; +static Lisp_Object Qinvalid_regexp; /* Error condition used for failing searches */ -Lisp_Object Qsearch_failed; +static Lisp_Object Qsearch_failed; static void set_search_regs (EMACS_INT, EMACS_INT); static void save_search_regs (void); diff --git a/src/sound.c b/src/sound.c index a972809e2c7..4478a067c09 100644 --- a/src/sound.c +++ b/src/sound.c @@ -94,9 +94,9 @@ along with GNU Emacs. If not, see . */ /* Symbols. */ -Lisp_Object QCvolume, QCdevice; -Lisp_Object Qsound; -Lisp_Object Qplay_sound_functions; +static Lisp_Object QCvolume, QCdevice; +static Lisp_Object Qsound; +static Lisp_Object Qplay_sound_functions; /* Indices of attributes in a sound attributes vector. */ diff --git a/src/syntax.c b/src/syntax.c index 819a7542a7b..96d50f9a4e3 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -95,7 +95,8 @@ along with GNU Emacs. If not, see . */ #define ST_COMMENT_STYLE (256 + 1) #define ST_STRING_STYLE (256 + 2) -Lisp_Object Qsyntax_table_p, Qsyntax_table, Qscan_error; +static Lisp_Object Qsyntax_table_p; +static Lisp_Object Qsyntax_table, Qscan_error; /* Used as a temporary in SYNTAX_ENTRY and other macros in syntax.h, if not compiled with GCC. No need to mark it, since it is used diff --git a/src/syntax.h b/src/syntax.h index e8726bb28a4..2b052715dac 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -extern Lisp_Object Qsyntax_table_p; extern void update_syntax_table (EMACS_INT, int, int, Lisp_Object); /* The standard syntax table is stored where it will automatically @@ -300,4 +299,3 @@ struct gl_state_s extern struct gl_state_s gl_state; extern EMACS_INT scan_words (EMACS_INT, EMACS_INT); - diff --git a/src/textprop.c b/src/textprop.c index 8cd9d580c4c..b3bb064e8b8 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -47,16 +47,19 @@ along with GNU Emacs. If not, see . */ /* Types of hooks. */ -Lisp_Object Qmouse_left; -Lisp_Object Qmouse_entered; +static Lisp_Object Qmouse_left; +static Lisp_Object Qmouse_entered; Lisp_Object Qpoint_left; Lisp_Object Qpoint_entered; Lisp_Object Qcategory; Lisp_Object Qlocal_map; /* Visual properties text (including strings) may have. */ -Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple; -Lisp_Object Qinvisible, Qread_only, Qintangible, Qmouse_face; +static Lisp_Object Qforeground, Qbackground, Qunderline; +Lisp_Object Qfont; +static Lisp_Object Qstipple; +Lisp_Object Qinvisible, Qintangible, Qmouse_face; +static Lisp_Object Qread_only; Lisp_Object Qminibuffer_prompt; /* Sticky properties */ diff --git a/src/window.c b/src/window.c index 72ab2a3ea10..ee1b1bc04f7 100644 --- a/src/window.c +++ b/src/window.c @@ -50,10 +50,11 @@ along with GNU Emacs. If not, see . */ #include "nsterm.h" #endif -Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; -Lisp_Object Qdisplay_buffer; -Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; -Lisp_Object Qwindow_size_fixed; +Lisp_Object Qwindowp, Qwindow_live_p; +static Lisp_Object Qwindow_configuration_p; +static Lisp_Object Qdisplay_buffer; +static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; +static Lisp_Object Qwindow_size_fixed; static int displayed_window_lines (struct window *); static struct window *decode_window (Lisp_Object); @@ -116,7 +117,7 @@ Lisp_Object minibuf_selected_window; /* Hook run at end of temp_output_buffer_show. */ -Lisp_Object Qtemp_buffer_show_hook; +static Lisp_Object Qtemp_buffer_show_hook; /* Incremented for each window created. */ diff --git a/src/xdisp.c b/src/xdisp.c index 7553841f51b..b5ba2090c70 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -318,29 +318,31 @@ along with GNU Emacs. If not, see . */ Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; Lisp_Object Qwindow_scroll_functions; -Lisp_Object Qwindow_text_change_functions; -Lisp_Object Qredisplay_end_trigger_functions; +static Lisp_Object Qwindow_text_change_functions; +static Lisp_Object Qredisplay_end_trigger_functions; Lisp_Object Qinhibit_point_motion_hooks; -Lisp_Object QCeval, QCfile, QCdata, QCpropertize; -Lisp_Object Qfontified; -Lisp_Object Qgrow_only; -Lisp_Object Qinhibit_eval_during_redisplay; -Lisp_Object Qbuffer_position, Qposition, Qobject; -Lisp_Object Qright_to_left, Qleft_to_right; +static Lisp_Object QCeval, QCpropertize; +Lisp_Object QCfile, QCdata; +static Lisp_Object Qfontified; +static Lisp_Object Qgrow_only; +static Lisp_Object Qinhibit_eval_during_redisplay; +static Lisp_Object Qbuffer_position, Qposition, Qobject; +static Lisp_Object Qright_to_left, Qleft_to_right; /* Cursor shapes */ Lisp_Object Qbar, Qhbar, Qbox, Qhollow; /* Pointer shapes */ -Lisp_Object Qarrow, Qhand, Qtext; +static Lisp_Object Qarrow, Qhand; +Lisp_Object Qtext; /* Holds the list (error). */ Lisp_Object list_of_error; -Lisp_Object Qfontification_functions; +static Lisp_Object Qfontification_functions; -Lisp_Object Qwrap_prefix; -Lisp_Object Qline_prefix; +static Lisp_Object Qwrap_prefix; +static Lisp_Object Qline_prefix; /* Non-nil means don't actually do any redisplay. */ @@ -350,12 +352,14 @@ Lisp_Object Qinhibit_redisplay; Lisp_Object Qdisplay; -Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height; -Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise; -Lisp_Object Qslice; +Lisp_Object Qspace, QCalign_to; +static Lisp_Object QCrelative_width, QCrelative_height; +Lisp_Object Qleft_margin, Qright_margin; +static Lisp_Object Qspace_width, Qraise; +static Lisp_Object Qslice; Lisp_Object Qcenter; -Lisp_Object Qmargin, Qpointer; -Lisp_Object Qline_height; +static Lisp_Object Qmargin, Qpointer; +static Lisp_Object Qline_height; #ifdef HAVE_WINDOW_SYSTEM @@ -383,15 +387,15 @@ Lisp_Object Qline_height; /* Name of the face used to highlight trailing whitespace. */ -Lisp_Object Qtrailing_whitespace; +static Lisp_Object Qtrailing_whitespace; /* Name and number of the face used to highlight escape glyphs. */ -Lisp_Object Qescape_glyph; +static Lisp_Object Qescape_glyph; /* Name and number of the face used to highlight non-breaking spaces. */ -Lisp_Object Qnobreak_space; +static Lisp_Object Qnobreak_space; /* The symbol `image' which is the car of the lists used to represent images in Lisp. Also a tool bar style. */ @@ -399,8 +403,9 @@ Lisp_Object Qnobreak_space; Lisp_Object Qimage; /* The image map types. */ -Lisp_Object QCmap, QCpointer; -Lisp_Object Qrect, Qcircle, Qpoly; +Lisp_Object QCmap; +static Lisp_Object QCpointer; +static Lisp_Object Qrect, Qcircle, Qpoly; /* Tool bar styles */ Lisp_Object Qboth, Qboth_horiz, Qtext_image_horiz; @@ -460,12 +465,12 @@ static struct buffer *this_line_buffer; Voverlay_arrow_position is a marker, last-arrow-position is its numerical position. */ -Lisp_Object Qlast_arrow_position, Qlast_arrow_string; +static Lisp_Object Qlast_arrow_position, Qlast_arrow_string; /* Alternative overlay-arrow-string and overlay-arrow-bitmap properties on a symbol in overlay-arrow-variable-list. */ -Lisp_Object Qoverlay_arrow_string, Qoverlay_arrow_bitmap; +static Lisp_Object Qoverlay_arrow_string, Qoverlay_arrow_bitmap; Lisp_Object Qmenu_bar_update_hook; @@ -548,8 +553,8 @@ int message_buf_print; /* The symbol `inhibit-menubar-update' and its DEFVAR_BOOL variable. */ -Lisp_Object Qinhibit_menubar_update; -Lisp_Object Qmessage_truncate_lines; +static Lisp_Object Qinhibit_menubar_update; +static Lisp_Object Qmessage_truncate_lines; /* Set to 1 in clear_message to make redisplay_internal aware of an emptied echo area. */ @@ -603,7 +608,7 @@ int trace_move; #define TRACE_MOVE(x) (void) 0 #endif -Lisp_Object Qauto_hscroll_mode; +static Lisp_Object Qauto_hscroll_mode; /* Buffer being redisplayed -- for redisplay_window_error. */ @@ -708,7 +713,7 @@ static struct glyph_slice null_glyph_slice = { 0, 0, 0, 0 }; int redisplaying_p; -Lisp_Object Qinhibit_free_realized_faces; +static Lisp_Object Qinhibit_free_realized_faces; /* If a string, XTread_socket generates an event to display that string. (The display is done in read_char.) */ @@ -735,7 +740,7 @@ struct atimer *hourglass_atimer; Lisp_Object Qglyphless_char; /* Symbol for the purpose of Vglyphless_char_display. */ -Lisp_Object Qglyphless_char_display; +static Lisp_Object Qglyphless_char_display; /* Method symbols for Vglyphless_char_display. */ static Lisp_Object Qhex_code, Qempty_box, Qthin_space, Qzero_width; diff --git a/src/xfaces.c b/src/xfaces.c index eb2065d4637..920debf4dba 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -304,25 +304,29 @@ along with GNU Emacs. If not, see . */ /* Keyword symbols used for face attribute names. */ -Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline; -Lisp_Object QCinverse_video, QCforeground, QCbackground, QCstipple; -Lisp_Object QCwidth, QCfont, QCbold, QCitalic; -Lisp_Object QCreverse_video; -Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; -Lisp_Object QCfontset; +Lisp_Object QCfamily, QCheight, QCweight, QCslant; +static Lisp_Object QCunderline; +static Lisp_Object QCinverse_video, QCstipple; +Lisp_Object QCforeground, QCbackground; +Lisp_Object QCwidth; +static Lisp_Object QCfont, QCbold, QCitalic; +static Lisp_Object QCreverse_video; +static Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; +static Lisp_Object QCfontset; /* Symbols used for attribute values. */ -Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; -Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; -Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; -Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; -Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; -Lisp_Object Qultra_expanded; -Lisp_Object Qreleased_button, Qpressed_button; -Lisp_Object QCstyle, QCcolor, QCline_width; -Lisp_Object Qunspecified; -Lisp_Object Qignore_defface; +Lisp_Object Qnormal; +static Lisp_Object Qbold, Qultra_light, Qextra_light, Qlight; +static Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold; +static Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic; +static Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed; +static Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded; +static Lisp_Object Qultra_expanded; +static Lisp_Object Qreleased_button, Qpressed_button; +static Lisp_Object QCstyle, QCcolor, QCline_width; +static Lisp_Object Qunspecified; +static Lisp_Object Qignore_defface; char unspecified_fg[] = "unspecified-fg", unspecified_bg[] = "unspecified-bg"; @@ -333,15 +337,18 @@ Lisp_Object Qframe_set_background_mode; /* Names of basic faces. */ -Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; -Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; -Lisp_Object Qmode_line_inactive, Qvertical_border; +Lisp_Object Qdefault, Qtool_bar, Qfringe; +static Lisp_Object Qregion; +Lisp_Object Qheader_line, Qscroll_bar, Qcursor; +static Lisp_Object Qborder, Qmouse, Qmenu; +Lisp_Object Qmode_line_inactive; +static Lisp_Object Qvertical_border; /* The symbol `face-alias'. A symbols having that property is an alias for another face. Value of the property is the name of the aliased face. */ -Lisp_Object Qface_alias; +static Lisp_Object Qface_alias; /* Alist of alternative font families. Each element is of the form (FAMILY FAMILY1 FAMILY2 ...). If fonts of FAMILY can't be loaded, @@ -361,7 +368,7 @@ Lisp_Object Vface_alternative_font_registry_alist; font may be scaled if its name matches a regular expression in the list. */ -Lisp_Object Qscalable_fonts_allowed; +static Lisp_Object Qscalable_fonts_allowed; #define DEFAULT_FONT_LIST_LIMIT 100 @@ -377,11 +384,11 @@ Lisp_Object Qface; /* Property for basic faces which other faces cannot inherit. */ -Lisp_Object Qface_no_inherit; +static Lisp_Object Qface_no_inherit; /* Error symbol for wrong_type_argument in load_pixmap. */ -Lisp_Object Qbitmap_spec_p; +static Lisp_Object Qbitmap_spec_p; /* The next ID to assign to Lisp faces. */ @@ -394,11 +401,11 @@ static int lface_id_to_name_size; /* TTY color-related functions (defined in tty-colors.el). */ -Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; +static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; /* The name of the function used to compute colors on TTYs. */ -Lisp_Object Qtty_color_alist; +static Lisp_Object Qtty_color_alist; /* Counter for calls to clear_face_cache. If this counter reaches CLEAR_FONT_TABLE_COUNT, and a frame has more than diff --git a/src/xfns.c b/src/xfns.c index 8d8a908222f..6fd332016ce 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -139,10 +139,10 @@ char *gray_bitmap_bits = gray_bits; static int x_in_use; -Lisp_Object Qnone; -Lisp_Object Qsuppress_icon; -Lisp_Object Qundefined_color; -Lisp_Object Qcompound_text, Qcancel_timer; +static Lisp_Object Qnone; +static Lisp_Object Qsuppress_icon; +static Lisp_Object Qundefined_color; +static Lisp_Object Qcompound_text, Qcancel_timer; Lisp_Object Qfont_param; #if GLYPH_DEBUG diff --git a/src/xmenu.c b/src/xmenu.c index 595ae795282..721019ffc56 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -111,7 +111,7 @@ along with GNU Emacs. If not, see . */ #define FALSE 0 #endif /* no TRUE */ -Lisp_Object Qdebug_on_next_call; +static Lisp_Object Qdebug_on_next_call; #if defined (USE_X_TOOLKIT) || defined (USE_GTK) static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object, diff --git a/src/xselect.c b/src/xselect.c index 4f1a452023a..2d656cfec9a 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -100,14 +100,14 @@ static Lisp_Object clean_local_selection_data (Lisp_Object); #endif -Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, +static Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL, QATOM_PAIR; -Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ -Lisp_Object QUTF8_STRING; /* This is a type of selection. */ +static Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ +static Lisp_Object QUTF8_STRING; /* This is a type of selection. */ -Lisp_Object Qcompound_text_with_extensions; +static Lisp_Object Qcompound_text_with_extensions; static Lisp_Object Qforeign_selection; -- cgit v1.3 From 74ab6df507f0f4707a8bd25924fbdba9d1610f4f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 10 Apr 2011 23:58:57 -0700 Subject: * coding.h (coding, code_convert_region, encode_coding_gap): Remove decls. * coding.c (Vsjis_coding_system, Vbig5_coding_system): (iso_code_class, detect_coding, code_convert_region): Now static. (encode_coding_gap): Remove; unused. --- src/ChangeLog | 6 ++++++ src/coding.c | 34 +++++----------------------------- src/coding.h | 6 ------ 3 files changed, 11 insertions(+), 35 deletions(-) (limited to 'src/coding.c') diff --git a/src/ChangeLog b/src/ChangeLog index 03f4fcee063..35acd030955 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2011-04-11 Paul Eggert + * coding.h (coding, code_convert_region, encode_coding_gap): Remove + decls. + * coding.c (Vsjis_coding_system, Vbig5_coding_system): + (iso_code_class, detect_coding, code_convert_region): Now static. + (encode_coding_gap): Remove; unused. + * chartab.c (chartab_chars, chartab_bits): Now static. * charset.h (charset_iso_8859_1): Remove decl. diff --git a/src/coding.c b/src/coding.c index d2124db73f2..c29713a5c0c 100644 --- a/src/coding.c +++ b/src/coding.c @@ -358,8 +358,8 @@ static Lisp_Object Qtranslation_table_for_decode; static Lisp_Object Qtranslation_table_for_encode; /* Two special coding systems. */ -Lisp_Object Vsjis_coding_system; -Lisp_Object Vbig5_coding_system; +static Lisp_Object Vsjis_coding_system; +static Lisp_Object Vbig5_coding_system; /* ISO2022 section */ @@ -2862,7 +2862,7 @@ encode_coding_emacs_mule (struct coding_system *coding) COMPOSITION_WITH_RULE_ALTCHARS: ESC 4 ALTCHAR [ RULE ALTCHAR ] ESC 0 CHAR [ CHAR ] ESC 1 */ -enum iso_code_class_type iso_code_class[256]; +static enum iso_code_class_type iso_code_class[256]; #define SAFE_CHARSET_P(coding, id) \ ((id) <= (coding)->max_charset_id \ @@ -6212,7 +6212,7 @@ adjust_coding_eol_type (struct coding_system *coding, int eol_seen) system is detected, update fields of CODING by the detected coding system. */ -void +static void detect_coding (struct coding_system *coding) { const unsigned char *src, *src_end; @@ -7530,30 +7530,6 @@ decode_coding_gap (struct coding_system *coding, return coding->result; } -int -encode_coding_gap (struct coding_system *coding, - EMACS_INT chars, EMACS_INT bytes) -{ - int count = SPECPDL_INDEX (); - - code_conversion_save (0, 0); - - coding->src_object = Fcurrent_buffer (); - coding->src_chars = chars; - coding->src_bytes = bytes; - coding->src_pos = -chars; - coding->src_pos_byte = -bytes; - coding->src_multibyte = chars < bytes; - coding->dst_object = coding->src_object; - coding->dst_pos = PT; - coding->dst_pos_byte = PT_BYTE; - - encode_coding (coding); - - unbind_to (count, Qnil); - return coding->result; -} - /* Decode the text in the range FROM/FROM_BYTE and TO/TO_BYTE in SRC_OBJECT into DST_OBJECT by coding context CODING. @@ -8834,7 +8810,7 @@ is nil. */) } -Lisp_Object +static Lisp_Object code_convert_region (Lisp_Object start, Lisp_Object end, Lisp_Object coding_system, Lisp_Object dst_object, int encodep, int norecord) diff --git a/src/coding.h b/src/coding.h index ff7fcc7c3ac..85e153dcc3a 100644 --- a/src/coding.h +++ b/src/coding.h @@ -695,10 +695,6 @@ extern int encoding_buffer_size (struct coding_system *, int); extern void setup_coding_system (Lisp_Object, struct coding_system *); extern Lisp_Object coding_charset_list (struct coding_system *); extern Lisp_Object coding_system_charset_list (Lisp_Object); -extern void detect_coding (struct coding_system *); -extern Lisp_Object code_convert_region (Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, - int, int); extern Lisp_Object code_convert_string (Lisp_Object, Lisp_Object, Lisp_Object, int, int, int); extern Lisp_Object code_convert_string_norecord (Lisp_Object, Lisp_Object, @@ -709,8 +705,6 @@ extern Lisp_Object complement_process_encoding_system (Lisp_Object); extern int decode_coding_gap (struct coding_system *, EMACS_INT, EMACS_INT); -extern int encode_coding_gap (struct coding_system *, - EMACS_INT, EMACS_INT); extern void decode_coding_object (struct coding_system *, Lisp_Object, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, Lisp_Object); -- cgit v1.3 From a7ca3326c4740ed3ed118b794d35d235de49f346 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 13 Apr 2011 22:04:02 -0700 Subject: Undo the DEFUN->DEFUE change. --- src/alloc.c | 26 ++++++++--------- src/buffer.c | 46 ++++++++++++++--------------- src/callint.c | 2 +- src/callproc.c | 2 +- src/casefiddle.c | 10 +++---- src/casetab.c | 4 +-- src/ccl.c | 2 +- src/character.c | 4 +-- src/chartab.c | 12 ++++---- src/cmds.c | 6 ++-- src/coding.c | 16 +++++------ src/data.c | 84 ++++++++++++++++++++++++++--------------------------- src/dispnew.c | 10 +++---- src/doc.c | 2 +- src/editfns.c | 60 +++++++++++++++++++------------------- src/emacs.c | 2 +- src/eval.c | 24 ++++++++-------- src/fileio.c | 34 +++++++++++----------- src/filelock.c | 2 +- src/floatfns.c | 4 +-- src/fns.c | 88 ++++++++++++++++++++++++++++---------------------------- src/font.c | 14 ++++----- src/fontset.c | 4 +-- src/frame.c | 26 ++++++++--------- src/image.c | 6 ++-- src/indent.c | 6 ++-- src/keyboard.c | 14 ++++----- src/keymap.c | 20 ++++++------- src/lisp.h | 8 ++---- src/lread.c | 18 ++++++------ src/macros.c | 4 +-- src/marker.c | 8 +++--- src/menu.c | 2 +- src/minibuf.c | 16 +++++------ src/print.c | 10 +++---- src/process.c | 8 +++--- src/search.c | 10 +++---- src/syntax.c | 6 ++-- src/term.c | 2 +- src/terminal.c | 4 +-- src/textprop.c | 34 +++++++++++----------- src/undo.c | 2 +- src/window.c | 32 ++++++++++----------- src/xdisp.c | 12 ++++---- src/xfaces.c | 8 +++--- src/xfns.c | 8 +++--- src/xmenu.c | 2 +- src/xsettings.c | 2 +- 48 files changed, 361 insertions(+), 365 deletions(-) (limited to 'src/coding.c') diff --git a/src/alloc.c b/src/alloc.c index 7803ccdc976..d1d6323f905 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -2177,7 +2177,7 @@ compact_small_strings (void) } -DEFUE ("make-string", Fmake_string, Smake_string, 2, 2, 0, +DEFUN ("make-string", Fmake_string, Smake_string, 2, 2, 0, doc: /* Return a newly created string of length LENGTH, with INIT in each element. LENGTH must be an integer. INIT must be an integer that represents a character. */) @@ -2225,7 +2225,7 @@ INIT must be an integer that represents a character. */) } -DEFUE ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0, +DEFUN ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0, doc: /* Return a new bool-vector of length LENGTH, using INIT for each element. LENGTH must be a number. INIT matters only in whether it is t or nil. */) (Lisp_Object length, Lisp_Object init) @@ -2613,7 +2613,7 @@ free_cons (struct Lisp_Cons *ptr) cons_free_list = ptr; } -DEFUE ("cons", Fcons, Scons, 2, 2, 0, +DEFUN ("cons", Fcons, Scons, 2, 2, 0, doc: /* Create a new cons, give it CAR and CDR as components, and return it. */) (Lisp_Object car, Lisp_Object cdr) { @@ -2706,7 +2706,7 @@ list5 (Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, Lisp_Object arg4, L } -DEFUE ("list", Flist, Slist, 0, MANY, 0, +DEFUN ("list", Flist, Slist, 0, MANY, 0, doc: /* Return a newly created list with specified arguments as elements. Any number of arguments, even zero arguments, are allowed. usage: (list &rest OBJECTS) */) @@ -2724,7 +2724,7 @@ usage: (list &rest OBJECTS) */) } -DEFUE ("make-list", Fmake_list, Smake_list, 2, 2, 0, +DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0, doc: /* Return a newly created list of length LENGTH, with each element being INIT. */) (register Lisp_Object length, Lisp_Object init) { @@ -2900,7 +2900,7 @@ allocate_process (void) } -DEFUE ("make-vector", Fmake_vector, Smake_vector, 2, 2, 0, +DEFUN ("make-vector", Fmake_vector, Smake_vector, 2, 2, 0, doc: /* Return a newly created vector of length LENGTH, with each element being INIT. See also the function `vector'. */) (register Lisp_Object length, Lisp_Object init) @@ -2922,7 +2922,7 @@ See also the function `vector'. */) } -DEFUE ("vector", Fvector, Svector, 0, MANY, 0, +DEFUN ("vector", Fvector, Svector, 0, MANY, 0, doc: /* Return a newly created vector with specified arguments as elements. Any number of arguments, even zero arguments, are allowed. usage: (vector &rest OBJECTS) */) @@ -2941,7 +2941,7 @@ usage: (vector &rest OBJECTS) */) } -DEFUE ("make-byte-code", Fmake_byte_code, Smake_byte_code, 4, MANY, 0, +DEFUN ("make-byte-code", Fmake_byte_code, Smake_byte_code, 4, MANY, 0, doc: /* Create a byte-code object with specified arguments as elements. The arguments should be the ARGLIST, bytecode-string BYTE-CODE, constant vector CONSTANTS, maximum stack size DEPTH, (optional) DOCSTRING, @@ -3036,7 +3036,7 @@ init_symbol (void) } -DEFUE ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0, +DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0, doc: /* Return a newly allocated uninterned symbol whose name is NAME. Its value and function definition are void, and its property list is nil. */) (Lisp_Object name) @@ -3199,7 +3199,7 @@ make_save_value (void *pointer, int integer) return val; } -DEFUE ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0, +DEFUN ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0, doc: /* Return a newly allocated marker which does not point at any place. */) (void) { @@ -3928,7 +3928,7 @@ static int max_live, max_zombies; static double avg_live; -DEFUE ("gc-status", Fgc_status, Sgc_status, 0, 0, "", +DEFUN ("gc-status", Fgc_status, Sgc_status, 0, 0, "", doc: /* Show information about live and zombie objects. */) (void) { @@ -4743,7 +4743,7 @@ make_pure_vector (EMACS_INT len) } -DEFUE ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0, +DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0, doc: /* Make a copy of object OBJ in pure storage. Recursively copies contents of vectors and cons cells. Does not copy symbols. Copies strings without text properties. */) @@ -4837,7 +4837,7 @@ inhibit_garbage_collection (void) } -DEFUE ("garbage-collect", Fgarbage_collect, Sgarbage_collect, 0, 0, "", +DEFUN ("garbage-collect", Fgarbage_collect, Sgarbage_collect, 0, 0, "", doc: /* Reclaim storage for Lisp objects no longer needed. Garbage collection happens automatically if you cons more than `gc-cons-threshold' bytes of Lisp data since previous garbage collection. diff --git a/src/buffer.c b/src/buffer.c index 4e690f42934..7b543b80a25 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -160,7 +160,7 @@ nsberror (Lisp_Object spec) error ("Invalid buffer argument"); } -DEFUE ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0, +DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0, doc: /* Return non-nil if OBJECT is a buffer which has not been killed. Value is nil if OBJECT is not a buffer or if it has been killed. */) (Lisp_Object object) @@ -232,7 +232,7 @@ assoc_ignore_text_properties (register Lisp_Object key, Lisp_Object list) return Qnil; } -DEFUE ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, +DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, doc: /* Return the buffer named BUFFER-OR-NAME. BUFFER-OR-NAME must be either a string or a buffer. If BUFFER-OR-NAME is a string and there is no buffer with that name, return nil. If @@ -294,7 +294,7 @@ get_truename_buffer (register Lisp_Object filename) return Qnil; } -DEFUE ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, +DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, doc: /* Return the buffer specified by BUFFER-OR-NAME, creating a new one if needed. If BUFFER-OR-NAME is a string and a live buffer with that name exists, return that buffer. If no such buffer exists, create a new buffer with @@ -830,7 +830,7 @@ reset_buffer_local_variables (register struct buffer *b, int permanent_too) and set-visited-file-name ought to be able to use this to really rename the buffer properly. */ -DEFUE ("generate-new-buffer-name", Fgenerate_new_buffer_name, +DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name, 1, 2, 0, doc: /* Return a string that is the name of no existing buffer based on NAME. If there is no live buffer named NAME, then return NAME. @@ -868,7 +868,7 @@ it is in the sequence to be tried) even if a buffer with that name exists. */) } -DEFUE ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, +DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, doc: /* Return the name of BUFFER, as a string. BUFFER defaults to the current buffer. Return nil if BUFFER has been killed. */) @@ -880,7 +880,7 @@ Return nil if BUFFER has been killed. */) return BVAR (XBUFFER (buffer), name); } -DEFUE ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, +DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, doc: /* Return name of file BUFFER is visiting, or nil if none. No argument or nil as argument means use the current buffer. */) (register Lisp_Object buffer) @@ -915,7 +915,7 @@ BUFFER defaults to the current buffer. */) return base_buffer; } -DEFUE ("buffer-local-value", Fbuffer_local_value, +DEFUN ("buffer-local-value", Fbuffer_local_value, Sbuffer_local_value, 2, 2, 0, doc: /* Return the value of VARIABLE in BUFFER. If VARIABLE does not have a buffer-local binding in BUFFER, the value @@ -1056,7 +1056,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) return result; } -DEFUE ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, +DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, 0, 1, 0, doc: /* Return t if BUFFER was modified since its file was last read or saved. No argument or nil as argument means use current buffer as BUFFER. */) @@ -1074,7 +1074,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; } -DEFUE ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, +DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, 1, 1, 0, doc: /* Mark current buffer as modified or unmodified according to FLAG. A non-nil FLAG means mark the buffer modified. */) @@ -1266,7 +1266,7 @@ This does not change the name of the visited file (if any). */) return BVAR (current_buffer, name); } -DEFUE ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0, +DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0, doc: /* Return most recently selected buffer other than BUFFER. Buffers not visible in windows are preferred to visible buffers, unless optional second argument VISIBLE-OK is non-nil. @@ -1340,7 +1340,7 @@ If BUFFER is omitted or nil, some interesting buffer is returned. */) return buf; } -DEFUE ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, +DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, 0, 1, "", doc: /* Start keeping undo information for buffer BUFFER. No argument or nil as argument means do this for the current buffer. */) @@ -1369,7 +1369,7 @@ Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ The buffer being killed will be current while the hook is running.\n\ See `kill-buffer'." */ -DEFUE ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ", +DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ", doc: /* Kill buffer BUFFER-OR-NAME. The argument may be a buffer or the name of an existing buffer. Argument nil or omitted means kill the current buffer. Return t if the @@ -1788,7 +1788,7 @@ messing with the window-buffer correspondences. */) return switch_to_buffer_1 (buffer_or_name, norecord); } -DEFUE ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, +DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, doc: /* Return the current buffer as a Lisp object. */) (void) { @@ -1898,7 +1898,7 @@ set_buffer_temp (struct buffer *b) fetch_buffer_markers (b); } -DEFUE ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, +DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, doc: /* Make buffer BUFFER-OR-NAME current for editing operations. BUFFER-OR-NAME may be a buffer or the name of an existing buffer. See also `save-excursion' when you want to make a buffer current @@ -1927,7 +1927,7 @@ set_buffer_if_live (Lisp_Object buffer) return Qnil; } -DEFUE ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, +DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, Sbarf_if_buffer_read_only, 0, 0, 0, doc: /* Signal a `buffer-read-only' error if the current buffer is read-only. */) (void) @@ -2000,7 +2000,7 @@ its frame, iconify that frame. */) return Qnil; } -DEFUE ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", +DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", doc: /* Delete the entire contents of the current buffer. Any narrowing restriction in effect (see `narrow-to-region') is removed, so the buffer is truly empty after this. */) @@ -2211,7 +2211,7 @@ DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, return Qnil; } -DEFUE ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte, +DEFUN ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte, 1, 1, 0, doc: /* Set the multibyte flag of the current buffer to FLAG. If FLAG is t, this makes the buffer a multibyte buffer. @@ -2500,7 +2500,7 @@ current buffer is cleared. */) return flag; } -DEFUE ("kill-all-local-variables", Fkill_all_local_variables, +DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables, 0, 0, 0, doc: /* Switch to Fundamental mode by killing current buffer's local variables. Most local variable bindings are eliminated so that the default values @@ -3899,7 +3899,7 @@ DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, /* Overlay dissection functions. */ -DEFUE ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, +DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, doc: /* Return the position at which OVERLAY starts. */) (Lisp_Object overlay) { @@ -3908,7 +3908,7 @@ DEFUE ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, return (Fmarker_position (OVERLAY_START (overlay))); } -DEFUE ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, +DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, doc: /* Return the position at which OVERLAY ends. */) (Lisp_Object overlay) { @@ -3998,7 +3998,7 @@ end of the buffer. */) return result; } -DEFUE ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, +DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, 1, 1, 0, doc: /* Return the next position after POS where an overlay starts or ends. If there are no overlay boundaries from POS to (point-max), @@ -4039,7 +4039,7 @@ the value is (point-max). */) return make_number (endpos); } -DEFUE ("previous-overlay-change", Fprevious_overlay_change, +DEFUN ("previous-overlay-change", Fprevious_overlay_change, Sprevious_overlay_change, 1, 1, 0, doc: /* Return the previous position before POS where an overlay starts or ends. If there are no overlay boundaries from (point-min) to POS, @@ -4108,7 +4108,7 @@ for positions far away from POS). */) return Qnil; } -DEFUE ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, +DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, doc: /* Get the property of overlay OVERLAY with property name PROP. */) (Lisp_Object overlay, Lisp_Object prop) { diff --git a/src/callint.c b/src/callint.c index e491e4e5952..e5ec3d7d931 100644 --- a/src/callint.c +++ b/src/callint.c @@ -852,7 +852,7 @@ invoke it. If KEYS is omitted or nil, the return value of } } -DEFUE ("prefix-numeric-value", Fprefix_numeric_value, Sprefix_numeric_value, +DEFUN ("prefix-numeric-value", Fprefix_numeric_value, Sprefix_numeric_value, 1, 1, 0, doc: /* Return numeric meaning of raw prefix argument RAW. A raw prefix argument is what you get from `(interactive "P")'. diff --git a/src/callproc.c b/src/callproc.c index ec6afcde3a3..57f058aa165 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -152,7 +152,7 @@ call_process_cleanup (Lisp_Object arg) return Qnil; } -DEFUE ("call-process", Fcall_process, Scall_process, 1, MANY, 0, +DEFUN ("call-process", Fcall_process, Scall_process, 1, MANY, 0, doc: /* Call PROGRAM synchronously in separate process. The remaining arguments are optional. The program's input comes from file INFILE (nil means `/dev/null'). diff --git a/src/casefiddle.c b/src/casefiddle.c index 7a220c81865..9f286d73a5e 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -148,7 +148,7 @@ casify_object (enum case_action flag, Lisp_Object obj) } } -DEFUE ("upcase", Fupcase, Supcase, 1, 1, 0, +DEFUN ("upcase", Fupcase, Supcase, 1, 1, 0, doc: /* Convert argument to upper case and return that. The argument may be a character or string. The result has the same type. The argument object is not altered--the value is a copy. @@ -158,7 +158,7 @@ See also `capitalize', `downcase' and `upcase-initials'. */) return casify_object (CASE_UP, obj); } -DEFUE ("downcase", Fdowncase, Sdowncase, 1, 1, 0, +DEFUN ("downcase", Fdowncase, Sdowncase, 1, 1, 0, doc: /* Convert argument to lower case and return that. The argument may be a character or string. The result has the same type. The argument object is not altered--the value is a copy. */) @@ -180,7 +180,7 @@ The argument object is not altered--the value is a copy. */) /* Like Fcapitalize but change only the initials. */ -DEFUE ("upcase-initials", Fupcase_initials, Supcase_initials, 1, 1, 0, +DEFUN ("upcase-initials", Fupcase_initials, Supcase_initials, 1, 1, 0, doc: /* Convert the initial of each word in the argument to upper case. Do not change the other letters of each word. The argument may be a character or string. The result has the same type. @@ -301,7 +301,7 @@ casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e) } } -DEFUE ("upcase-region", Fupcase_region, Supcase_region, 2, 2, "r", +DEFUN ("upcase-region", Fupcase_region, Supcase_region, 2, 2, "r", doc: /* Convert the region to upper case. In programs, wants two arguments. These arguments specify the starting and ending character numbers of the region to operate on. When used as a command, the text between @@ -338,7 +338,7 @@ character positions to operate on. */) /* Like Fcapitalize_region but change only the initials. */ -DEFUE ("upcase-initials-region", Fupcase_initials_region, +DEFUN ("upcase-initials-region", Fupcase_initials_region, Supcase_initials_region, 2, 2, "r", doc: /* Upcase the initial of each word in the region. Subsequent letters of each word are not changed. diff --git a/src/casetab.c b/src/casetab.c index 4bea6ee7e71..29120dd08ce 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -81,7 +81,7 @@ This is the one used for new buffers. */) static Lisp_Object set_case_table (Lisp_Object table, int standard); -DEFUE ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0, +DEFUN ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0, doc: /* Select a new case table for the current buffer. A case table is a char-table which maps characters to their lower-case equivalents. It also has three \"extra\" slots @@ -103,7 +103,7 @@ EQUIVALENCES is a map that cyclicly permutes each equivalence class return set_case_table (table, 0); } -DEFUE ("set-standard-case-table", Fset_standard_case_table, +DEFUN ("set-standard-case-table", Fset_standard_case_table, Sset_standard_case_table, 1, 1, 0, doc: /* Select a new standard case table for new buffers. See `set-case-table' for more info on case tables. */) diff --git a/src/ccl.c b/src/ccl.c index 14194a70c26..66e0f2c6169 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -1929,7 +1929,7 @@ setup_ccl_program (struct ccl_program *ccl, Lisp_Object ccl_prog) } -DEFUE ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0, +DEFUN ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0, doc: /* Return t if OBJECT is a CCL program name or a compiled CCL program code. See the documentation of `define-ccl-program' for the detail of CCL program. */) (Lisp_Object object) diff --git a/src/character.c b/src/character.c index e00168c6abc..84eddeb2fc2 100644 --- a/src/character.c +++ b/src/character.c @@ -307,7 +307,7 @@ If the multibyte character does not represent a byte, return -1. */) } } -DEFUE ("char-width", Fchar_width, Schar_width, 1, 1, 0, +DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0, doc: /* Return width of CHAR when displayed in the current buffer. The width is measured by how many columns it occupies on the screen. Tab is taken to occupy `tab-width' columns. @@ -886,7 +886,7 @@ string_escape_byte8 (Lisp_Object string) } -DEFUE ("string", Fstring, Sstring, 0, MANY, 0, +DEFUN ("string", Fstring, Sstring, 0, MANY, 0, doc: /* Concatenate all the argument characters and make the result a string. usage: (string &rest CHARACTERS) */) diff --git a/src/chartab.c b/src/chartab.c index 2f0e88bd404..eb72d973c87 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -54,7 +54,7 @@ static const int chartab_bits[4] = (((c) - (min_char)) >> chartab_bits[(depth)]) -DEFUE ("make-char-table", Fmake_char_table, Smake_char_table, 1, 2, 0, +DEFUN ("make-char-table", Fmake_char_table, Smake_char_table, 1, 2, 0, doc: /* Return a newly created char-table, with purpose PURPOSE. Each element is initialized to INIT, which defaults to nil. @@ -459,7 +459,7 @@ then the actual applicable value is inherited from the parent char-table return XCHAR_TABLE (char_table)->parent; } -DEFUE ("set-char-table-parent", Fset_char_table_parent, Sset_char_table_parent, +DEFUN ("set-char-table-parent", Fset_char_table_parent, Sset_char_table_parent, 2, 2, 0, doc: /* Set the parent char-table of CHAR-TABLE to PARENT. Return PARENT. PARENT must be either nil or another char-table. */) @@ -483,7 +483,7 @@ Return PARENT. PARENT must be either nil or another char-table. */) return parent; } -DEFUE ("char-table-extra-slot", Fchar_table_extra_slot, Schar_table_extra_slot, +DEFUN ("char-table-extra-slot", Fchar_table_extra_slot, Schar_table_extra_slot, 2, 2, 0, doc: /* Return the value of CHAR-TABLE's extra-slot number N. */) (Lisp_Object char_table, Lisp_Object n) @@ -497,7 +497,7 @@ DEFUE ("char-table-extra-slot", Fchar_table_extra_slot, Schar_table_extra_slot, return XCHAR_TABLE (char_table)->extras[XINT (n)]; } -DEFUE ("set-char-table-extra-slot", Fset_char_table_extra_slot, +DEFUN ("set-char-table-extra-slot", Fset_char_table_extra_slot, Sset_char_table_extra_slot, 3, 3, 0, doc: /* Set CHAR-TABLE's extra-slot number N to VALUE. */) @@ -541,7 +541,7 @@ a cons of character codes (for characters in the range), or a character code. * return val; } -DEFUE ("set-char-table-range", Fset_char_table_range, Sset_char_table_range, +DEFUN ("set-char-table-range", Fset_char_table_range, Sset_char_table_range, 3, 3, 0, doc: /* Set the value in CHAR-TABLE for a range of characters RANGE to VALUE. RANGE should be t (for all characters), nil (for the default value), @@ -626,7 +626,7 @@ optimize_sub_char_table (Lisp_Object table, Lisp_Object test) return (optimizable ? elt : table); } -DEFUE ("optimize-char-table", Foptimize_char_table, Soptimize_char_table, +DEFUN ("optimize-char-table", Foptimize_char_table, Soptimize_char_table, 1, 2, 0, doc: /* Optimize CHAR-TABLE. TEST is the comparison function used to decide whether two entries are diff --git a/src/cmds.c b/src/cmds.c index baf14778141..5dc4d2bfe30 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -47,7 +47,7 @@ DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0, return make_number (PT + XINT (n)); } -DEFUE ("forward-char", Fforward_char, Sforward_char, 0, 1, "^p", +DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "^p", doc: /* Move point N characters forward (backward if N is negative). On reaching end or beginning of buffer, stop and signal error. @@ -104,7 +104,7 @@ right or to the left on the screen. This is in contrast with return Fforward_char (n); } -DEFUE ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p", +DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p", doc: /* Move N lines forward (backward if N is negative). Precisely, if point is on line I, move to the start of line I + N \("start of line" in the logical order). @@ -174,7 +174,7 @@ instead. For instance, `(forward-line 0)' does the same thing as return Qnil; } -DEFUE ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "^p", +DEFUN ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "^p", doc: /* Move point to end of current line (in the logical order). With argument N not nil or 1, move forward N - 1 lines first. If point reaches the beginning or end of buffer, it stops there. diff --git a/src/coding.c b/src/coding.c index c29713a5c0c..b49070e5e16 100644 --- a/src/coding.c +++ b/src/coding.c @@ -7970,7 +7970,7 @@ preferred_coding_system (void) #ifdef emacs /*** 8. Emacs Lisp library functions ***/ -DEFUE ("coding-system-p", Fcoding_system_p, Scoding_system_p, 1, 1, 0, +DEFUN ("coding-system-p", Fcoding_system_p, Scoding_system_p, 1, 1, 0, doc: /* Return t if OBJECT is nil or a coding-system. See the documentation of `define-coding-system' for information about coding-system objects. */) @@ -7985,7 +7985,7 @@ about coding-system objects. */) return Qt; } -DEFUE ("read-non-nil-coding-system", Fread_non_nil_coding_system, +DEFUN ("read-non-nil-coding-system", Fread_non_nil_coding_system, Sread_non_nil_coding_system, 1, 1, 0, doc: /* Read a coding system from the minibuffer, prompting with string PROMPT. */) (Lisp_Object prompt) @@ -8000,7 +8000,7 @@ DEFUE ("read-non-nil-coding-system", Fread_non_nil_coding_system, return (Fintern (val, Qnil)); } -DEFUE ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 2, 0, +DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 2, 0, doc: /* Read a coding system from the minibuffer, prompting with string PROMPT. If the user enters null input, return second argument DEFAULT-CODING-SYSTEM. Ignores case when completing coding systems (all Emacs coding systems @@ -8020,7 +8020,7 @@ are lower-case). */) return (SCHARS (val) == 0 ? Qnil : Fintern (val, Qnil)); } -DEFUE ("check-coding-system", Fcheck_coding_system, Scheck_coding_system, +DEFUN ("check-coding-system", Fcheck_coding_system, Scheck_coding_system, 1, 1, 0, doc: /* Check validity of CODING-SYSTEM. If valid, return CODING-SYSTEM, else signal a `coding-system-error' error. @@ -8955,7 +8955,7 @@ code_convert_string_norecord (Lisp_Object string, Lisp_Object coding_system, } -DEFUE ("decode-coding-string", Fdecode_coding_string, Sdecode_coding_string, +DEFUN ("decode-coding-string", Fdecode_coding_string, Sdecode_coding_string, 2, 4, 0, doc: /* Decode STRING which is encoded in CODING-SYSTEM, and return the result. @@ -9229,7 +9229,7 @@ DEFUN ("keyboard-coding-system", } -DEFUE ("find-operation-coding-system", Ffind_operation_coding_system, +DEFUN ("find-operation-coding-system", Ffind_operation_coding_system, Sfind_operation_coding_system, 1, MANY, 0, doc: /* Choose a coding system for an operation based on the target name. The value names a pair of coding systems: (DECODING-SYSTEM . ENCODING-SYSTEM). @@ -10072,7 +10072,7 @@ DEFUN ("define-coding-system-alias", Fdefine_coding_system_alias, return Qnil; } -DEFUE ("coding-system-base", Fcoding_system_base, Scoding_system_base, +DEFUN ("coding-system-base", Fcoding_system_base, Scoding_system_base, 1, 1, 0, doc: /* Return the base of CODING-SYSTEM. Any alias or subsidiary coding system is not a base coding system. */) @@ -10115,7 +10115,7 @@ DEFUN ("coding-system-aliases", Fcoding_system_aliases, Scoding_system_aliases, return AREF (spec, 1); } -DEFUE ("coding-system-eol-type", Fcoding_system_eol_type, +DEFUN ("coding-system-eol-type", Fcoding_system_eol_type, Scoding_system_eol_type, 1, 1, 0, doc: /* Return eol-type of CODING-SYSTEM. An eol-type is an integer 0, 1, 2, or a vector of coding systems. diff --git a/src/data.c b/src/data.c index ca246b60dd4..956ff3700f2 100644 --- a/src/data.c +++ b/src/data.c @@ -462,7 +462,7 @@ DEFUN ("floatp", Ffloatp, Sfloatp, 1, 1, 0, /* Extract and set components of lists */ -DEFUE ("car", Fcar, Scar, 1, 1, 0, +DEFUN ("car", Fcar, Scar, 1, 1, 0, doc: /* Return the car of LIST. If arg is nil, return nil. Error if arg is not nil and not a cons cell. See also `car-safe'. @@ -473,14 +473,14 @@ Lisp concepts such as car, cdr, cons cell and list. */) return CAR (list); } -DEFUE ("car-safe", Fcar_safe, Scar_safe, 1, 1, 0, +DEFUN ("car-safe", Fcar_safe, Scar_safe, 1, 1, 0, doc: /* Return the car of OBJECT if it is a cons cell, or else nil. */) (Lisp_Object object) { return CAR_SAFE (object); } -DEFUE ("cdr", Fcdr, Scdr, 1, 1, 0, +DEFUN ("cdr", Fcdr, Scdr, 1, 1, 0, doc: /* Return the cdr of LIST. If arg is nil, return nil. Error if arg is not nil and not a cons cell. See also `cdr-safe'. @@ -491,14 +491,14 @@ Lisp concepts such as cdr, car, cons cell and list. */) return CDR (list); } -DEFUE ("cdr-safe", Fcdr_safe, Scdr_safe, 1, 1, 0, +DEFUN ("cdr-safe", Fcdr_safe, Scdr_safe, 1, 1, 0, doc: /* Return the cdr of OBJECT if it is a cons cell, or else nil. */) (Lisp_Object object) { return CDR_SAFE (object); } -DEFUE ("setcar", Fsetcar, Ssetcar, 2, 2, 0, +DEFUN ("setcar", Fsetcar, Ssetcar, 2, 2, 0, doc: /* Set the car of CELL to be NEWCAR. Returns NEWCAR. */) (register Lisp_Object cell, Lisp_Object newcar) { @@ -508,7 +508,7 @@ DEFUE ("setcar", Fsetcar, Ssetcar, 2, 2, 0, return newcar; } -DEFUE ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0, +DEFUN ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0, doc: /* Set the cdr of CELL to be NEWCDR. Returns NEWCDR. */) (register Lisp_Object cell, Lisp_Object newcdr) { @@ -520,7 +520,7 @@ DEFUE ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0, /* Extract and set components of symbols */ -DEFUE ("boundp", Fboundp, Sboundp, 1, 1, 0, +DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0, doc: /* Return t if SYMBOL's value is not void. */) (register Lisp_Object symbol) { @@ -558,7 +558,7 @@ DEFUE ("boundp", Fboundp, Sboundp, 1, 1, 0, return (EQ (valcontents, Qunbound) ? Qnil : Qt); } -DEFUE ("fboundp", Ffboundp, Sfboundp, 1, 1, 0, +DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0, doc: /* Return t if SYMBOL's function definition is not void. */) (register Lisp_Object symbol) { @@ -590,7 +590,7 @@ Return SYMBOL. */) return symbol; } -DEFUE ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0, +DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0, doc: /* Return SYMBOL's function definition. Error if that is void. */) (register Lisp_Object symbol) { @@ -608,7 +608,7 @@ DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0, return XSYMBOL (symbol)->plist; } -DEFUE ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0, +DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0, doc: /* Return SYMBOL's name, a string. */) (register Lisp_Object symbol) { @@ -619,7 +619,7 @@ DEFUE ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0, return name; } -DEFUE ("fset", Ffset, Sfset, 2, 2, 0, +DEFUN ("fset", Ffset, Sfset, 2, 2, 0, doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. */) (register Lisp_Object symbol, Lisp_Object definition) { @@ -706,7 +706,7 @@ SUBR must be a built-in function. */) return make_string (name, strlen (name)); } -DEFUE ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0, +DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0, doc: /* Return the interactive form of CMD or nil if none. If CMD is not a command, the return value is nil. Value, if non-nil, is a list \(interactive SPEC). */) @@ -1049,7 +1049,7 @@ find_symbol_value (Lisp_Object symbol) } } -DEFUE ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0, +DEFUN ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0, doc: /* Return SYMBOL's value. Error if that is void. */) (Lisp_Object symbol) { @@ -1062,7 +1062,7 @@ DEFUE ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0, xsignal1 (Qvoid_variable, symbol); } -DEFUE ("set", Fset, Sset, 2, 2, 0, +DEFUN ("set", Fset, Sset, 2, 2, 0, doc: /* Set SYMBOL's value to NEWVAL, and return NEWVAL. */) (register Lisp_Object symbol, Lisp_Object newval) { @@ -1308,7 +1308,7 @@ default_value (Lisp_Object symbol) } } -DEFUE ("default-boundp", Fdefault_boundp, Sdefault_boundp, 1, 1, 0, +DEFUN ("default-boundp", Fdefault_boundp, Sdefault_boundp, 1, 1, 0, doc: /* Return t if SYMBOL has a non-void default value. This is the value that is seen in buffers that do not have their own values for this variable. */) @@ -1320,7 +1320,7 @@ for this variable. */) return (EQ (value, Qunbound) ? Qnil : Qt); } -DEFUE ("default-value", Fdefault_value, Sdefault_value, 1, 1, 0, +DEFUN ("default-value", Fdefault_value, Sdefault_value, 1, 1, 0, doc: /* Return SYMBOL's default value. This is the value that is seen in buffers that do not have their own values for this variable. The default value is meaningful for variables with @@ -1336,7 +1336,7 @@ local bindings in certain buffers. */) xsignal1 (Qvoid_variable, symbol); } -DEFUE ("set-default", Fset_default, Sset_default, 2, 2, 0, +DEFUN ("set-default", Fset_default, Sset_default, 2, 2, 0, doc: /* Set SYMBOL's default value to VALUE. SYMBOL and VALUE are evaluated. The default value is seen in buffers that do not have their own values for this variable. */) @@ -1479,7 +1479,7 @@ make_blv (struct Lisp_Symbol *sym, int forwarded, union Lisp_Val_Fwd valcontents return blv; } -DEFUE ("make-variable-buffer-local", Fmake_variable_buffer_local, +DEFUN ("make-variable-buffer-local", Fmake_variable_buffer_local, Smake_variable_buffer_local, 1, 1, "vMake Variable Buffer Local: ", doc: /* Make VARIABLE become buffer-local whenever it is set. At any time, the value for the current buffer is in effect, @@ -1550,7 +1550,7 @@ The function `default-value' gets the default value and `set-default' sets it. return variable; } -DEFUE ("make-local-variable", Fmake_local_variable, Smake_local_variable, +DEFUN ("make-local-variable", Fmake_local_variable, Smake_local_variable, 1, 1, "vMake Local Variable: ", doc: /* Make VARIABLE have a separate value in the current buffer. Other buffers will continue to share a common default value. @@ -1810,7 +1810,7 @@ frame-local bindings). */) return variable; } -DEFUE ("local-variable-p", Flocal_variable_p, Slocal_variable_p, +DEFUN ("local-variable-p", Flocal_variable_p, Slocal_variable_p, 1, 2, 0, doc: /* Non-nil if VARIABLE has a local binding in buffer BUFFER. BUFFER defaults to the current buffer. */) @@ -1955,7 +1955,7 @@ If the current binding is global (the default), the value is nil. */) #if 0 extern struct terminal *get_terminal (Lisp_Object display, int); -DEFUE ("terminal-local-value", Fterminal_local_value, +DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, 2, 0, doc: /* Return the terminal-local value of SYMBOL on TERMINAL. If SYMBOL is not a terminal-local variable, then return its normal @@ -1973,7 +1973,7 @@ selected frame's terminal device). */) return result; } -DEFUE ("set-terminal-local-value", Fset_terminal_local_value, +DEFUN ("set-terminal-local-value", Fset_terminal_local_value, Sset_terminal_local_value, 3, 3, 0, doc: /* Set the terminal-local binding of SYMBOL on TERMINAL to VALUE. If VARIABLE is not a terminal-local variable, then set its normal @@ -2026,7 +2026,7 @@ indirect_function (register Lisp_Object object) return hare; } -DEFUE ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0, +DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0, doc: /* Return the function at the end of OBJECT's function chain. If OBJECT is not a symbol, just return it. Otherwise, follow all function indirections to find the final function binding and return it. @@ -2054,7 +2054,7 @@ function chain of symbols. */) /* Extract and set vector and string elements */ -DEFUE ("aref", Faref, Saref, 2, 2, 0, +DEFUN ("aref", Faref, Saref, 2, 2, 0, doc: /* Return the element of ARRAY at index IDX. ARRAY may be a vector, a string, a char-table, a bool-vector, or a byte-code object. IDX starts at 0. */) @@ -2109,7 +2109,7 @@ or a byte-code object. IDX starts at 0. */) } } -DEFUE ("aset", Faset, Saset, 3, 3, 0, +DEFUN ("aset", Faset, Saset, 3, 3, 0, doc: /* Store into the element of ARRAY at index IDX the value NEWELT. Return NEWELT. ARRAY may be a vector, a string, a char-table or a bool-vector. IDX starts at 0. */) @@ -2272,21 +2272,21 @@ DEFUN ("=", Feqlsign, Seqlsign, 2, 2, 0, return arithcompare (num1, num2, equal); } -DEFUE ("<", Flss, Slss, 2, 2, 0, +DEFUN ("<", Flss, Slss, 2, 2, 0, doc: /* Return t if first arg is less than second arg. Both must be numbers or markers. */) (register Lisp_Object num1, Lisp_Object num2) { return arithcompare (num1, num2, less); } -DEFUE (">", Fgtr, Sgtr, 2, 2, 0, +DEFUN (">", Fgtr, Sgtr, 2, 2, 0, doc: /* Return t if first arg is greater than second arg. Both must be numbers or markers. */) (register Lisp_Object num1, Lisp_Object num2) { return arithcompare (num1, num2, grtr); } -DEFUE ("<=", Fleq, Sleq, 2, 2, 0, +DEFUN ("<=", Fleq, Sleq, 2, 2, 0, doc: /* Return t if first arg is less than or equal to second arg. Both must be numbers or markers. */) (register Lisp_Object num1, Lisp_Object num2) @@ -2294,7 +2294,7 @@ Both must be numbers or markers. */) return arithcompare (num1, num2, less_or_equal); } -DEFUE (">=", Fgeq, Sgeq, 2, 2, 0, +DEFUN (">=", Fgeq, Sgeq, 2, 2, 0, doc: /* Return t if first arg is greater than or equal to second arg. Both must be numbers or markers. */) (register Lisp_Object num1, Lisp_Object num2) @@ -2309,7 +2309,7 @@ DEFUN ("/=", Fneq, Sneq, 2, 2, 0, return arithcompare (num1, num2, notequal); } -DEFUE ("zerop", Fzerop, Szerop, 1, 1, 0, +DEFUN ("zerop", Fzerop, Szerop, 1, 1, 0, doc: /* Return t if NUMBER is zero. */) (register Lisp_Object number) { @@ -2356,7 +2356,7 @@ cons_to_long (Lisp_Object c) return ((XINT (top) << 16) | XINT (bot)); } -DEFUE ("number-to-string", Fnumber_to_string, Snumber_to_string, 1, 1, 0, +DEFUN ("number-to-string", Fnumber_to_string, Snumber_to_string, 1, 1, 0, doc: /* Return the decimal representation of NUMBER as a string. Uses a minus sign if negative. NUMBER may be an integer or a floating point number. */) @@ -2403,7 +2403,7 @@ digit_to_number (int character, int base) return digit; } -DEFUE ("string-to-number", Fstring_to_number, Sstring_to_number, 1, 2, 0, +DEFUN ("string-to-number", Fstring_to_number, Sstring_to_number, 1, 2, 0, doc: /* Parse STRING as a decimal number and return the number. This parses both integers and floating point numbers. It ignores leading spaces and tabs, and all trailing chars. @@ -2626,7 +2626,7 @@ float_arith_driver (double accum, register size_t argnum, enum arithop code, } -DEFUE ("+", Fplus, Splus, 0, MANY, 0, +DEFUN ("+", Fplus, Splus, 0, MANY, 0, doc: /* Return sum of any number of arguments, which are numbers or markers. usage: (+ &rest NUMBERS-OR-MARKERS) */) (size_t nargs, Lisp_Object *args) @@ -2634,7 +2634,7 @@ usage: (+ &rest NUMBERS-OR-MARKERS) */) return arith_driver (Aadd, nargs, args); } -DEFUE ("-", Fminus, Sminus, 0, MANY, 0, +DEFUN ("-", Fminus, Sminus, 0, MANY, 0, doc: /* Negate number or subtract numbers or markers and return the result. With one arg, negates it. With more than one arg, subtracts all but the first from the first. @@ -2644,7 +2644,7 @@ usage: (- &optional NUMBER-OR-MARKER &rest MORE-NUMBERS-OR-MARKERS) */) return arith_driver (Asub, nargs, args); } -DEFUE ("*", Ftimes, Stimes, 0, MANY, 0, +DEFUN ("*", Ftimes, Stimes, 0, MANY, 0, doc: /* Return product of any number of arguments, which are numbers or markers. usage: (* &rest NUMBERS-OR-MARKERS) */) (size_t nargs, Lisp_Object *args) @@ -2652,7 +2652,7 @@ usage: (* &rest NUMBERS-OR-MARKERS) */) return arith_driver (Amult, nargs, args); } -DEFUE ("/", Fquo, Squo, 2, MANY, 0, +DEFUN ("/", Fquo, Squo, 2, MANY, 0, doc: /* Return first argument divided by all the remaining arguments. The arguments must be numbers or markers. usage: (/ DIVIDEND DIVISOR &rest DIVISORS) */) @@ -2665,7 +2665,7 @@ usage: (/ DIVIDEND DIVISOR &rest DIVISORS) */) return arith_driver (Adiv, nargs, args); } -DEFUE ("%", Frem, Srem, 2, 2, 0, +DEFUN ("%", Frem, Srem, 2, 2, 0, doc: /* Return remainder of X divided by Y. Both must be integers or markers. */) (register Lisp_Object x, Lisp_Object y) @@ -2736,7 +2736,7 @@ Both X and Y must be numbers or markers. */) return val; } -DEFUE ("max", Fmax, Smax, 1, MANY, 0, +DEFUN ("max", Fmax, Smax, 1, MANY, 0, doc: /* Return largest of all the arguments (which must be numbers or markers). The value is always a number; markers are converted to numbers. usage: (max NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) @@ -2745,7 +2745,7 @@ usage: (max NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) return arith_driver (Amax, nargs, args); } -DEFUE ("min", Fmin, Smin, 1, MANY, 0, +DEFUN ("min", Fmin, Smin, 1, MANY, 0, doc: /* Return smallest of all the arguments (which must be numbers or markers). The value is always a number; markers are converted to numbers. usage: (min NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) @@ -2825,7 +2825,7 @@ In this case, zeros are shifted in on the left. */) return val; } -DEFUE ("1+", Fadd1, Sadd1, 1, 1, 0, +DEFUN ("1+", Fadd1, Sadd1, 1, 1, 0, doc: /* Return NUMBER plus one. NUMBER may be a number or a marker. Markers are converted to integers. */) (register Lisp_Object number) @@ -2839,7 +2839,7 @@ Markers are converted to integers. */) return number; } -DEFUE ("1-", Fsub1, Ssub1, 1, 1, 0, +DEFUN ("1-", Fsub1, Ssub1, 1, 1, 0, doc: /* Return NUMBER minus one. NUMBER may be a number or a marker. Markers are converted to integers. */) (register Lisp_Object number) @@ -2862,7 +2862,7 @@ DEFUN ("lognot", Flognot, Slognot, 1, 1, 0, return number; } -DEFUE ("byteorder", Fbyteorder, Sbyteorder, 0, 0, 0, +DEFUN ("byteorder", Fbyteorder, Sbyteorder, 0, 0, 0, doc: /* Return the byteorder for the machine. Returns 66 (ASCII uppercase B) for big endian machines or 108 (ASCII lowercase l) for small endian machines. */) diff --git a/src/dispnew.c b/src/dispnew.c index 78bd4bf6590..5b8eaf4fa34 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -339,7 +339,7 @@ add_frame_display_history (struct frame *f, int paused_p) } -DEFUE ("dump-redisplay-history", Fdump_redisplay_history, +DEFUN ("dump-redisplay-history", Fdump_redisplay_history, Sdump_redisplay_history, 0, 0, "", doc: /* Dump redisplay history to stderr. */) (void) @@ -3141,7 +3141,7 @@ window_to_frame_hpos (struct window *w, int hpos) Redrawing Frames **********************************************************************/ -DEFUE ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0, +DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0, doc: /* Clear frame FRAME and output again what is supposed to appear on it. */) (Lisp_Object frame) { @@ -5865,7 +5865,7 @@ when TERMINAL is nil. */) } -DEFUE ("ding", Fding, Sding, 0, 1, 0, +DEFUN ("ding", Fding, Sding, 0, 1, 0, doc: /* Beep, or flash the screen. Also, unless an argument is given, terminate any keyboard macro currently executing. */) @@ -5901,7 +5901,7 @@ bitch_at_user (void) Sleeping, Waiting ***********************************************************************/ -DEFUE ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0, +DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0, doc: /* Pause, without updating display, for SECONDS seconds. SECONDS may be a floating-point value, meaning that you can wait for a fraction of a second. Optional second arg MILLISECONDS specifies an @@ -6007,7 +6007,7 @@ sit_for (Lisp_Object timeout, int reading, int do_display) } -DEFUE ("redisplay", Fredisplay, Sredisplay, 0, 1, 0, +DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 1, 0, doc: /* Perform redisplay if no input is available. If optional arg FORCE is non-nil or `redisplay-dont-pause' is non-nil, perform a full redisplay even if input is available. diff --git a/src/doc.c b/src/doc.c index b6939ad78f6..a793011990f 100644 --- a/src/doc.c +++ b/src/doc.c @@ -681,7 +681,7 @@ the same file name is found in the `doc-directory'. */) return Qnil; } -DEFUE ("substitute-command-keys", Fsubstitute_command_keys, +DEFUN ("substitute-command-keys", Fsubstitute_command_keys, Ssubstitute_command_keys, 1, 1, 0, doc: /* Substitute key descriptions for command names in STRING. Substrings of the form \\=\\[COMMAND] replaced by either: a keystroke diff --git a/src/editfns.c b/src/editfns.c index ce77d10cb2f..30974e0b50e 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -185,7 +185,7 @@ init_editfns (void) #endif } -DEFUE ("char-to-string", Fchar_to_string, Schar_to_string, 1, 1, 0, +DEFUN ("char-to-string", Fchar_to_string, Schar_to_string, 1, 1, 0, doc: /* Convert arg CHAR to a string containing that character. usage: (char-to-string CHAR) */) (Lisp_Object character) @@ -239,7 +239,7 @@ buildmark (EMACS_INT charpos, EMACS_INT bytepos) return mark; } -DEFUE ("point", Fpoint, Spoint, 0, 0, 0, +DEFUN ("point", Fpoint, Spoint, 0, 0, 0, doc: /* Return value of point, as an integer. Beginning of buffer is position (point-min). */) (void) @@ -249,7 +249,7 @@ Beginning of buffer is position (point-min). */) return temp; } -DEFUE ("point-marker", Fpoint_marker, Spoint_marker, 0, 0, 0, +DEFUN ("point-marker", Fpoint_marker, Spoint_marker, 0, 0, 0, doc: /* Return value of point, as a marker object. */) (void) { @@ -267,7 +267,7 @@ clip_to_bounds (EMACS_INT lower, EMACS_INT num, EMACS_INT upper) return num; } -DEFUE ("goto-char", Fgoto_char, Sgoto_char, 1, 1, "NGoto char: ", +DEFUN ("goto-char", Fgoto_char, Sgoto_char, 1, 1, "NGoto char: ", doc: /* Set point to POSITION, a number or marker. Beginning of buffer is position (point-min), end is (point-max). @@ -663,7 +663,7 @@ is before LIMIT, then LIMIT will be returned instead. */) return make_number (beg); } -DEFUE ("field-end", Ffield_end, Sfield_end, 0, 3, 0, +DEFUN ("field-end", Ffield_end, Sfield_end, 0, 3, 0, doc: /* Return the end of the field surrounding POS. A field is a region of text with the same `field' property. If POS is nil, the value of point is used for POS. @@ -678,7 +678,7 @@ is after LIMIT, then LIMIT will be returned instead. */) return make_number (end); } -DEFUE ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0, +DEFUN ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0, doc: /* Return the position closest to NEW-POS that is in the same field as OLD-POS. A field is a region of text with the same `field' property. @@ -787,7 +787,7 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */) } -DEFUE ("line-beginning-position", +DEFUN ("line-beginning-position", Fline_beginning_position, Sline_beginning_position, 0, 1, 0, doc: /* Return the character position of the first character on the current line. With argument N not nil or 1, move forward N - 1 lines first. @@ -829,7 +829,7 @@ This function does not move point. */) Qt, Qnil); } -DEFUE ("line-end-position", Fline_end_position, Sline_end_position, 0, 1, 0, +DEFUN ("line-end-position", Fline_end_position, Sline_end_position, 0, 1, 0, doc: /* Return the character position of the last character on the current line. With argument N not nil or 1, move forward N - 1 lines first. If scan reaches end of buffer, return that position. @@ -1048,7 +1048,7 @@ is in effect, in which case it is less. */) return temp; } -DEFUE ("point-max-marker", Fpoint_max_marker, Spoint_max_marker, 0, 0, 0, +DEFUN ("point-max-marker", Fpoint_max_marker, Spoint_max_marker, 0, 0, 0, doc: /* Return a marker to the maximum permissible value of point in this buffer. This is (1+ (buffer-size)), unless narrowing (a buffer restriction) is in effect, in which case it is less. */) @@ -1099,7 +1099,7 @@ If BYTEPOS is out of range, the value is nil. */) return make_number (BYTE_TO_CHAR (XINT (bytepos))); } -DEFUE ("following-char", Ffollowing_char, Sfollowing_char, 0, 0, 0, +DEFUN ("following-char", Ffollowing_char, Sfollowing_char, 0, 0, 0, doc: /* Return the character following point, as a number. At the end of the buffer or accessible region, return 0. */) (void) @@ -1112,7 +1112,7 @@ At the end of the buffer or accessible region, return 0. */) return temp; } -DEFUE ("preceding-char", Fprevious_char, Sprevious_char, 0, 0, 0, +DEFUN ("preceding-char", Fprevious_char, Sprevious_char, 0, 0, 0, doc: /* Return the character preceding point, as a number. At the beginning of the buffer or accessible region, return 0. */) (void) @@ -1131,7 +1131,7 @@ At the beginning of the buffer or accessible region, return 0. */) return temp; } -DEFUE ("bobp", Fbobp, Sbobp, 0, 0, 0, +DEFUN ("bobp", Fbobp, Sbobp, 0, 0, 0, doc: /* Return t if point is at the beginning of the buffer. If the buffer is narrowed, this means the beginning of the narrowed part. */) (void) @@ -1141,7 +1141,7 @@ If the buffer is narrowed, this means the beginning of the narrowed part. */) return Qnil; } -DEFUE ("eobp", Feobp, Seobp, 0, 0, 0, +DEFUN ("eobp", Feobp, Seobp, 0, 0, 0, doc: /* Return t if point is at the end of the buffer. If the buffer is narrowed, this means the end of the narrowed part. */) (void) @@ -1151,7 +1151,7 @@ If the buffer is narrowed, this means the end of the narrowed part. */) return Qnil; } -DEFUE ("bolp", Fbolp, Sbolp, 0, 0, 0, +DEFUN ("bolp", Fbolp, Sbolp, 0, 0, 0, doc: /* Return t if point is at the beginning of a line. */) (void) { @@ -1160,7 +1160,7 @@ DEFUE ("bolp", Fbolp, Sbolp, 0, 0, 0, return Qnil; } -DEFUE ("eolp", Feolp, Seolp, 0, 0, 0, +DEFUN ("eolp", Feolp, Seolp, 0, 0, 0, doc: /* Return t if point is at the end of a line. `End of a line' includes point being at the end of the buffer. */) (void) @@ -1170,7 +1170,7 @@ DEFUE ("eolp", Feolp, Seolp, 0, 0, 0, return Qnil; } -DEFUE ("char-after", Fchar_after, Schar_after, 0, 1, 0, +DEFUN ("char-after", Fchar_after, Schar_after, 0, 1, 0, doc: /* Return character in current buffer at position POS. POS is an integer or a marker and defaults to point. If POS is out of range, the value is nil. */) @@ -1247,7 +1247,7 @@ If POS is out of range, the value is nil. */) return val; } -DEFUE ("user-login-name", Fuser_login_name, Suser_login_name, 0, 1, 0, +DEFUN ("user-login-name", Fuser_login_name, Suser_login_name, 0, 1, 0, doc: /* Return the name under which the user logged in, as a string. This is based on the effective uid, not the real uid. Also, if the environment variables LOGNAME or USER are set, @@ -1387,7 +1387,7 @@ name, or nil if there is no such user. */) return full; } -DEFUE ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0, +DEFUN ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0, doc: /* Return the host name of the machine you are running on, as a string. */) (void) { @@ -1453,7 +1453,7 @@ lo_time (time_t t) return t & ((1 << 16) - 1); } -DEFUE ("current-time", Fcurrent_time, Scurrent_time, 0, 0, 0, +DEFUN ("current-time", Fcurrent_time, Scurrent_time, 0, 0, 0, doc: /* Return the current time, as the number of seconds since 1970-01-01 00:00:00. The time is returned as a list of three integers. The first has the most significant 16 bits of the seconds, while the second has the @@ -1472,7 +1472,7 @@ resolution finer than a second. */) make_number (EMACS_USECS (t))); } -DEFUE ("get-internal-run-time", Fget_internal_run_time, Sget_internal_run_time, +DEFUN ("get-internal-run-time", Fget_internal_run_time, Sget_internal_run_time, 0, 0, 0, doc: /* Return the current run time used by Emacs. The time is returned as a list of three integers. The first has the @@ -2246,7 +2246,7 @@ insert1 (Lisp_Object arg) not be used after calling insert or insert_from_string, so we don't care if it gets trashed. */ -DEFUE ("insert", Finsert, Sinsert, 0, MANY, 0, +DEFUN ("insert", Finsert, Sinsert, 0, MANY, 0, doc: /* Insert the arguments, either strings or characters, at point. Point and before-insertion markers move forward to end up after the inserted text. @@ -2326,7 +2326,7 @@ usage: (insert-before-markers-and-inherit &rest ARGS) */) return Qnil; } -DEFUE ("insert-char", Finsert_char, Sinsert_char, 2, 3, 0, +DEFUN ("insert-char", Finsert_char, Sinsert_char, 2, 3, 0, doc: /* Insert COUNT copies of CHARACTER. Point, and before-insertion markers, are relocated as in the function `insert'. The optional third arg INHERIT, if non-nil, says to inherit text properties @@ -2500,7 +2500,7 @@ update_buffer_properties (EMACS_INT start, EMACS_INT end) } } -DEFUE ("buffer-substring", Fbuffer_substring, Sbuffer_substring, 2, 2, 0, +DEFUN ("buffer-substring", Fbuffer_substring, Sbuffer_substring, 2, 2, 0, doc: /* Return the contents of part of the current buffer as a string. The two arguments START and END are character positions; they can be in either order. @@ -2536,7 +2536,7 @@ they can be in either order. */) return make_buffer_string (b, e, 0); } -DEFUE ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0, +DEFUN ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0, doc: /* Return the contents of the current buffer as a string. If narrowing is in effect, this function returns only the visible part of the buffer. */) @@ -3174,7 +3174,7 @@ It returns the number of characters changed. */) return make_number (cnt); } -DEFUE ("delete-region", Fdelete_region, Sdelete_region, 2, 2, "r", +DEFUN ("delete-region", Fdelete_region, Sdelete_region, 2, 2, "r", doc: /* Delete the text between point and mark. When called from a program, expects two arguments, @@ -3197,7 +3197,7 @@ DEFUN ("delete-and-extract-region", Fdelete_and_extract_region, return del_range_1 (XINT (start), XINT (end), 1, 1); } -DEFUE ("widen", Fwiden, Swiden, 0, 0, "", +DEFUN ("widen", Fwiden, Swiden, 0, 0, "", doc: /* Remove restrictions (narrowing) from current buffer. This allows the buffer's full text to be seen and edited. */) (void) @@ -3212,7 +3212,7 @@ This allows the buffer's full text to be seen and edited. */) return Qnil; } -DEFUE ("narrow-to-region", Fnarrow_to_region, Snarrow_to_region, 2, 2, "r", +DEFUN ("narrow-to-region", Fnarrow_to_region, Snarrow_to_region, 2, 2, "r", doc: /* Restrict editing in this buffer to the current region. The rest of the text becomes temporarily invisible and untouchable but is not deleted; if you save the buffer in a file, the invisible @@ -3373,7 +3373,7 @@ static char *message_text; /* Allocated length of that buffer. */ static int message_length; -DEFUE ("message", Fmessage, Smessage, 1, MANY, 0, +DEFUN ("message", Fmessage, Smessage, 1, MANY, 0, doc: /* Display a message at the bottom of the screen. The message also goes into the `*Messages*' buffer. \(In keyboard macros, that's all it does.) @@ -3485,7 +3485,7 @@ usage: (message-or-box FORMAT-STRING &rest ARGS) */) return Fmessage (nargs, args); } -DEFUE ("current-message", Fcurrent_message, Scurrent_message, 0, 0, 0, +DEFUN ("current-message", Fcurrent_message, Scurrent_message, 0, 0, 0, doc: /* Return the string currently displayed in the echo area, or nil if none. */) (void) { @@ -3534,7 +3534,7 @@ usage: (propertize STRING &rest PROPERTIES) */) ? count_size_as_multibyte (SDATA (STRING), SBYTES (STRING)) \ : SBYTES (STRING)) -DEFUE ("format", Fformat, Sformat, 1, MANY, 0, +DEFUN ("format", Fformat, Sformat, 1, MANY, 0, doc: /* Format a string out of a format-string and arguments. The first argument is a format control string. The other arguments are substituted into it to make the result, a string. diff --git a/src/emacs.c b/src/emacs.c index a3277109f01..cccd07417e1 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1962,7 +1962,7 @@ sort_args (int argc, char **argv) xfree (priority); } -DEFUE ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P", +DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P", doc: /* Exit the Emacs job and kill it. If ARG is an integer, return ARG as the exit program code. If ARG is a string, stuff it as keyboard input. diff --git a/src/eval.c b/src/eval.c index ef5eb6bdaaf..4d0786fc0d4 100644 --- a/src/eval.c +++ b/src/eval.c @@ -356,7 +356,7 @@ usage: (cond CLAUSES...) */) return val; } -DEFUE ("progn", Fprogn, Sprogn, 0, UNEVALLED, 0, +DEFUN ("progn", Fprogn, Sprogn, 0, UNEVALLED, 0, doc: /* Eval BODY forms sequentially and return value of last one. usage: (progn BODY...) */) (Lisp_Object args) @@ -521,7 +521,7 @@ usage: (function ARG) */) } -DEFUE ("interactive-p", Finteractive_p, Sinteractive_p, 0, 0, 0, +DEFUN ("interactive-p", Finteractive_p, Sinteractive_p, 0, 0, 0, doc: /* Return t if the containing function was run directly by user input. This means that the function was called with `call-interactively' \(which includes being called as the binding of a key) @@ -1327,7 +1327,7 @@ unwind_to_catch (struct catchtag *catch, Lisp_Object value) _longjmp (catch->jmp, 1); } -DEFUE ("throw", Fthrow, Sthrow, 2, 2, 0, +DEFUN ("throw", Fthrow, Sthrow, 2, 2, 0, doc: /* Throw to the catch for TAG and return VALUE from it. Both TAG and VALUE are evalled. */) (register Lisp_Object tag, Lisp_Object value) @@ -1657,7 +1657,7 @@ static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object, static int maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig, Lisp_Object data); -DEFUE ("signal", Fsignal, Ssignal, 2, 2, 0, +DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0, doc: /* Signal an error. Args are ERROR-SYMBOL and associated DATA. This function does not return. @@ -2041,7 +2041,7 @@ error (const char *m, ...) va_end (ap); } -DEFUE ("commandp", Fcommandp, Scommandp, 1, 2, 0, +DEFUN ("commandp", Fcommandp, Scommandp, 1, 2, 0, doc: /* Non-nil if FUNCTION makes provisions for interactive calling. This means it contains a description for how to read arguments to give it. The value is nil for an invalid function or a symbol with no function @@ -2222,7 +2222,7 @@ do_autoload (Lisp_Object fundef, Lisp_Object funname) } -DEFUE ("eval", Feval, Seval, 1, 2, 0, +DEFUN ("eval", Feval, Seval, 1, 2, 0, doc: /* Evaluate FORM and return its value. If LEXICAL is t, evaluate using lexical scoping. */) (Lisp_Object form, Lisp_Object lexical) @@ -2458,7 +2458,7 @@ eval_sub (Lisp_Object form) return val; } -DEFUE ("apply", Fapply, Sapply, 2, MANY, 0, +DEFUN ("apply", Fapply, Sapply, 2, MANY, 0, doc: /* Call FUNCTION with our remaining args, using our last arg as list of args. Then return the value FUNCTION returns. Thus, (apply '+ 1 2 '(3 4)) returns 10. @@ -2553,7 +2553,7 @@ funcall_nil (size_t nargs, Lisp_Object *args) return Qnil; } -DEFUE ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0, +DEFUN ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0, doc: /* Run each hook in HOOKS. Each argument should be a symbol, a hook variable. These symbols are processed in the order specified. @@ -2582,7 +2582,7 @@ usage: (run-hooks &rest HOOKS) */) return Qnil; } -DEFUE ("run-hook-with-args", Frun_hook_with_args, +DEFUN ("run-hook-with-args", Frun_hook_with_args, Srun_hook_with_args, 1, MANY, 0, doc: /* Run HOOK with the specified arguments ARGS. HOOK should be a symbol, a hook variable. If HOOK has a non-nil @@ -2628,7 +2628,7 @@ funcall_not (size_t nargs, Lisp_Object *args) return NILP (Ffuncall (nargs, args)) ? Qt : Qnil; } -DEFUE ("run-hook-with-args-until-failure", Frun_hook_with_args_until_failure, +DEFUN ("run-hook-with-args-until-failure", Frun_hook_with_args_until_failure, Srun_hook_with_args_until_failure, 1, MANY, 0, doc: /* Run HOOK with the specified arguments ARGS. HOOK should be a symbol, a hook variable. If HOOK has a non-nil @@ -2915,7 +2915,7 @@ call7 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, /* The caller should GCPRO all the elements of ARGS. */ -DEFUE ("functionp", Ffunctionp, Sfunctionp, 1, 1, 0, +DEFUN ("functionp", Ffunctionp, Sfunctionp, 1, 1, 0, doc: /* Non-nil if OBJECT is a function. */) (Lisp_Object object) { @@ -2948,7 +2948,7 @@ DEFUE ("functionp", Ffunctionp, Sfunctionp, 1, 1, 0, return Qnil; } -DEFUE ("funcall", Ffuncall, Sfuncall, 1, MANY, 0, +DEFUN ("funcall", Ffuncall, Sfuncall, 1, MANY, 0, doc: /* Call first argument as a function, passing remaining arguments to it. Return the value that function returns. Thus, (funcall 'cons 'x 'y) returns (x . y). diff --git a/src/fileio.c b/src/fileio.c index 4c92510178a..d1e285959e2 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -241,7 +241,7 @@ Lisp_Object Qwrite_region; static Lisp_Object Qverify_visited_file_modtime; static Lisp_Object Qset_visited_file_modtime; -DEFUE ("find-file-name-handler", Ffind_file_name_handler, +DEFUN ("find-file-name-handler", Ffind_file_name_handler, Sfind_file_name_handler, 2, 2, 0, doc: /* Return FILENAME's handler function for OPERATION, if it has one. Otherwise, return nil. @@ -302,7 +302,7 @@ use the standard functions without calling themselves recursively. */) return result; } -DEFUE ("file-name-directory", Ffile_name_directory, Sfile_name_directory, +DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, 1, 1, 0, doc: /* Return the directory component in file name FILENAME. Return nil if FILENAME does not include a directory. @@ -376,7 +376,7 @@ Given a Unix syntax file name, returns a string ending in slash. */) return make_specified_string (beg, -1, p - beg, STRING_MULTIBYTE (filename)); } -DEFUE ("file-name-nondirectory", Ffile_name_nondirectory, +DEFUN ("file-name-nondirectory", Ffile_name_nondirectory, Sfile_name_nondirectory, 1, 1, 0, doc: /* Return file name FILENAME sans its directory. For example, in a Unix-syntax file name, @@ -411,7 +411,7 @@ or the entire name if it contains no slash. */) return make_specified_string (p, -1, end - p, STRING_MULTIBYTE (filename)); } -DEFUE ("unhandled-file-name-directory", Funhandled_file_name_directory, +DEFUN ("unhandled-file-name-directory", Funhandled_file_name_directory, Sunhandled_file_name_directory, 1, 1, 0, doc: /* Return a directly usable directory name somehow associated with FILENAME. A `directly usable' directory name is one that may be used without the @@ -463,7 +463,7 @@ file_name_as_directory (char *out, const char *in) return out; } -DEFUE ("file-name-as-directory", Ffile_name_as_directory, +DEFUN ("file-name-as-directory", Ffile_name_as_directory, Sfile_name_as_directory, 1, 1, 0, doc: /* Return a string representing the file name FILE interpreted as a directory. This operation exists because a directory is also a file, but its name as @@ -522,7 +522,7 @@ directory_file_name (char *src, char *dst) return 1; } -DEFUE ("directory-file-name", Fdirectory_file_name, Sdirectory_file_name, +DEFUN ("directory-file-name", Fdirectory_file_name, Sdirectory_file_name, 1, 1, 0, doc: /* Returns the file name of the directory named DIRECTORY. This is the name of the file that holds the data for the directory DIRECTORY. @@ -704,7 +704,7 @@ probably use `make-temp-file' instead, except in three circumstances: -DEFUE ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, +DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, doc: /* Convert filename NAME to absolute, and canonicalize it. Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative \(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing, @@ -1503,7 +1503,7 @@ search_embedded_absfilename (char *nm, char *endp) return NULL; } -DEFUE ("substitute-in-file-name", Fsubstitute_in_file_name, +DEFUN ("substitute-in-file-name", Fsubstitute_in_file_name, Ssubstitute_in_file_name, 1, 1, 0, doc: /* Substitute environment variables referred to in FILENAME. `$FOO' where FOO is an environment variable name means to substitute @@ -2346,7 +2346,7 @@ This happens for interactive use with M-x. */) } -DEFUE ("file-name-absolute-p", Ffile_name_absolute_p, Sfile_name_absolute_p, +DEFUN ("file-name-absolute-p", Ffile_name_absolute_p, Sfile_name_absolute_p, 1, 1, 0, doc: /* Return t if file FILENAME specifies an absolute file name. On Unix, this is a name starting with a `/' or a `~'. */) @@ -2402,7 +2402,7 @@ check_writable (const char *filename) #endif /* not MSDOS */ } -DEFUE ("file-exists-p", Ffile_exists_p, Sfile_exists_p, 1, 1, 0, +DEFUN ("file-exists-p", Ffile_exists_p, Sfile_exists_p, 1, 1, 0, doc: /* Return t if file FILENAME exists (whether or not you can read it.) See also `file-readable-p' and `file-attributes'. This returns nil for a symlink to a nonexistent file. @@ -2449,7 +2449,7 @@ For a directory, this means you can access files in that directory. */) return (check_executable (SSDATA (absname)) ? Qt : Qnil); } -DEFUE ("file-readable-p", Ffile_readable_p, Sfile_readable_p, 1, 1, 0, +DEFUN ("file-readable-p", Ffile_readable_p, Sfile_readable_p, 1, 1, 0, doc: /* Return t if file FILENAME exists and you can read it. See also `file-exists-p' and `file-attributes'. */) (Lisp_Object filename) @@ -2571,7 +2571,7 @@ If there is no error, returns nil. */) return Qnil; } -DEFUE ("file-symlink-p", Ffile_symlink_p, Sfile_symlink_p, 1, 1, 0, +DEFUN ("file-symlink-p", Ffile_symlink_p, Sfile_symlink_p, 1, 1, 0, doc: /* Return non-nil if file FILENAME is the name of a symbolic link. The value is the link target, as a string. Otherwise it returns nil. @@ -2609,7 +2609,7 @@ points to a nonexistent file. */) return val; } -DEFUE ("file-directory-p", Ffile_directory_p, Sfile_directory_p, 1, 1, 0, +DEFUN ("file-directory-p", Ffile_directory_p, Sfile_directory_p, 1, 1, 0, doc: /* Return t if FILENAME names an existing directory. Symbolic links to directories count as directories. See `file-symlink-p' to distinguish symlinks. */) @@ -2634,7 +2634,7 @@ See `file-symlink-p' to distinguish symlinks. */) return S_ISDIR (st.st_mode) ? Qt : Qnil; } -DEFUE ("file-accessible-directory-p", Ffile_accessible_directory_p, +DEFUN ("file-accessible-directory-p", Ffile_accessible_directory_p, Sfile_accessible_directory_p, 1, 1, 0, doc: /* Return t if file FILENAME names a directory you can open. For the value to be t, FILENAME must specify the name of a directory as a file, @@ -4354,7 +4354,7 @@ choose_write_coding_system (Lisp_Object start, Lisp_Object end, Lisp_Object file return val; } -DEFUE ("write-region", Fwrite_region, Swrite_region, 3, 7, +DEFUN ("write-region", Fwrite_region, Swrite_region, 3, 7, "r\nFWrite region to file: \ni\ni\ni\np", doc: /* Write current region into specified file. When called from a program, requires three arguments: @@ -4915,7 +4915,7 @@ e_write (int desc, Lisp_Object string, int start, int end, struct coding_system return 0; } -DEFUE ("verify-visited-file-modtime", Fverify_visited_file_modtime, +DEFUN ("verify-visited-file-modtime", Fverify_visited_file_modtime, Sverify_visited_file_modtime, 0, 1, 0, doc: /* Return t if last mod time of BUF's visited file matches what BUF records. This means that the file has not been changed since it was visited or saved. @@ -5136,7 +5136,7 @@ do_auto_save_eh (Lisp_Object ignore) return Qnil; } -DEFUE ("do-auto-save", Fdo_auto_save, Sdo_auto_save, 0, 2, "", +DEFUN ("do-auto-save", Fdo_auto_save, Sdo_auto_save, 0, 2, "", doc: /* Auto-save all buffers that need it. This is all buffers that have auto-saving enabled and are changed since last auto-saved. diff --git a/src/filelock.c b/src/filelock.c index c6b1617770c..13b27c72f19 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -639,7 +639,7 @@ or else nothing is done if current buffer isn't visiting a file. */) return Qnil; } -DEFUE ("unlock-buffer", Funlock_buffer, Sunlock_buffer, +DEFUN ("unlock-buffer", Funlock_buffer, Sunlock_buffer, 0, 0, 0, doc: /* Unlock the file visited in the current buffer. If the buffer is not modified, this does nothing because the file diff --git a/src/floatfns.c b/src/floatfns.c index 345b3b94947..1232fc0afa1 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -683,7 +683,7 @@ DEFUN ("abs", Fabs, Sabs, 1, 1, 0, return arg; } -DEFUE ("float", Ffloat, Sfloat, 1, 1, 0, +DEFUN ("float", Ffloat, Sfloat, 1, 1, 0, doc: /* Return the floating point number equal to ARG. */) (register Lisp_Object arg) { @@ -886,7 +886,7 @@ systems, but 2 on others. */) return rounding_driver (arg, divisor, emacs_rint, round2, "round"); } -DEFUE ("truncate", Ftruncate, Struncate, 1, 2, 0, +DEFUN ("truncate", Ftruncate, Struncate, 1, 2, 0, doc: /* Truncate a floating point number to an int. Rounds ARG toward zero. With optional DIVISOR, truncate ARG/DIVISOR. */) diff --git a/src/fns.c b/src/fns.c index 2fee34eaf22..d3009775b81 100644 --- a/src/fns.c +++ b/src/fns.c @@ -62,7 +62,7 @@ static int internal_equal (Lisp_Object , Lisp_Object, int, int); extern long time (); #endif -DEFUE ("identity", Fidentity, Sidentity, 1, 1, 0, +DEFUN ("identity", Fidentity, Sidentity, 1, 1, 0, doc: /* Return the argument unchanged. */) (Lisp_Object arg) { @@ -106,7 +106,7 @@ Other values of LIMIT are ignored. */) /* Random data-structure functions */ -DEFUE ("length", Flength, Slength, 1, 1, 0, +DEFUN ("length", Flength, Slength, 1, 1, 0, doc: /* Return the length of vector, list or string SEQUENCE. A byte-code function object is also allowed. If the string contains multibyte characters, this is not necessarily @@ -191,7 +191,7 @@ If STRING is multibyte, this may be greater than the length of STRING. */) return make_number (SBYTES (string)); } -DEFUE ("string-equal", Fstring_equal, Sstring_equal, 2, 2, 0, +DEFUN ("string-equal", Fstring_equal, Sstring_equal, 2, 2, 0, doc: /* Return t if two strings have identical contents. Case is significant, but text properties are ignored. Symbols are also allowed; their print names are used instead. */) @@ -211,7 +211,7 @@ Symbols are also allowed; their print names are used instead. */) return Qt; } -DEFUE ("compare-strings", Fcompare_strings, Scompare_strings, 6, 7, 0, +DEFUN ("compare-strings", Fcompare_strings, Scompare_strings, 6, 7, 0, doc: /* Compare the contents of two strings, converting to multibyte if needed. In string STR1, skip the first START1 characters and stop at END1. In string STR2, skip the first START2 characters and stop at END2. @@ -312,7 +312,7 @@ If string STR1 is greater, the value is a positive number N; return Qt; } -DEFUE ("string-lessp", Fstring_lessp, Sstring_lessp, 2, 2, 0, +DEFUN ("string-lessp", Fstring_lessp, Sstring_lessp, 2, 2, 0, doc: /* Return t if first arg string is less than second in lexicographic order. Case is significant. Symbols are also allowed; their print names are used instead. */) @@ -373,7 +373,7 @@ concat3 (Lisp_Object s1, Lisp_Object s2, Lisp_Object s3) return concat (3, args, Lisp_String, 0); } -DEFUE ("append", Fappend, Sappend, 0, MANY, 0, +DEFUN ("append", Fappend, Sappend, 0, MANY, 0, doc: /* Concatenate all the arguments and make the result a list. The result is a list whose elements are the elements of all the arguments. Each argument may be a list, vector or string. @@ -384,7 +384,7 @@ usage: (append &rest SEQUENCES) */) return concat (nargs, args, Lisp_Cons, 1); } -DEFUE ("concat", Fconcat, Sconcat, 0, MANY, 0, +DEFUN ("concat", Fconcat, Sconcat, 0, MANY, 0, doc: /* Concatenate all the arguments and make the result a string. The result is a string whose elements are the elements of all the arguments. Each argument may be a string or a list or vector of characters (integers). @@ -394,7 +394,7 @@ usage: (concat &rest SEQUENCES) */) return concat (nargs, args, Lisp_String, 0); } -DEFUE ("vconcat", Fvconcat, Svconcat, 0, MANY, 0, +DEFUN ("vconcat", Fvconcat, Svconcat, 0, MANY, 0, doc: /* Concatenate all the arguments and make the result a vector. The result is a vector whose elements are the elements of all the arguments. Each argument may be a list, vector or string. @@ -405,7 +405,7 @@ usage: (vconcat &rest SEQUENCES) */) } -DEFUE ("copy-sequence", Fcopy_sequence, Scopy_sequence, 1, 1, 0, +DEFUN ("copy-sequence", Fcopy_sequence, Scopy_sequence, 1, 1, 0, doc: /* Return a copy of a list, vector, string or char-table. The elements of a list or vector are not copied; they are shared with the original. */) @@ -945,7 +945,7 @@ string_make_unibyte (Lisp_Object string) return ret; } -DEFUE ("string-make-multibyte", Fstring_make_multibyte, Sstring_make_multibyte, +DEFUN ("string-make-multibyte", Fstring_make_multibyte, Sstring_make_multibyte, 1, 1, 0, doc: /* Return the multibyte equivalent of STRING. If STRING is unibyte and contains non-ASCII characters, the function @@ -963,7 +963,7 @@ string the same way whether it is unibyte or multibyte.) */) return string_make_multibyte (string); } -DEFUE ("string-make-unibyte", Fstring_make_unibyte, Sstring_make_unibyte, +DEFUN ("string-make-unibyte", Fstring_make_unibyte, Sstring_make_unibyte, 1, 1, 0, doc: /* Return the unibyte equivalent of STRING. Multibyte character codes are converted to unibyte according to @@ -977,7 +977,7 @@ the low 8 bits of each character. */) return string_make_unibyte (string); } -DEFUE ("string-as-unibyte", Fstring_as_unibyte, Sstring_as_unibyte, +DEFUN ("string-as-unibyte", Fstring_as_unibyte, Sstring_as_unibyte, 1, 1, 0, doc: /* Return a unibyte string with the same individual bytes as STRING. If STRING is unibyte, the result is STRING itself. @@ -1001,7 +1001,7 @@ If STRING is multibyte and contains a character of charset return string; } -DEFUE ("string-as-multibyte", Fstring_as_multibyte, Sstring_as_multibyte, +DEFUN ("string-as-multibyte", Fstring_as_multibyte, Sstring_as_multibyte, 1, 1, 0, doc: /* Return a multibyte string with the same individual bytes as STRING. If STRING is multibyte, the result is STRING itself. @@ -1039,7 +1039,7 @@ If you're not sure, whether to use `string-as-multibyte' or return string; } -DEFUE ("string-to-multibyte", Fstring_to_multibyte, Sstring_to_multibyte, +DEFUN ("string-to-multibyte", Fstring_to_multibyte, Sstring_to_multibyte, 1, 1, 0, doc: /* Return a multibyte string with the same individual chars as STRING. If STRING is multibyte, the result is STRING itself. @@ -1085,7 +1085,7 @@ an error is signaled. */) } -DEFUE ("copy-alist", Fcopy_alist, Scopy_alist, 1, 1, 0, +DEFUN ("copy-alist", Fcopy_alist, Scopy_alist, 1, 1, 0, doc: /* Return a copy of ALIST. This is an alist which represents the same mapping from objects to objects, but does not share the alist structure with ALIST. @@ -1111,7 +1111,7 @@ Elements of ALIST that are not conses are also shared. */) return alist; } -DEFUE ("substring", Fsubstring, Ssubstring, 2, 3, 0, +DEFUN ("substring", Fsubstring, Ssubstring, 2, 3, 0, doc: /* Return a new string whose contents are a substring of STRING. The returned string consists of the characters between index FROM \(inclusive) and index TO (exclusive) of STRING. FROM and TO are @@ -1270,7 +1270,7 @@ substring_both (Lisp_Object string, EMACS_INT from, EMACS_INT from_byte, return res; } -DEFUE ("nthcdr", Fnthcdr, Snthcdr, 2, 2, 0, +DEFUN ("nthcdr", Fnthcdr, Snthcdr, 2, 2, 0, doc: /* Take cdr N times on LIST, return the result. */) (Lisp_Object n, Lisp_Object list) { @@ -1286,7 +1286,7 @@ DEFUE ("nthcdr", Fnthcdr, Snthcdr, 2, 2, 0, return list; } -DEFUE ("nth", Fnth, Snth, 2, 2, 0, +DEFUN ("nth", Fnth, Snth, 2, 2, 0, doc: /* Return the Nth element of LIST. N counts from zero. If LIST is not that long, nil is returned. */) (Lisp_Object n, Lisp_Object list) @@ -1294,7 +1294,7 @@ N counts from zero. If LIST is not that long, nil is returned. */) return Fcar (Fnthcdr (n, list)); } -DEFUE ("elt", Felt, Selt, 2, 2, 0, +DEFUN ("elt", Felt, Selt, 2, 2, 0, doc: /* Return element of SEQUENCE at index N. */) (register Lisp_Object sequence, Lisp_Object n) { @@ -1307,7 +1307,7 @@ DEFUE ("elt", Felt, Selt, 2, 2, 0, return Faref (sequence, n); } -DEFUE ("member", Fmember, Smember, 2, 2, 0, +DEFUN ("member", Fmember, Smember, 2, 2, 0, doc: /* Return non-nil if ELT is an element of LIST. Comparison done with `equal'. The value is actually the tail of LIST whose car is ELT. */) (register Lisp_Object elt, Lisp_Object list) @@ -1325,7 +1325,7 @@ The value is actually the tail of LIST whose car is ELT. */) return Qnil; } -DEFUE ("memq", Fmemq, Smemq, 2, 2, 0, +DEFUN ("memq", Fmemq, Smemq, 2, 2, 0, doc: /* Return non-nil if ELT is an element of LIST. Comparison done with `eq'. The value is actually the tail of LIST whose car is ELT. */) (register Lisp_Object elt, Lisp_Object list) @@ -1373,7 +1373,7 @@ The value is actually the tail of LIST whose car is ELT. */) return Qnil; } -DEFUE ("assq", Fassq, Sassq, 2, 2, 0, +DEFUN ("assq", Fassq, Sassq, 2, 2, 0, doc: /* Return non-nil if KEY is `eq' to the car of an element of LIST. The value is actually the first element of LIST whose car is KEY. Elements of LIST that are not conses are ignored. */) @@ -1419,7 +1419,7 @@ assq_no_quit (Lisp_Object key, Lisp_Object list) return CAR_SAFE (list); } -DEFUE ("assoc", Fassoc, Sassoc, 2, 2, 0, +DEFUN ("assoc", Fassoc, Sassoc, 2, 2, 0, doc: /* Return non-nil if KEY is `equal' to the car of an element of LIST. The value is actually the first element of LIST whose car equals KEY. */) (Lisp_Object key, Lisp_Object list) @@ -1470,7 +1470,7 @@ assoc_no_quit (Lisp_Object key, Lisp_Object list) return CONSP (list) ? XCAR (list) : Qnil; } -DEFUE ("rassq", Frassq, Srassq, 2, 2, 0, +DEFUN ("rassq", Frassq, Srassq, 2, 2, 0, doc: /* Return non-nil if KEY is `eq' to the cdr of an element of LIST. The value is actually the first element of LIST whose cdr is KEY. */) (register Lisp_Object key, Lisp_Object list) @@ -1501,7 +1501,7 @@ The value is actually the first element of LIST whose cdr is KEY. */) return CAR (list); } -DEFUE ("rassoc", Frassoc, Srassoc, 2, 2, 0, +DEFUN ("rassoc", Frassoc, Srassoc, 2, 2, 0, doc: /* Return non-nil if KEY is `equal' to the cdr of an element of LIST. The value is actually the first element of LIST whose cdr equals KEY. */) (Lisp_Object key, Lisp_Object list) @@ -1537,7 +1537,7 @@ The value is actually the first element of LIST whose cdr equals KEY. */) return CAR (list); } -DEFUE ("delq", Fdelq, Sdelq, 2, 2, 0, +DEFUN ("delq", Fdelq, Sdelq, 2, 2, 0, doc: /* Delete by side effect any occurrences of ELT as a member of LIST. The modified LIST is returned. Comparison is done with `eq'. If the first member of LIST is ELT, there is no way to remove it by side effect; @@ -1569,7 +1569,7 @@ to be sure of changing the value of `foo'. */) return list; } -DEFUE ("delete", Fdelete, Sdelete, 2, 2, 0, +DEFUN ("delete", Fdelete, Sdelete, 2, 2, 0, doc: /* Delete by side effect any occurrences of ELT as a member of SEQ. SEQ must be a list, a vector, or a string. The modified SEQ is returned. Comparison is done with `equal'. @@ -1689,7 +1689,7 @@ to be sure of changing the value of `foo'. */) return seq; } -DEFUE ("nreverse", Fnreverse, Snreverse, 1, 1, 0, +DEFUN ("nreverse", Fnreverse, Snreverse, 1, 1, 0, doc: /* Reverse LIST by modifying cdr pointers. Return the reversed list. */) (Lisp_Object list) @@ -1711,7 +1711,7 @@ Return the reversed list. */) return prev; } -DEFUE ("reverse", Freverse, Sreverse, 1, 1, 0, +DEFUN ("reverse", Freverse, Sreverse, 1, 1, 0, doc: /* Reverse LIST, copying. Return the reversed list. See also the function `nreverse', which is used more often. */) (Lisp_Object list) @@ -1729,7 +1729,7 @@ See also the function `nreverse', which is used more often. */) Lisp_Object merge (Lisp_Object org_l1, Lisp_Object org_l2, Lisp_Object pred); -DEFUE ("sort", Fsort, Ssort, 2, 2, 0, +DEFUN ("sort", Fsort, Ssort, 2, 2, 0, doc: /* Sort LIST, stably, comparing elements using PREDICATE. Returns the sorted list. LIST is modified by side effects. PREDICATE is called with two elements of LIST, and should return non-nil @@ -1820,7 +1820,7 @@ merge (Lisp_Object org_l1, Lisp_Object org_l2, Lisp_Object pred) /* This does not check for quits. That is safe since it must terminate. */ -DEFUE ("plist-get", Fplist_get, Splist_get, 2, 2, 0, +DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0, doc: /* Extract a value from a property list. PLIST is a property list, which is a list of the form \(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value @@ -1853,7 +1853,7 @@ properties on the list. This function never signals an error. */) return Qnil; } -DEFUE ("get", Fget, Sget, 2, 2, 0, +DEFUN ("get", Fget, Sget, 2, 2, 0, doc: /* Return the value of SYMBOL's PROPNAME property. This is the last value stored with `(put SYMBOL PROPNAME VALUE)'. */) (Lisp_Object symbol, Lisp_Object propname) @@ -1862,7 +1862,7 @@ This is the last value stored with `(put SYMBOL PROPNAME VALUE)'. */) return Fplist_get (XSYMBOL (symbol)->plist, propname); } -DEFUE ("plist-put", Fplist_put, Splist_put, 3, 3, 0, +DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0, doc: /* Change value in PLIST of PROP to VAL. PLIST is a property list, which is a list of the form \(PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol and VAL is any object. @@ -1895,7 +1895,7 @@ The PLIST is modified by side effects. */) return plist; } -DEFUE ("put", Fput, Sput, 3, 3, 0, +DEFUN ("put", Fput, Sput, 3, 3, 0, doc: /* Store SYMBOL's PROPNAME property with value VALUE. It can be retrieved with `(get SYMBOL PROPNAME)'. */) (Lisp_Object symbol, Lisp_Object propname, Lisp_Object value) @@ -1975,7 +1975,7 @@ Floating-point numbers of equal value are `eql', but they may not be `eq'. */) return EQ (obj1, obj2) ? Qt : Qnil; } -DEFUE ("equal", Fequal, Sequal, 2, 2, 0, +DEFUN ("equal", Fequal, Sequal, 2, 2, 0, doc: /* Return t if two Lisp objects have similar structure and contents. They must have the same data type. Conses are compared by comparing the cars and the cdrs. @@ -2223,7 +2223,7 @@ nconc2 (Lisp_Object s1, Lisp_Object s2) return Fnconc (2, args); } -DEFUE ("nconc", Fnconc, Snconc, 0, MANY, 0, +DEFUN ("nconc", Fnconc, Snconc, 0, MANY, 0, doc: /* Concatenate any number of lists by altering them. Only the last argument is not altered, and need not be a list. usage: (nconc &rest LISTS) */) @@ -2343,7 +2343,7 @@ mapcar1 (EMACS_INT leni, Lisp_Object *vals, Lisp_Object fn, Lisp_Object seq) UNGCPRO; } -DEFUE ("mapconcat", Fmapconcat, Smapconcat, 3, 3, 0, +DEFUN ("mapconcat", Fmapconcat, Smapconcat, 3, 3, 0, doc: /* Apply FUNCTION to each element of SEQUENCE, and concat the results as strings. In between each pair of results, stick in SEPARATOR. Thus, " " as SEPARATOR results in spaces between the values returned by FUNCTION. @@ -2384,7 +2384,7 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string. */) return ret; } -DEFUE ("mapcar", Fmapcar, Smapcar, 2, 2, 0, +DEFUN ("mapcar", Fmapcar, Smapcar, 2, 2, 0, doc: /* Apply FUNCTION to each element of SEQUENCE, and make a list of the results. The result is a list just as long as SEQUENCE. SEQUENCE may be a list, a vector, a bool-vector, or a string. */) @@ -2562,7 +2562,7 @@ SUBFEATURE can be used to check a specific subfeature of FEATURE. */) return (NILP (tem)) ? Qnil : Qt; } -DEFUE ("provide", Fprovide, Sprovide, 1, 2, 0, +DEFUN ("provide", Fprovide, Sprovide, 1, 2, 0, doc: /* Announce that FEATURE is a feature of the current Emacs. The optional argument SUBFEATURES should be a list of symbols listing particular subfeatures supported in this version of FEATURE. */) @@ -2700,7 +2700,7 @@ The normal messages at start and end of loading FILENAME are suppressed. */) bottleneck of Widget operation. Here is their translation to C, for the sole reason of efficiency. */ -DEFUE ("plist-member", Fplist_member, Splist_member, 2, 2, 0, +DEFUN ("plist-member", Fplist_member, Splist_member, 2, 2, 0, doc: /* Return non-nil if PLIST has the property PROP. PLIST is a property list, which is a list of the form \(PROP1 VALUE1 PROP2 VALUE2 ...\). PROP is a symbol. @@ -4250,7 +4250,7 @@ DEFUN ("sxhash", Fsxhash, Ssxhash, 1, 1, 0, } -DEFUE ("make-hash-table", Fmake_hash_table, Smake_hash_table, 0, MANY, 0, +DEFUN ("make-hash-table", Fmake_hash_table, Smake_hash_table, 0, MANY, 0, doc: /* Create and return a new hash table. Arguments are specified as keyword/argument pairs. The following @@ -4438,7 +4438,7 @@ DEFUN ("clrhash", Fclrhash, Sclrhash, 1, 1, 0, } -DEFUE ("gethash", Fgethash, Sgethash, 2, 3, 0, +DEFUN ("gethash", Fgethash, Sgethash, 2, 3, 0, doc: /* Look up KEY in TABLE and return its associated value. If KEY is not found, return DFLT which defaults to nil. */) (Lisp_Object key, Lisp_Object table, Lisp_Object dflt) @@ -4449,7 +4449,7 @@ If KEY is not found, return DFLT which defaults to nil. */) } -DEFUE ("puthash", Fputhash, Sputhash, 3, 3, 0, +DEFUN ("puthash", Fputhash, Sputhash, 3, 3, 0, doc: /* Associate KEY with VALUE in hash table TABLE. If KEY is already present in table, replace its current value with VALUE. */) @@ -4469,7 +4469,7 @@ VALUE. */) } -DEFUE ("remhash", Fremhash, Sremhash, 2, 2, 0, +DEFUN ("remhash", Fremhash, Sremhash, 2, 2, 0, doc: /* Remove KEY from TABLE. */) (Lisp_Object key, Lisp_Object table) { diff --git a/src/font.c b/src/font.c index 6f27e3b9c67..7d8b94bddf2 100644 --- a/src/font.c +++ b/src/font.c @@ -3764,7 +3764,7 @@ which kind of font it is. It must be one of `font-spec', `font-entity', wrong_type_argument (intern ("font-extra-type"), extra_type); } -DEFUE ("font-spec", Ffont_spec, Sfont_spec, 0, MANY, 0, +DEFUN ("font-spec", Ffont_spec, Sfont_spec, 0, MANY, 0, doc: /* Return a newly created font-spec with arguments as properties. ARGS must come in pairs KEY VALUE of font properties. KEY must be a @@ -3923,7 +3923,7 @@ merge_font_spec (Lisp_Object from, Lisp_Object to) return to; } -DEFUE ("font-get", Ffont_get, Sfont_get, 2, 2, 0, +DEFUN ("font-get", Ffont_get, Sfont_get, 2, 2, 0, doc: /* Return the value of FONT's property KEY. FONT is a font-spec, a font-entity, or a font-object. KEY is any symbol, but these are reserved for specific meanings: @@ -4055,7 +4055,7 @@ are to be displayed on. If omitted, the selected frame is used. */) #endif -DEFUE ("font-put", Ffont_put, Sfont_put, 3, 3, 0, +DEFUN ("font-put", Ffont_put, Sfont_put, 3, 3, 0, doc: /* Set one property of FONT: give property KEY value VAL. FONT is a font-spec, a font-entity, or a font-object. @@ -4089,7 +4089,7 @@ accepted by `font-spec'. */) return val; } -DEFUE ("list-fonts", Flist_fonts, Slist_fonts, 1, 4, 0, +DEFUN ("list-fonts", Flist_fonts, Slist_fonts, 1, 4, 0, doc: /* List available fonts matching FONT-SPEC on the current frame. Optional 2nd argument FRAME specifies the target frame. Optional 3rd argument NUM, if non-nil, limits the number of returned fonts. @@ -4183,7 +4183,7 @@ Optional 2nd argument FRAME, if non-nil, specifies the target frame. */) return val; } -DEFUE ("font-xlfd-name", Ffont_xlfd_name, Sfont_xlfd_name, 1, 2, 0, +DEFUN ("font-xlfd-name", Ffont_xlfd_name, Sfont_xlfd_name, 1, 2, 0, doc: /* Return XLFD name of FONT. FONT is a font-spec, font-entity, or font-object. If the name is too long for XLFD (maximum 255 chars), return nil. @@ -4405,7 +4405,7 @@ where #if 0 -DEFUE ("font-drive-otf", Ffont_drive_otf, Sfont_drive_otf, 6, 6, 0, +DEFUN ("font-drive-otf", Ffont_drive_otf, Sfont_drive_otf, 6, 6, 0, doc: /* Apply OpenType features on glyph-string GSTRING-IN. OTF-FEATURES specifies which features to apply in this format: (SCRIPT LANGSYS GSUB GPOS) @@ -4475,7 +4475,7 @@ glyph-string. */) return make_number (num); } -DEFUE ("font-otf-alternates", Ffont_otf_alternates, Sfont_otf_alternates, +DEFUN ("font-otf-alternates", Ffont_otf_alternates, Sfont_otf_alternates, 3, 3, 0, doc: /* Return a list of alternate glyphs of CHARACTER in FONT-OBJECT. OTF-FEATURES specifies which features of the font FONT-OBJECT to apply diff --git a/src/fontset.c b/src/fontset.c index 5aa65c85110..a40a3dd5f9c 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1176,7 +1176,7 @@ fs_query_fontset (Lisp_Object name, int name_pattern) } -DEFUE ("query-fontset", Fquery_fontset, Squery_fontset, 1, 2, 0, +DEFUN ("query-fontset", Fquery_fontset, Squery_fontset, 1, 2, 0, doc: /* Return the name of a fontset that matches PATTERN. The value is nil if there is no matching fontset. PATTERN can contain `*' or `?' as a wildcard @@ -2142,7 +2142,7 @@ dump_fontset (Lisp_Object fontset) return vec; } -DEFUE ("fontset-list-all", Ffontset_list_all, Sfontset_list_all, 0, 0, 0, +DEFUN ("fontset-list-all", Ffontset_list_all, Sfontset_list_all, 0, 0, 0, doc: /* Return a brief summary of all fontsets for debug use. */) (void) { diff --git a/src/frame.c b/src/frame.c index 79e0b40a319..cafcd149503 100644 --- a/src/frame.c +++ b/src/frame.c @@ -230,7 +230,7 @@ return values. */) : Qnil); } -DEFUE ("window-system", Fwindow_system, Swindow_system, 0, 1, 0, +DEFUN ("window-system", Fwindow_system, Swindow_system, 0, 1, 0, doc: /* The name of the window system that FRAME is displaying through. The value is a symbol: nil for a termcap frame (a character-only terminal), @@ -861,7 +861,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor return frame; } -DEFUE ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e", +DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e", doc: /* Select FRAME. Subsequent editing commands apply to its selected window. Optional argument NORECORD means to neither change the order of @@ -899,14 +899,14 @@ to that frame. */) return do_switch_frame (event, 0, 0, Qnil); } -DEFUE ("selected-frame", Fselected_frame, Sselected_frame, 0, 0, 0, +DEFUN ("selected-frame", Fselected_frame, Sselected_frame, 0, 0, 0, doc: /* Return the frame that is now selected. */) (void) { return selected_frame; } -DEFUE ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0, +DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0, doc: /* Return the frame object that window WINDOW is on. */) (Lisp_Object window) { @@ -914,7 +914,7 @@ DEFUE ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0, return XWINDOW (window)->frame; } -DEFUE ("frame-first-window", Fframe_first_window, Sframe_first_window, 0, 1, 0, +DEFUN ("frame-first-window", Fframe_first_window, Sframe_first_window, 0, 1, 0, doc: /* Returns the topmost, leftmost window of FRAME. If omitted, FRAME defaults to the currently selected frame. */) (Lisp_Object frame) @@ -948,7 +948,7 @@ DEFUN ("active-minibuffer-window", Factive_minibuffer_window, return minibuf_level ? minibuf_window : Qnil; } -DEFUE ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0, +DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0, doc: /* Returns the root-window of FRAME. If omitted, FRAME defaults to the currently selected frame. */) (Lisp_Object frame) @@ -985,7 +985,7 @@ FRAME defaults to the currently selected frame. */) return window; } -DEFUE ("set-frame-selected-window", Fset_frame_selected_window, +DEFUN ("set-frame-selected-window", Fset_frame_selected_window, Sset_frame_selected_window, 2, 3, 0, doc: /* Set selected window of FRAME to WINDOW. If FRAME is nil, use the selected frame. If FRAME is the @@ -1781,7 +1781,7 @@ before calling this function on it, like this. static void make_frame_visible_1 (Lisp_Object); -DEFUE ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible, +DEFUN ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible, 0, 1, "", doc: /* Make the frame FRAME visible (assuming it is an X window). If omitted, FRAME defaults to the currently selected frame. */) @@ -1881,7 +1881,7 @@ displayed in the terminal. */) return Qnil; } -DEFUE ("iconify-frame", Ficonify_frame, Siconify_frame, +DEFUN ("iconify-frame", Ficonify_frame, Siconify_frame, 0, 1, "", doc: /* Make the frame FRAME into an icon. If omitted, FRAME defaults to the currently selected frame. */) @@ -1966,7 +1966,7 @@ DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list, } -DEFUE ("raise-frame", Fraise_frame, Sraise_frame, 0, 1, "", +DEFUN ("raise-frame", Fraise_frame, Sraise_frame, 0, 1, "", doc: /* Bring FRAME to the front, so it occludes any frames it overlaps. If FRAME is invisible or iconified, make it visible. If you don't specify a frame, the selected frame is used. @@ -2019,7 +2019,7 @@ doesn't support multiple overlapping frames, this function does nothing. */) } -DEFUE ("redirect-frame-focus", Fredirect_frame_focus, Sredirect_frame_focus, +DEFUN ("redirect-frame-focus", Fredirect_frame_focus, Sredirect_frame_focus, 1, 2, 0, doc: /* Arrange for keystrokes typed at FRAME to be sent to FOCUS-FRAME. In other words, switch-frame events caused by events in FRAME will @@ -2400,7 +2400,7 @@ If FRAME is omitted, return information on the currently selected frame. */) } -DEFUE ("frame-parameter", Fframe_parameter, Sframe_parameter, 2, 2, 0, +DEFUN ("frame-parameter", Fframe_parameter, Sframe_parameter, 2, 2, 0, doc: /* Return FRAME's value for parameter PARAMETER. If FRAME is nil, describe the currently selected frame. */) (Lisp_Object frame, Lisp_Object parameter) @@ -2478,7 +2478,7 @@ If FRAME is nil, describe the currently selected frame. */) } -DEFUE ("modify-frame-parameters", Fmodify_frame_parameters, +DEFUN ("modify-frame-parameters", Fmodify_frame_parameters, Smodify_frame_parameters, 2, 2, 0, doc: /* Modify the parameters of frame FRAME according to ALIST. If FRAME is nil, it defaults to the selected frame. diff --git a/src/image.c b/src/image.c index 11c6aa8a17d..5e5d3509eaa 100644 --- a/src/image.c +++ b/src/image.c @@ -7874,7 +7874,7 @@ static struct image_type imagemagick_type = }; -DEFUE ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0, +DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0, doc: /* Return the image types supported by ImageMagick. Note that ImageMagick recognizes many file-types that Emacs does not recognize as images, such as .c. */) @@ -8585,7 +8585,7 @@ x_kill_gs_process (Pixmap pixmap, struct frame *f) #if GLYPH_DEBUG -DEFUE ("imagep", Fimagep, Simagep, 1, 1, 0, +DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0, doc: /* Value is non-nil if SPEC is a valid image specification. */) (Lisp_Object spec) { @@ -8593,7 +8593,7 @@ DEFUE ("imagep", Fimagep, Simagep, 1, 1, 0, } -DEFUE ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "") +DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "") (Lisp_Object spec) { int id = -1; diff --git a/src/indent.c b/src/indent.c index 5eab4f48f69..0bfe2e61ca6 100644 --- a/src/indent.c +++ b/src/indent.c @@ -796,7 +796,7 @@ string_display_width (string, beg, end) #endif /* 0 */ -DEFUE ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ", +DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ", doc: /* Indent from point with tabs and spaces until COLUMN is reached. Optional second argument MINIMUM says always do at least MINIMUM spaces even if that goes past COLUMN; by default, MINIMUM is zero. @@ -967,7 +967,7 @@ indented_beyond_p (EMACS_INT pos, EMACS_INT pos_byte, EMACS_INT column) return val >= column; } -DEFUE ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p", +DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p", doc: /* Move point to column COLUMN in the current line. Interactively, COLUMN is the value of prefix numeric argument. The column of a character is calculated by adding together the widths @@ -1959,7 +1959,7 @@ vmotion (register EMACS_INT from, register EMACS_INT vtarget, struct window *w) w); } -DEFUE ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0, +DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0, doc: /* Move point to start of the screen line LINES lines down. If LINES is negative, this means moving up. diff --git a/src/keyboard.c b/src/keyboard.c index 1e673c493b6..29062a77e32 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -781,7 +781,7 @@ force_auto_save_soon (void) } #endif -DEFUE ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "", +DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "", doc: /* Invoke the editor command loop recursively. To get out of the recursive edit, a command can do `(throw 'exit nil)'; that tells this function to return. @@ -1175,7 +1175,7 @@ top_level_1 (Lisp_Object ignore) return Qnil; } -DEFUE ("top-level", Ftop_level, Stop_level, 0, 0, "", +DEFUN ("top-level", Ftop_level, Stop_level, 0, 0, "", doc: /* Exit all recursive editing levels. This also exits all active minibuffers. */) (void) @@ -6486,7 +6486,7 @@ modify_event_symbol (EMACS_INT symbol_num, unsigned int modifiers, Lisp_Object s such as (ctrl meta backspace), into the usual representation of that event type as a number or a symbol. */ -DEFUE ("event-convert-list", Fevent_convert_list, Sevent_convert_list, 1, 1, 0, +DEFUN ("event-convert-list", Fevent_convert_list, Sevent_convert_list, 1, 1, 0, doc: /* Convert the event description list EVENT-DESC to an event type. EVENT-DESC should contain one base event type (a character or symbol) and zero or more modifier names (control, meta, hyper, super, shift, alt, @@ -9997,7 +9997,7 @@ read_key_sequence (Lisp_Object *keybuf, size_t bufsize, Lisp_Object prompt, return t; } -DEFUE ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0, +DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0, doc: /* Read a sequence of keystrokes and return as a string or vector. The sequence is sufficient to specify a non-prefix command in the current local and global maps. @@ -10625,7 +10625,7 @@ If FILE is nil, close any open dribble file. */) return Qnil; } -DEFUE ("discard-input", Fdiscard_input, Sdiscard_input, 0, 0, 0, +DEFUN ("discard-input", Fdiscard_input, Sdiscard_input, 0, 0, 0, doc: /* Discard the contents of the terminal input buffer. Also end any kbd macro being defined. */) (void) @@ -10978,7 +10978,7 @@ quit_throw_to_read_char (void) _longjmp (getcjmp, 1); } -DEFUE ("set-input-interrupt-mode", Fset_input_interrupt_mode, +DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode, Sset_input_interrupt_mode, 1, 1, 0, doc: /* Set interrupt mode of reading keyboard input. If INTERRUPT is non-nil, Emacs will use input interrupts; @@ -11144,7 +11144,7 @@ See also `current-input-mode'. */) return Qnil; } -DEFUE ("set-input-mode", Fset_input_mode, Sset_input_mode, 3, 4, 0, +DEFUN ("set-input-mode", Fset_input_mode, Sset_input_mode, 3, 4, 0, doc: /* Set mode of reading keyboard input. First arg INTERRUPT non-nil means use input interrupts; nil means use CBREAK mode. diff --git a/src/keymap.c b/src/keymap.c index 741fa4f6dfc..ba958077f0d 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -110,7 +110,7 @@ in case you use it as a menu with `x-popup-menu'. */) Fcons (Fmake_char_table (Qkeymap, Qnil), tail)); } -DEFUE ("make-sparse-keymap", Fmake_sparse_keymap, Smake_sparse_keymap, 0, 1, 0, +DEFUN ("make-sparse-keymap", Fmake_sparse_keymap, Smake_sparse_keymap, 0, 1, 0, doc: /* Construct and return a new sparse keymap. Its car is `keymap' and its cdr is an alist of (CHAR . DEFINITION), which binds the character CHAR to DEFINITION, or (SYMBOL . DEFINITION), @@ -162,7 +162,7 @@ is also allowed as an element. */) return (KEYMAPP (object) ? Qt : Qnil); } -DEFUE ("keymap-prompt", Fkeymap_prompt, Skeymap_prompt, 1, 1, 0, +DEFUN ("keymap-prompt", Fkeymap_prompt, Skeymap_prompt, 1, 1, 0, doc: /* Return the prompt-string of a keymap MAP. If non-nil, the prompt is shown in the echo-area when reading a key-sequence to be looked-up in this keymap. */) @@ -293,7 +293,7 @@ keymap_memberp (Lisp_Object map, Lisp_Object maps) /* Set the parent keymap of MAP to PARENT. */ -DEFUE ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0, +DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0, doc: /* Modify KEYMAP to set its parent map to PARENT. Return PARENT. PARENT should be nil or another keymap. */) (Lisp_Object keymap, Lisp_Object parent) @@ -1081,7 +1081,7 @@ is not copied. */) /* GC is possible in this function if it autoloads a keymap. */ -DEFUE ("define-key", Fdefine_key, Sdefine_key, 3, 3, 0, +DEFUN ("define-key", Fdefine_key, Sdefine_key, 3, 3, 0, doc: /* In KEYMAP, define key sequence KEY as DEF. KEYMAP is a keymap. @@ -1212,7 +1212,7 @@ binding KEY to DEF is added at the front of KEYMAP. */) /* This function may GC (it calls Fkey_binding). */ -DEFUE ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 3, 0, +DEFUN ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 3, 0, doc: /* Return the remapping for command COMMAND. Returns nil if COMMAND is not remapped (or not a symbol). @@ -1520,7 +1520,7 @@ current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr) return i; } -DEFUE ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps, +DEFUN ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps, 0, 2, 0, doc: /* Return a list of the currently active keymaps. OLP if non-nil indicates that we should obey `overriding-local-map' and @@ -1663,7 +1663,7 @@ like in the respective argument of `key-binding'. */) /* GC is possible in this function if it autoloads a keymap. */ -DEFUE ("key-binding", Fkey_binding, Skey_binding, 1, 4, 0, +DEFUN ("key-binding", Fkey_binding, Skey_binding, 1, 4, 0, doc: /* Return the binding for command KEY in current keymaps. KEY is a string or vector, a sequence of keystrokes. The binding is probably a symbol with a function definition. @@ -2180,7 +2180,7 @@ static Lisp_Object Qsingle_key_description, Qkey_description; /* This function cannot GC. */ -DEFUE ("key-description", Fkey_description, Skey_description, 1, 2, 0, +DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0, doc: /* Return a pretty description of key-sequence KEYS. Optional arg PREFIX is the sequence of keys leading up to KEYS. Control characters turn into "C-foo" sequences, meta into "M-foo", @@ -2399,7 +2399,7 @@ push_key_description (register unsigned int c, register char *p, int force_multi /* This function cannot GC. */ -DEFUE ("single-key-description", Fsingle_key_description, +DEFUN ("single-key-description", Fsingle_key_description, Ssingle_key_description, 1, 2, 0, doc: /* Return a pretty description of command character KEY. Control characters turn into C-whatever, etc. @@ -2677,7 +2677,7 @@ where_is_internal (Lisp_Object definition, Lisp_Object keymaps, /* This function can GC if Flookup_key autoloads any keymaps. */ -DEFUE ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0, +DEFUN ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0, doc: /* Return list of keys that invoke DEFINITION. If KEYMAP is a keymap, search only KEYMAP and the global keymap. If KEYMAP is nil, search all the currently active keymaps. diff --git a/src/lisp.h b/src/lisp.h index 508f0b3a40b..4696a1c3432 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1806,12 +1806,8 @@ typedef struct { `doc' is documentation for the user. */ /* This version of DEFUN declares a function prototype with the right - arguments, so we can catch errors with maxargs at compile-time. - DEFUN defines an internal function, and DEFUE is similar but defines a - external function, which can be used in other C-language modules. */ -#define DEFUN static DEFINE_FUNC -#define DEFUE extern DEFINE_FUNC -#define DEFINE_FUNC(lname, fnname, sname, minargs, maxargs, intspec, doc) \ + arguments, so we can catch errors with maxargs at compile-time. */ +#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc) \ Lisp_Object fnname DEFUN_ARGS_ ## maxargs ; \ static DECL_ALIGN (struct Lisp_Subr, sname) = \ { PVEC_SUBR | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)), \ diff --git a/src/lread.c b/src/lread.c index fdb477c0218..d32f0b6a7e2 100644 --- a/src/lread.c +++ b/src/lread.c @@ -682,7 +682,7 @@ read_filtered_event (int no_switch_frame, int ascii_required, return val; } -DEFUE ("read-char", Fread_char, Sread_char, 0, 3, 0, +DEFUN ("read-char", Fread_char, Sread_char, 0, 3, 0, doc: /* Read a character from the command input (keyboard or macro). It is returned as a number. If the character has modifiers, they are resolved and reflected to the @@ -715,7 +715,7 @@ floating-point value. */) : make_number (char_resolve_modifier_mask (XINT (val)))); } -DEFUE ("read-event", Fread_event, Sread_event, 0, 3, 0, +DEFUN ("read-event", Fread_event, Sread_event, 0, 3, 0, doc: /* Read an event object from the input stream. If the optional argument PROMPT is non-nil, display that as a prompt. If the optional argument INHERIT-INPUT-METHOD is non-nil and some @@ -951,7 +951,7 @@ load_warn_old_style_backquotes (Lisp_Object file) return Qnil; } -DEFUE ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0, +DEFUN ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0, doc: /* Return the suffixes that `load' should try if a suffix is \ required. This uses the variables `load-suffixes' and `load-file-rep-suffixes'. */) @@ -973,7 +973,7 @@ This uses the variables `load-suffixes' and `load-file-rep-suffixes'. */) return Fnreverse (lst); } -DEFUE ("load", Fload, Sload, 1, 5, 0, +DEFUN ("load", Fload, Sload, 1, 5, 0, doc: /* Execute a file of Lisp code named FILE. First try FILE with `.elc' appended, then try with `.el', then try FILE unmodified (the exact suffixes in the exact order are @@ -1907,7 +1907,7 @@ This function does not move point. */) } -DEFUE ("read", Fread, Sread, 0, 1, 0, +DEFUN ("read", Fread, Sread, 0, 1, 0, doc: /* Read one Lisp expression as text from STREAM, return as Lisp object. If STREAM is nil, use the value of `standard-input' (which see). STREAM or the value of `standard-input' may be: @@ -1930,7 +1930,7 @@ STREAM or the value of `standard-input' may be: return read_internal_start (stream, Qnil, Qnil); } -DEFUE ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0, +DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0, doc: /* Read one Lisp expression which is represented as text by STRING. Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX). START and END optionally delimit a substring of STRING from which to read; @@ -3643,7 +3643,7 @@ intern_c_string (const char *str) return Fintern (make_pure_c_string (str), obarray); } -DEFUE ("intern", Fintern, Sintern, 1, 2, 0, +DEFUN ("intern", Fintern, Sintern, 1, 2, 0, doc: /* Return the canonical symbol whose name is STRING. If there is none, one is created by this function and returned. A second optional argument specifies the obarray to use; @@ -3689,7 +3689,7 @@ it defaults to the value of `obarray'. */) return sym; } -DEFUE ("intern-soft", Fintern_soft, Sintern_soft, 1, 2, 0, +DEFUN ("intern-soft", Fintern_soft, Sintern_soft, 1, 2, 0, doc: /* Return the canonical symbol named NAME, or nil if none exists. NAME may be a string or a symbol. If it is a symbol, that exact symbol is searched for. @@ -3717,7 +3717,7 @@ it defaults to the value of `obarray'. */) return tem; } -DEFUE ("unintern", Funintern, Sunintern, 1, 2, 0, +DEFUN ("unintern", Funintern, Sunintern, 1, 2, 0, doc: /* Delete the symbol named NAME, if any, from OBARRAY. The value is t if a symbol was found and deleted, nil otherwise. NAME may be a string or a symbol. If it is a symbol, that symbol diff --git a/src/macros.c b/src/macros.c index e5de4a14136..3523e513d6a 100644 --- a/src/macros.c +++ b/src/macros.c @@ -216,7 +216,7 @@ finalize_kbd_macro_chars (void) current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr; } -DEFUE ("cancel-kbd-macro-events", Fcancel_kbd_macro_events, +DEFUN ("cancel-kbd-macro-events", Fcancel_kbd_macro_events, Scancel_kbd_macro_events, 0, 0, 0, doc: /* Cancel the events added to a keyboard macro for this command. */) (void) @@ -283,7 +283,7 @@ pop_kbd_macro (Lisp_Object info) return Qnil; } -DEFUE ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0, +DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0, doc: /* Execute MACRO as string of editor command characters. If MACRO is a symbol, its function definition is used. COUNT is a repeat count, or nil for once, or 0 for infinite loop. diff --git a/src/marker.c b/src/marker.c index b8567c2810f..7d461099140 100644 --- a/src/marker.c +++ b/src/marker.c @@ -420,7 +420,7 @@ buf_bytepos_to_charpos (struct buffer *b, EMACS_INT bytepos) /* Operations on markers. */ -DEFUE ("marker-buffer", Fmarker_buffer, Smarker_buffer, 1, 1, 0, +DEFUN ("marker-buffer", Fmarker_buffer, Smarker_buffer, 1, 1, 0, doc: /* Return the buffer that MARKER points into, or nil if none. Returns nil if MARKER points into a dead buffer. */) (register Lisp_Object marker) @@ -440,7 +440,7 @@ Returns nil if MARKER points into a dead buffer. */) return Qnil; } -DEFUE ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0, +DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0, doc: /* Return the position MARKER points at, as a character number. Returns nil if MARKER points nowhere. */) (Lisp_Object marker) @@ -452,7 +452,7 @@ Returns nil if MARKER points nowhere. */) return Qnil; } -DEFUE ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, +DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, doc: /* Position MARKER before character number POSITION in BUFFER. BUFFER defaults to the current buffer. If POSITION is nil, makes marker point nowhere. @@ -796,7 +796,7 @@ marker_byte_position (Lisp_Object marker) return i; } -DEFUE ("copy-marker", Fcopy_marker, Scopy_marker, 0, 2, 0, +DEFUN ("copy-marker", Fcopy_marker, Scopy_marker, 0, 2, 0, doc: /* Return a new marker pointing at the same place as MARKER. If argument is a number, makes a new marker pointing at that position in the current buffer. diff --git a/src/menu.c b/src/menu.c index bf6bb6486bd..3bfb74863ae 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1017,7 +1017,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data) } #endif /* HAVE_NS */ -DEFUE ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0, +DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0, doc: /* Pop up a deck-of-cards menu and return user's selection. POSITION is a position specification. This is either a mouse button event or a list ((XOFFSET YOFFSET) WINDOW) diff --git a/src/minibuf.c b/src/minibuf.c index 3bcb0fca61c..6316ba514b9 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -872,7 +872,7 @@ read_minibuf_unwind (Lisp_Object data) } -DEFUE ("read-from-minibuffer", Fread_from_minibuffer, +DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 7, 0, doc: /* Read a string from the minibuffer, prompting with string PROMPT. The optional second arg INITIAL-CONTENTS is an obsolete alternative to @@ -950,7 +950,7 @@ and some related functions, which use zero-indexing for POSITION. */) return val; } -DEFUE ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0, +DEFUN ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0, doc: /* Return a Lisp object read using the minibuffer, unevaluated. Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS is a string to insert in the minibuffer before reading. @@ -964,7 +964,7 @@ Such arguments are used as in `read-from-minibuffer'.) */) make_number (0), Qnil, 0, 0); } -DEFUE ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0, +DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0, doc: /* Return value of Lisp expression read using the minibuffer. Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS is a string to insert in the minibuffer before reading. @@ -980,7 +980,7 @@ Such arguments are used as in `read-from-minibuffer'.) */) /* Functions that use the minibuffer to read various things. */ -DEFUE ("read-string", Fread_string, Sread_string, 1, 5, 0, +DEFUN ("read-string", Fread_string, Sread_string, 1, 5, 0, doc: /* Read a string from the minibuffer, prompting with string PROMPT. If non-nil, second arg INITIAL-INPUT is a string to insert before reading. This argument has been superseded by DEFAULT-VALUE and should normally @@ -1057,7 +1057,7 @@ Prompt with PROMPT. */) } #endif /* NOTDEF */ -DEFUE ("read-variable", Fread_variable, Sread_variable, 1, 2, 0, +DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 2, 0, doc: /* Read the name of a user variable and return it as a symbol. Prompt with PROMPT. By default, return DEFAULT-VALUE or its first element if it is a list. @@ -1081,7 +1081,7 @@ A user variable is one for which `user-variable-p' returns non-nil. */) return Fintern (name, Qnil); } -DEFUE ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0, +DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0, doc: /* Read the name of a buffer and return as a string. Prompt with PROMPT. Optional second arg DEF is value to return if user enters an empty line. @@ -1617,7 +1617,7 @@ with a space are ignored unless STRING itself starts with a space. */) return Fnreverse (allmatches); } -DEFUE ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0, +DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0, doc: /* Read a string in the minibuffer, with completion. PROMPT is a string to prompt with; normally it ends in a colon and a space. COLLECTION can be a list of strings, an alist, an obarray or a hash table. @@ -1918,7 +1918,7 @@ The arguments STRING and PREDICATE are as in `try-completion', /* Like assoc but assumes KEY is a string, and ignores case if appropriate. */ -DEFUE ("assoc-string", Fassoc_string, Sassoc_string, 2, 3, 0, +DEFUN ("assoc-string", Fassoc_string, Sassoc_string, 2, 3, 0, doc: /* Like `assoc' but specifically for strings (and symbols). This returns the first element of LIST whose car matches the string or diff --git a/src/print.c b/src/print.c index 8bc8f98ccee..42c5df86783 100644 --- a/src/print.c +++ b/src/print.c @@ -526,7 +526,7 @@ static void print_preprocess (Lisp_Object obj); static void print_preprocess_string (INTERVAL interval, Lisp_Object arg); static void print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag); -DEFUE ("terpri", Fterpri, Sterpri, 0, 1, 0, +DEFUN ("terpri", Fterpri, Sterpri, 0, 1, 0, doc: /* Output a newline to stream PRINTCHARFUN. If PRINTCHARFUN is omitted or nil, the value of `standard-output' is used. */) (Lisp_Object printcharfun) @@ -541,7 +541,7 @@ If PRINTCHARFUN is omitted or nil, the value of `standard-output' is used. */) return Qt; } -DEFUE ("prin1", Fprin1, Sprin1, 1, 2, 0, +DEFUN ("prin1", Fprin1, Sprin1, 1, 2, 0, doc: /* Output the printed representation of OBJECT, any Lisp object. Quoting characters are printed when needed to make output that `read' can handle, whenever this is possible. For complex objects, the behavior @@ -579,7 +579,7 @@ is used instead. */) /* a buffer which is used to hold output being built by prin1-to-string */ Lisp_Object Vprin1_to_string_buffer; -DEFUE ("prin1-to-string", Fprin1_to_string, Sprin1_to_string, 1, 2, 0, +DEFUN ("prin1-to-string", Fprin1_to_string, Sprin1_to_string, 1, 2, 0, doc: /* Return a string containing the printed representation of OBJECT. OBJECT can be any Lisp object. This function outputs quoting characters when necessary to make output that `read' can handle, whenever possible, @@ -670,7 +670,7 @@ is used instead. */) return object; } -DEFUE ("print", Fprint, Sprint, 1, 2, 0, +DEFUN ("print", Fprint, Sprint, 1, 2, 0, doc: /* Output the printed representation of OBJECT, with newlines around it. Quoting characters are printed when needed to make output that `read' can handle, whenever this is possible. For complex objects, the behavior @@ -813,7 +813,7 @@ safe_debug_print (Lisp_Object arg) } -DEFUE ("error-message-string", Ferror_message_string, Serror_message_string, +DEFUN ("error-message-string", Ferror_message_string, Serror_message_string, 1, 1, 0, doc: /* Convert an error value (ERROR-SYMBOL . DATA) to an error message. See Info anchor `(elisp)Definition of signal' for some details on how this diff --git a/src/process.c b/src/process.c index 7efbab11190..0cec8977ad0 100644 --- a/src/process.c +++ b/src/process.c @@ -783,7 +783,7 @@ nil, indicating the current buffer's process. */) return Qnil; } -DEFUE ("process-status", Fprocess_status, Sprocess_status, 1, 1, 0, +DEFUN ("process-status", Fprocess_status, Sprocess_status, 1, 1, 0, doc: /* Return the status of PROCESS. The returned value is one of the following symbols: run -- for a process that is running. @@ -5776,7 +5776,7 @@ don't send the signal. */) return process; } -DEFUE ("kill-process", Fkill_process, Skill_process, 0, 2, 0, +DEFUN ("kill-process", Fkill_process, Skill_process, 0, 2, 0, doc: /* Kill process PROCESS. May be process or name of one. See function `interrupt-process' for more details on usage. */) (Lisp_Object process, Lisp_Object current_group) @@ -6916,7 +6916,7 @@ close_process_descs (void) #endif } -DEFUE ("get-buffer-process", Fget_buffer_process, Sget_buffer_process, 1, 1, 0, +DEFUN ("get-buffer-process", Fget_buffer_process, Sget_buffer_process, 1, 1, 0, doc: /* Return the (or a) process associated with BUFFER. BUFFER may be a buffer or the name of one. */) (register Lisp_Object buffer) @@ -6983,7 +6983,7 @@ kill_buffer_processes (Lisp_Object buffer) #endif /* subprocesses */ } -DEFUE ("waiting-for-user-input-p", Fwaiting_for_user_input_p, +DEFUN ("waiting-for-user-input-p", Fwaiting_for_user_input_p, Swaiting_for_user_input_p, 0, 0, 0, doc: /* Returns non-nil if Emacs is waiting for input from the user. This is intended for use by asynchronous process output filters and sentinels. */) diff --git a/src/search.c b/src/search.c index c522de90e05..6c835f2cc64 100644 --- a/src/search.c +++ b/src/search.c @@ -436,7 +436,7 @@ string_match_1 (Lisp_Object regexp, Lisp_Object string, Lisp_Object start, int p return make_number (string_byte_to_char (string, val)); } -DEFUE ("string-match", Fstring_match, Sstring_match, 2, 3, 0, +DEFUN ("string-match", Fstring_match, Sstring_match, 2, 3, 0, doc: /* Return index of start of first match for REGEXP in STRING, or nil. Matching ignores case if `case-fold-search' is non-nil. If third arg START is non-nil, start search at that index in STRING. @@ -2811,7 +2811,7 @@ match_limit (Lisp_Object num, int beginningp) : search_regs.end[n])); } -DEFUE ("match-beginning", Fmatch_beginning, Smatch_beginning, 1, 1, 0, +DEFUN ("match-beginning", Fmatch_beginning, Smatch_beginning, 1, 1, 0, doc: /* Return position of start of text matched by last search. SUBEXP, a number, specifies which parenthesized expression in the last regexp. @@ -2823,7 +2823,7 @@ Zero means the entire text matched by the whole regexp or whole string. */) return match_limit (subexp, 1); } -DEFUE ("match-end", Fmatch_end, Smatch_end, 1, 1, 0, +DEFUN ("match-end", Fmatch_end, Smatch_end, 1, 1, 0, doc: /* Return position of end of text matched by last search. SUBEXP, a number, specifies which parenthesized expression in the last regexp. @@ -2835,7 +2835,7 @@ Zero means the entire text matched by the whole regexp or whole string. */) return match_limit (subexp, 0); } -DEFUE ("match-data", Fmatch_data, Smatch_data, 0, 3, 0, +DEFUN ("match-data", Fmatch_data, Smatch_data, 0, 3, 0, doc: /* Return a list containing all info on what the last search matched. Element 2N is `(match-beginning N)'; element 2N + 1 is `(match-end N)'. All the elements are markers or nil (nil if the Nth pair didn't match) @@ -2950,7 +2950,7 @@ Return value is undefined if the last search failed. */) But it was ill-conceived: those supposedly-internal markers get exposed via the undo-list, so freeing them here is unsafe. */ -DEFUE ("set-match-data", Fset_match_data, Sset_match_data, 1, 2, 0, +DEFUN ("set-match-data", Fset_match_data, Sset_match_data, 1, 2, 0, doc: /* Set internal data on last search match from elements of LIST. LIST should have been created by calling `match-data' previously. diff --git a/src/syntax.c b/src/syntax.c index 518ba3bba15..ce203948b04 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1341,7 +1341,7 @@ scan_words (register EMACS_INT from, register EMACS_INT count) return from; } -DEFUE ("forward-word", Fforward_word, Sforward_word, 0, 1, "^p", +DEFUN ("forward-word", Fforward_word, Sforward_word, 0, 1, "^p", doc: /* Move point forward ARG words (backward if ARG is negative). Normally returns t. If an edge of the buffer or a field boundary is reached, point is left there @@ -1370,7 +1370,7 @@ and the function returns nil. Field boundaries are not noticed if return val == orig_val ? Qt : Qnil; } -DEFUE ("skip-chars-forward", Fskip_chars_forward, Sskip_chars_forward, 1, 2, 0, +DEFUN ("skip-chars-forward", Fskip_chars_forward, Sskip_chars_forward, 1, 2, 0, doc: /* Move point forward, stopping before a char not in STRING, or at pos LIM. STRING is like the inside of a `[...]' in a regular expression except that `]' is never special and `\\' quotes `^', `-' or `\\' @@ -1385,7 +1385,7 @@ Returns the distance traveled, either zero or positive. */) return skip_chars (1, string, lim, 1); } -DEFUE ("skip-chars-backward", Fskip_chars_backward, Sskip_chars_backward, 1, 2, 0, +DEFUN ("skip-chars-backward", Fskip_chars_backward, Sskip_chars_backward, 1, 2, 0, doc: /* Move point backward, stopping after a char not in STRING, or at pos LIM. See `skip-chars-forward' for details. Returns the distance traveled, either zero or negative. */) diff --git a/src/term.c b/src/term.c index f70dd227878..df13d7c0db2 100644 --- a/src/term.c +++ b/src/term.c @@ -2413,7 +2413,7 @@ get_named_tty (const char *name) } -DEFUE ("tty-type", Ftty_type, Stty_type, 0, 1, 0, +DEFUN ("tty-type", Ftty_type, Stty_type, 0, 1, 0, doc: /* Return the type of the tty device that TERMINAL uses. Returns nil if TERMINAL is not on a tty device. diff --git a/src/terminal.c b/src/terminal.c index 7382622182f..c5185601fb6 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -305,7 +305,7 @@ delete_terminal (struct terminal *terminal) Lisp_Object Qrun_hook_with_args; static Lisp_Object Qdelete_terminal_functions; -DEFUE ("delete-terminal", Fdelete_terminal, Sdelete_terminal, 0, 2, 0, +DEFUN ("delete-terminal", Fdelete_terminal, Sdelete_terminal, 0, 2, 0, doc: /* Delete TERMINAL by deleting all frames on it and closing the terminal. TERMINAL may be a terminal object, a frame, or nil (meaning the selected frame's terminal). @@ -348,7 +348,7 @@ but if the second argument FORCE is non-nil, you may do so. */) } -DEFUE ("frame-terminal", Fframe_terminal, Sframe_terminal, 0, 1, 0, +DEFUN ("frame-terminal", Fframe_terminal, Sframe_terminal, 0, 1, 0, doc: /* Return the terminal that FRAME is displayed on. If FRAME is nil, the selected frame is used. diff --git a/src/textprop.c b/src/textprop.c index e85b041891c..7ce488334e8 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -548,7 +548,7 @@ interval_of (int position, Lisp_Object object) return find_interval (i, position); } -DEFUE ("text-properties-at", Ftext_properties_at, +DEFUN ("text-properties-at", Ftext_properties_at, Stext_properties_at, 1, 2, 0, doc: /* Return the list of properties of the character at POSITION in OBJECT. If the optional second argument OBJECT is a buffer (or nil, which means @@ -575,7 +575,7 @@ If POSITION is at the end of OBJECT, the value is nil. */) return i->plist; } -DEFUE ("get-text-property", Fget_text_property, Sget_text_property, 2, 3, 0, +DEFUN ("get-text-property", Fget_text_property, Sget_text_property, 2, 3, 0, doc: /* Return the value of POSITION's property PROP, in OBJECT. OBJECT is optional and defaults to the current buffer. If POSITION is at the end of OBJECT, the value is nil. */) @@ -650,7 +650,7 @@ get_char_property_and_overlay (Lisp_Object position, register Lisp_Object prop, return Fget_text_property (position, prop, object); } -DEFUE ("get-char-property", Fget_char_property, Sget_char_property, 2, 3, 0, +DEFUN ("get-char-property", Fget_char_property, Sget_char_property, 2, 3, 0, doc: /* Return the value of POSITION's property PROP, in OBJECT. Both overlay properties and text properties are checked. OBJECT is optional and defaults to the current buffer. @@ -687,7 +687,7 @@ POSITION is at the end of OBJECT, both car and cdr are nil. */) } -DEFUE ("next-char-property-change", Fnext_char_property_change, +DEFUN ("next-char-property-change", Fnext_char_property_change, Snext_char_property_change, 1, 2, 0, doc: /* Return the position of next text property or overlay change. This scans characters forward in the current buffer from POSITION till @@ -712,7 +712,7 @@ LIMIT is a no-op if it is greater than (point-max). */) return Fnext_property_change (position, Qnil, temp); } -DEFUE ("previous-char-property-change", Fprevious_char_property_change, +DEFUN ("previous-char-property-change", Fprevious_char_property_change, Sprevious_char_property_change, 1, 2, 0, doc: /* Return the position of previous text property or overlay change. Scans characters backward in the current buffer from POSITION till it @@ -738,7 +738,7 @@ LIMIT is a no-op if it is less than (point-min). */) } -DEFUE ("next-single-char-property-change", Fnext_single_char_property_change, +DEFUN ("next-single-char-property-change", Fnext_single_char_property_change, Snext_single_char_property_change, 2, 4, 0, doc: /* Return the position of next text property or overlay change for a specific property. Scans characters forward from POSITION till it finds @@ -821,7 +821,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) return position; } -DEFUE ("previous-single-char-property-change", +DEFUN ("previous-single-char-property-change", Fprevious_single_char_property_change, Sprevious_single_char_property_change, 2, 4, 0, doc: /* Return the position of previous text property or overlay change for a specific property. @@ -914,7 +914,7 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT. */) return position; } -DEFUE ("next-property-change", Fnext_property_change, +DEFUN ("next-property-change", Fnext_property_change, Snext_property_change, 1, 3, 0, doc: /* Return the position of next property change. Scans characters forward from POSITION in OBJECT till it finds @@ -978,7 +978,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) return make_number (next->position); } -DEFUE ("next-single-property-change", Fnext_single_property_change, +DEFUN ("next-single-property-change", Fnext_single_property_change, Snext_single_property_change, 2, 4, 0, doc: /* Return the position of next property change for a specific property. Scans characters forward from POSITION till it finds @@ -1026,7 +1026,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) return make_number (next->position); } -DEFUE ("previous-property-change", Fprevious_property_change, +DEFUN ("previous-property-change", Fprevious_property_change, Sprevious_property_change, 1, 3, 0, doc: /* Return the position of previous property change. Scans characters backwards from POSITION in OBJECT till it finds @@ -1073,7 +1073,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT. */) return make_number (previous->position + LENGTH (previous)); } -DEFUE ("previous-single-property-change", Fprevious_single_property_change, +DEFUN ("previous-single-property-change", Fprevious_single_property_change, Sprevious_single_property_change, 2, 4, 0, doc: /* Return the position of previous property change for a specific property. Scans characters backward from POSITION till it finds @@ -1127,7 +1127,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT. */) /* Callers note, this can GC when OBJECT is a buffer (or nil). */ -DEFUE ("add-text-properties", Fadd_text_properties, +DEFUN ("add-text-properties", Fadd_text_properties, Sadd_text_properties, 3, 4, 0, doc: /* Add properties to the text from START to END. The third argument PROPERTIES is a property list @@ -1236,7 +1236,7 @@ Return t if any property value actually changed, nil otherwise. */) /* Callers note, this can GC when OBJECT is a buffer (or nil). */ -DEFUE ("put-text-property", Fput_text_property, +DEFUN ("put-text-property", Fput_text_property, Sput_text_property, 4, 5, 0, doc: /* Set one property of the text from START to END. The third and fourth arguments PROPERTY and VALUE @@ -1252,7 +1252,7 @@ markers). If OBJECT is a string, START and END are 0-based indices into it. */ return Qnil; } -DEFUE ("set-text-properties", Fset_text_properties, +DEFUN ("set-text-properties", Fset_text_properties, Sset_text_properties, 3, 4, 0, doc: /* Completely replace properties of text from START to END. The third argument PROPERTIES is the new property list. @@ -1419,7 +1419,7 @@ set_text_properties_1 (Lisp_Object start, Lisp_Object end, Lisp_Object propertie while (len > 0); } -DEFUE ("remove-text-properties", Fremove_text_properties, +DEFUN ("remove-text-properties", Fremove_text_properties, Sremove_text_properties, 3, 4, 0, doc: /* Remove some properties from text from START to END. The third argument PROPERTIES is a property list @@ -1509,7 +1509,7 @@ Use `set-text-properties' if you want to remove all text properties. */) } } -DEFUE ("remove-list-of-text-properties", Fremove_list_of_text_properties, +DEFUN ("remove-list-of-text-properties", Fremove_list_of_text_properties, Sremove_list_of_text_properties, 3, 4, 0, doc: /* Remove some properties from text from START to END. The third argument LIST-OF-PROPERTIES is a list of property names to remove. @@ -1619,7 +1619,7 @@ Return t if any property was actually removed, nil otherwise. */) } } -DEFUE ("text-property-any", Ftext_property_any, +DEFUN ("text-property-any", Ftext_property_any, Stext_property_any, 4, 5, 0, doc: /* Check text from START to END for property PROPERTY equalling VALUE. If so, return the position of the first character whose property PROPERTY diff --git a/src/undo.c b/src/undo.c index ba420fde817..80aff50d18a 100644 --- a/src/undo.c +++ b/src/undo.c @@ -270,7 +270,7 @@ record_property_change (EMACS_INT beg, EMACS_INT length, current_buffer = obuf; } -DEFUE ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0, +DEFUN ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0, doc: /* Mark a boundary between units of undo. An undo command will stop at this point, but another undo command will undo to the previous boundary. */) diff --git a/src/window.c b/src/window.c index 5b758ac698f..eef783268ee 100644 --- a/src/window.c +++ b/src/window.c @@ -217,7 +217,7 @@ make_window (void) return val; } -DEFUE ("selected-window", Fselected_window, Sselected_window, 0, 0, 0, +DEFUN ("selected-window", Fselected_window, Sselected_window, 0, 0, 0, doc: /* Return the window that the cursor now appears in and commands apply to. */) (void) { @@ -236,7 +236,7 @@ used by that frame. */) return FRAME_MINIBUF_WINDOW (XFRAME (frame)); } -DEFUE ("window-minibuffer-p", Fwindow_minibuffer_p, +DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 0, 1, 0, doc: /* Return non-nil if WINDOW is a minibuffer window. WINDOW defaults to the selected window. */) @@ -247,7 +247,7 @@ WINDOW defaults to the selected window. */) } -DEFUE ("pos-visible-in-window-p", Fpos_visible_in_window_p, +DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p, Spos_visible_in_window_p, 0, 3, 0, doc: /* Return non-nil if position POS is currently on the frame in WINDOW. Return nil if that position is scrolled vertically out of view. @@ -444,7 +444,7 @@ decode_any_window (register Lisp_Object window) return XWINDOW (window); } -DEFUE ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0, +DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0, doc: /* Return the buffer that WINDOW is displaying. WINDOW defaults to the selected window. */) (Lisp_Object window) @@ -1198,7 +1198,7 @@ if it isn't already recorded. */) return value; } -DEFUE ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0, +DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0, doc: /* Make point value in WINDOW be at position POS in WINDOW's buffer. Return POS. */) (Lisp_Object window, Lisp_Object pos) @@ -1245,7 +1245,7 @@ overriding motion of point in order to display at this exact start. */) } -DEFUE ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p, +DEFUN ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p, 0, 1, 0, doc: /* Return non-nil when WINDOW is dedicated to its buffer. More precisely, return the value assigned by the last call of @@ -1486,7 +1486,7 @@ and so is its new parent, we should make replacement's children be children of that parent instead. ***/ } -DEFUE ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "", +DEFUN ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "", doc: /* Remove WINDOW from its frame. WINDOW defaults to the selected window. Return nil. Signal an error when WINDOW is the only window on its frame. */) @@ -1947,7 +1947,7 @@ next_window (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames, in } -DEFUE ("next-window", Fnext_window, Snext_window, 0, 3, 0, +DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0, doc: /* Return window following WINDOW in cyclic ordering of windows. WINDOW defaults to the selected window. The optional arguments MINIBUF and ALL-FRAMES specify the set of windows to consider. @@ -2398,7 +2398,7 @@ If FRAME is a frame, search only that frame. */) frame); } -DEFUE ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 0, 2, 0, +DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 0, 2, 0, doc: /* Return a window currently displaying BUFFER-OR-NAME, or nil if none. BUFFER-OR-NAME may be a buffer or a buffer name and defaults to the current buffer. @@ -3445,7 +3445,7 @@ set_window_buffer (Lisp_Object window, Lisp_Object buffer, int run_hooks_p, int } -DEFUE ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0, +DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0, doc: /* Make WINDOW display BUFFER-OR-NAME as its contents. WINDOW defaults to the selected window. BUFFER-OR-NAME must be a buffer or the name of an existing buffer. Optional third argument KEEP-MARGINS @@ -3575,7 +3575,7 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap) /* Note that selected_window can be nil when this is called from Fset_window_configuration. */ -DEFUE ("select-window", Fselect_window, Sselect_window, 1, 2, 0, +DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0, doc: /* Select WINDOW. Most editing will apply to WINDOW's buffer. If WINDOW is not already selected, make WINDOW's buffer current and make WINDOW the frame's selected window. Return WINDOW. @@ -5503,7 +5503,7 @@ displayed_window_lines (struct window *w) } -DEFUE ("recenter", Frecenter, Srecenter, 0, 1, "P", +DEFUN ("recenter", Frecenter, Srecenter, 0, 1, "P", doc: /* Center point in selected window and maybe redisplay frame. With prefix argument ARG, recenter putting point on screen line ARG relative to the selected window. If ARG is negative, it counts up from the @@ -5856,7 +5856,7 @@ DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_config return XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame; } -DEFUE ("set-window-configuration", Fset_window_configuration, +DEFUN ("set-window-configuration", Fset_window_configuration, Sset_window_configuration, 1, 1, 0, doc: /* Set the configuration of windows and buffers as specified by CONFIGURATION. CONFIGURATION must be a value previously returned @@ -6353,7 +6353,7 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i) return i; } -DEFUE ("current-window-configuration", Fcurrent_window_configuration, +DEFUN ("current-window-configuration", Fcurrent_window_configuration, Scurrent_window_configuration, 0, 1, 0, doc: /* Return an object representing the current window configuration of FRAME. If FRAME is nil or omitted, use the selected frame. @@ -6545,7 +6545,7 @@ as nil. */) Fringes ***********************************************************************/ -DEFUE ("set-window-fringes", Fset_window_fringes, Sset_window_fringes, +DEFUN ("set-window-fringes", Fset_window_fringes, Sset_window_fringes, 2, 4, 0, doc: /* Set the fringe widths of window WINDOW. If WINDOW is nil, set the fringe widths of the currently selected @@ -6611,7 +6611,7 @@ Value is a list of the form (LEFT-WIDTH RIGHT-WIDTH OUTSIDE-MARGINS). */) Scroll bars ***********************************************************************/ -DEFUE ("set-window-scroll-bars", Fset_window_scroll_bars, +DEFUN ("set-window-scroll-bars", Fset_window_scroll_bars, Sset_window_scroll_bars, 2, 4, 0, doc: /* Set width and type of scroll bars of window WINDOW. If window is nil, set scroll bars of the currently selected window. diff --git a/src/xdisp.c b/src/xdisp.c index ecb0e34ed84..3370d84d67f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -16331,7 +16331,7 @@ dump_glyph_row (row, vpos, glyphs) } -DEFUE ("dump-glyph-matrix", Fdump_glyph_matrix, +DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix, Sdump_glyph_matrix, 0, 1, "p", doc: /* Dump the current matrix of the selected window to stderr. Shows contents of glyph row structures. With non-nil @@ -16353,7 +16353,7 @@ glyphs in short form, otherwise show glyphs in long form. */) } -DEFUE ("dump-frame-glyph-matrix", Fdump_frame_glyph_matrix, +DEFUN ("dump-frame-glyph-matrix", Fdump_frame_glyph_matrix, Sdump_frame_glyph_matrix, 0, 0, "", doc: /* */) (void) { @@ -16363,7 +16363,7 @@ DEFUE ("dump-frame-glyph-matrix", Fdump_frame_glyph_matrix, } -DEFUE ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 2, "", +DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 2, "", doc: /* Dump glyph row ROW to stderr. GLYPH 0 means don't dump glyphs. GLYPH 1 means dump glyphs in short form. @@ -16384,7 +16384,7 @@ GLYPH > 1 or omitted means dump glyphs in long form. */) } -DEFUE ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, 1, 2, "", +DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, 1, 2, "", doc: /* Dump glyph row ROW of the tool-bar of the current frame to stderr. GLYPH 0 means don't dump glyphs. GLYPH 1 means dump glyphs in short form. @@ -16404,7 +16404,7 @@ GLYPH > 1 or omitted means dump glyphs in long form. */) } -DEFUE ("trace-redisplay", Ftrace_redisplay, Strace_redisplay, 0, 1, "P", +DEFUN ("trace-redisplay", Ftrace_redisplay, Strace_redisplay, 0, 1, "P", doc: /* Toggle tracing of redisplay. With ARG, turn tracing on if and only if ARG is positive. */) (Lisp_Object arg) @@ -16421,7 +16421,7 @@ With ARG, turn tracing on if and only if ARG is positive. */) } -DEFUE ("trace-to-stderr", Ftrace_to_stderr, Strace_to_stderr, 1, MANY, "", +DEFUN ("trace-to-stderr", Ftrace_to_stderr, Strace_to_stderr, 1, MANY, "", doc: /* Like `format', but print result to stderr. usage: (trace-to-stderr STRING &rest OBJECTS) */) (size_t nargs, Lisp_Object *args) diff --git a/src/xfaces.c b/src/xfaces.c index 6330827b5cc..6d8acd77d87 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -564,7 +564,7 @@ unregister_colors (pixels, n) } -DEFUE ("dump-colors", Fdump_colors, Sdump_colors, 0, 0, 0, +DEFUN ("dump-colors", Fdump_colors, Sdump_colors, 0, 0, 0, doc: /* Dump currently allocated colors to stderr. */) (void) { @@ -883,7 +883,7 @@ clear_face_cache (int clear_fonts_p) } -DEFUE ("clear-face-cache", Fclear_face_cache, Sclear_face_cache, 0, 1, 0, +DEFUN ("clear-face-cache", Fclear_face_cache, Sclear_face_cache, 0, 1, 0, doc: /* Clear face caches on all frames. Optional THOROUGHLY non-nil means try to free unused fonts, too. */) (Lisp_Object thoroughly) @@ -6352,7 +6352,7 @@ dump_realized_face (face) } -DEFUE ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */) +DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */) (Lisp_Object n) { if (NILP (n)) @@ -6385,7 +6385,7 @@ DEFUE ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */) } -DEFUE ("show-face-resources", Fshow_face_resources, Sshow_face_resources, +DEFUN ("show-face-resources", Fshow_face_resources, Sshow_face_resources, 0, 0, 0, doc: /* */) (void) { diff --git a/src/xfns.c b/src/xfns.c index 50a56b55614..1182ef8e770 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3495,7 +3495,7 @@ x_get_focus_frame (struct frame *frame) policy. But I think it's okay to use when it's clearly done following a user-command. */ -DEFUE ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0, +DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0, doc: /* Set the input focus to FRAME. FRAME nil means use the selected frame. */) (Lisp_Object frame) @@ -3548,7 +3548,7 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0, return Qnil; } -DEFUE ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0, +DEFUN ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0, doc: /* Internal function called by `display-color-p', which see. */) (Lisp_Object terminal) { @@ -3570,7 +3570,7 @@ DEFUE ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0, } } -DEFUE ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p, +DEFUN ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p, 0, 1, 0, doc: /* Return t if the X display supports shades of gray. Note that color displays do support shades of gray. @@ -5198,7 +5198,7 @@ Text larger than the specified size is clipped. */) } -DEFUE ("x-hide-tip", Fx_hide_tip, Sx_hide_tip, 0, 0, 0, +DEFUN ("x-hide-tip", Fx_hide_tip, Sx_hide_tip, 0, 0, 0, doc: /* Hide the current tooltip window, if there is any. Value is t if tooltip was open, nil otherwise. */) (void) diff --git a/src/xmenu.c b/src/xmenu.c index 43badb94e54..6e84b845a46 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -203,7 +203,7 @@ mouse_position_for_popup (FRAME_PTR f, int *x, int *y) #ifdef HAVE_MENUS -DEFUE ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0, +DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0, doc: /* Pop up a dialog box and return user's selection. POSITION specifies which frame to use. This is normally a mouse button event or a window or frame. diff --git a/src/xsettings.c b/src/xsettings.c index 0d312f31bb9..d09b702a428 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -720,7 +720,7 @@ DEFUN ("font-get-system-font", Ffont_get_system_font, Sfont_get_system_font, : Qnil; } -DEFUE ("tool-bar-get-system-style", Ftool_bar_get_system_style, +DEFUN ("tool-bar-get-system-style", Ftool_bar_get_system_style, Stool_bar_get_system_style, 0, 0, 0, doc: /* Get the system tool bar style. If no system tool bar style is known, return `tool-bar-style' if set to a -- cgit v1.3