Commit 7ee72033 authored by Miles Bader's avatar Miles Bader
Browse files

Change doc-string comments to `new style' [w/`doc:' keyword].

parent 015a8883
...@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA. */
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
#define DOC_STRINGS_IN_COMMENTS
#include "lisp.h" #include "lisp.h"
#include "commands.h" #include "commands.h"
#include "buffer.h" #include "buffer.h"
...@@ -84,15 +84,15 @@ int last_abbrev_point; ...@@ -84,15 +84,15 @@ int last_abbrev_point;
Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook; Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;
DEFUN ("make-abbrev-table", Fmake_abbrev_table, Smake_abbrev_table, 0, 0, 0, DEFUN ("make-abbrev-table", Fmake_abbrev_table, Smake_abbrev_table, 0, 0, 0,
/* Create a new, empty abbrev table object. */ doc: /* Create a new, empty abbrev table object. */)
()) ()
{ {
return Fmake_vector (make_number (59), make_number (0)); return Fmake_vector (make_number (59), make_number (0));
} }
DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0, DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0,
/* Undefine all abbrevs in abbrev table TABLE, leaving it empty. */ doc: /* Undefine all abbrevs in abbrev table TABLE, leaving it empty. */)
(table)) (table)
Lisp_Object table; Lisp_Object table;
{ {
int i, size; int i, size;
...@@ -106,7 +106,7 @@ DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0, ...@@ -106,7 +106,7 @@ DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0,
} }
DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_abbrev, 3, 5, 0, DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_abbrev, 3, 5, 0,
/* Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK. doc: /* Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK.
NAME must be a string. NAME must be a string.
EXPANSION should usually be a string. EXPANSION should usually be a string.
To undefine an abbrev, define it with EXPANSION = nil. To undefine an abbrev, define it with EXPANSION = nil.
...@@ -115,8 +115,8 @@ it is called after EXPANSION is inserted. ...@@ -115,8 +115,8 @@ it is called after EXPANSION is inserted.
If EXPANSION is not a string, the abbrev is a special one, If EXPANSION is not a string, the abbrev is a special one,
which does not expand in the usual way but only runs HOOK. which does not expand in the usual way but only runs HOOK.
COUNT, if specified, initializes the abbrev's usage-count COUNT, if specified, initializes the abbrev's usage-count
which is incremented each time the abbrev is used. */ which is incremented each time the abbrev is used. */)
(table, name, expansion, hook, count)) (table, name, expansion, hook, count)
Lisp_Object table, name, expansion, hook, count; Lisp_Object table, name, expansion, hook, count;
{ {
Lisp_Object sym, oexp, ohook, tem; Lisp_Object sym, oexp, ohook, tem;
...@@ -149,8 +149,8 @@ which is incremented each time the abbrev is used. */ ...@@ -149,8 +149,8 @@ which is incremented each time the abbrev is used. */
DEFUN ("define-global-abbrev", Fdefine_global_abbrev, Sdefine_global_abbrev, 2, 2, DEFUN ("define-global-abbrev", Fdefine_global_abbrev, Sdefine_global_abbrev, 2, 2,
"sDefine global abbrev: \nsExpansion for %s: ", "sDefine global abbrev: \nsExpansion for %s: ",
/* Define ABBREV as a global abbreviation for EXPANSION. */ doc: /* Define ABBREV as a global abbreviation for EXPANSION. */)
(abbrev, expansion)) (abbrev, expansion)
Lisp_Object abbrev, expansion; Lisp_Object abbrev, expansion;
{ {
Fdefine_abbrev (Vglobal_abbrev_table, Fdowncase (abbrev), Fdefine_abbrev (Vglobal_abbrev_table, Fdowncase (abbrev),
...@@ -160,8 +160,8 @@ DEFUN ("define-global-abbrev", Fdefine_global_abbrev, Sdefine_global_abbrev, 2, ...@@ -160,8 +160,8 @@ DEFUN ("define-global-abbrev", Fdefine_global_abbrev, Sdefine_global_abbrev, 2,
DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev, Sdefine_mode_abbrev, 2, 2, DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev, Sdefine_mode_abbrev, 2, 2,
"sDefine mode abbrev: \nsExpansion for %s: ", "sDefine mode abbrev: \nsExpansion for %s: ",
/* Define ABBREV as a mode-specific abbreviation for EXPANSION. */ doc: /* Define ABBREV as a mode-specific abbreviation for EXPANSION. */)
(abbrev, expansion)) (abbrev, expansion)
Lisp_Object abbrev, expansion; Lisp_Object abbrev, expansion;
{ {
if (NILP (current_buffer->abbrev_table)) if (NILP (current_buffer->abbrev_table))
...@@ -173,13 +173,13 @@ DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev, Sdefine_mode_abbrev, 2, 2, ...@@ -173,13 +173,13 @@ DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev, Sdefine_mode_abbrev, 2, 2,
} }
DEFUN ("abbrev-symbol", Fabbrev_symbol, Sabbrev_symbol, 1, 2, 0, DEFUN ("abbrev-symbol", Fabbrev_symbol, Sabbrev_symbol, 1, 2, 0,
/* Return the symbol representing abbrev named ABBREV. doc: /* Return the symbol representing abbrev named ABBREV.
This symbol's name is ABBREV, but it is not the canonical symbol of that name; This symbol's name is ABBREV, but it is not the canonical symbol of that name;
it is interned in an abbrev-table rather than the normal obarray. it is interned in an abbrev-table rather than the normal obarray.
The value is nil if that abbrev is not defined. The value is nil if that abbrev is not defined.
Optional second arg TABLE is abbrev table to look it up in. Optional second arg TABLE is abbrev table to look it up in.
The default is to try buffer's mode-specific abbrev table, then global table. */ The default is to try buffer's mode-specific abbrev table, then global table. */)
(abbrev, table)) (abbrev, table)
Lisp_Object abbrev, table; Lisp_Object abbrev, table;
{ {
Lisp_Object sym; Lisp_Object sym;
...@@ -202,10 +202,10 @@ The default is to try buffer's mode-specific abbrev table, then global table. * ...@@ -202,10 +202,10 @@ The default is to try buffer's mode-specific abbrev table, then global table. *
} }
DEFUN ("abbrev-expansion", Fabbrev_expansion, Sabbrev_expansion, 1, 2, 0, DEFUN ("abbrev-expansion", Fabbrev_expansion, Sabbrev_expansion, 1, 2, 0,
/* Return the string that ABBREV expands into in the current buffer. doc: /* Return the string that ABBREV expands into in the current buffer.
Optionally specify an abbrev table as second arg; Optionally specify an abbrev table as second arg;
then ABBREV is looked up in that table only. */ then ABBREV is looked up in that table only. */)
(abbrev, table)) (abbrev, table)
Lisp_Object abbrev, table; Lisp_Object abbrev, table;
{ {
Lisp_Object sym; Lisp_Object sym;
...@@ -218,10 +218,10 @@ then ABBREV is looked up in that table only. */ ...@@ -218,10 +218,10 @@ then ABBREV is looked up in that table only. */
Returns 1 if an expansion is done. */ Returns 1 if an expansion is done. */
DEFUN ("expand-abbrev", Fexpand_abbrev, Sexpand_abbrev, 0, 0, "", DEFUN ("expand-abbrev", Fexpand_abbrev, Sexpand_abbrev, 0, 0, "",
/* Expand the abbrev before point, if there is an abbrev there. doc: /* Expand the abbrev before point, if there is an abbrev there.
Effective when explicitly called even when `abbrev-mode' is nil. Effective when explicitly called even when `abbrev-mode' is nil.
Returns the abbrev symbol, if expansion took place. */ Returns the abbrev symbol, if expansion took place. */)
()) ()
{ {
register char *buffer, *p; register char *buffer, *p;
int wordstart, wordend; int wordstart, wordend;
...@@ -389,10 +389,10 @@ Returns the abbrev symbol, if expansion took place. */ ...@@ -389,10 +389,10 @@ Returns the abbrev symbol, if expansion took place. */
} }
DEFUN ("unexpand-abbrev", Funexpand_abbrev, Sunexpand_abbrev, 0, 0, "", DEFUN ("unexpand-abbrev", Funexpand_abbrev, Sunexpand_abbrev, 0, 0, "",
/* Undo the expansion of the last abbrev that expanded. doc: /* Undo the expansion of the last abbrev that expanded.
This differs from ordinary undo in that other editing done since then This differs from ordinary undo in that other editing done since then
is not undone. */ is not undone. */)
()) ()
{ {
int opoint = PT; int opoint = PT;
int adjust = 0; int adjust = 0;
...@@ -467,13 +467,13 @@ describe_abbrev (sym, stream) ...@@ -467,13 +467,13 @@ describe_abbrev (sym, stream)
DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description, DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,
Sinsert_abbrev_table_description, 1, 2, 0, Sinsert_abbrev_table_description, 1, 2, 0,
/* Insert before point a full description of abbrev table named NAME. doc: /* Insert before point a full description of abbrev table named NAME.
NAME is a symbol whose value is an abbrev table. NAME is a symbol whose value is an abbrev table.
If optional 2nd arg READABLE is non-nil, a human-readable description If optional 2nd arg READABLE is non-nil, a human-readable description
is inserted. Otherwise the description is an expression, is inserted. Otherwise the description is an expression,
a call to `define-abbrev-table', which would a call to `define-abbrev-table', which would
define the abbrev table NAME exactly as it is currently defined. */ define the abbrev table NAME exactly as it is currently defined. */)
(name, readable)) (name, readable)
Lisp_Object name, readable; Lisp_Object name, readable;
{ {
Lisp_Object table; Lisp_Object table;
...@@ -507,10 +507,10 @@ define the abbrev table NAME exactly as it is currently defined. */ ...@@ -507,10 +507,10 @@ define the abbrev table NAME exactly as it is currently defined. */
DEFUN ("define-abbrev-table", Fdefine_abbrev_table, Sdefine_abbrev_table, DEFUN ("define-abbrev-table", Fdefine_abbrev_table, Sdefine_abbrev_table,
2, 2, 0, 2, 2, 0,
/* Define TABLENAME (a symbol) as an abbrev table name. doc: /* Define TABLENAME (a symbol) as an abbrev table name.
Define abbrevs in it according to DEFINITIONS, which is a list of elements Define abbrevs in it according to DEFINITIONS, which is a list of elements
of the form (ABBREVNAME EXPANSION HOOK USECOUNT). */ of the form (ABBREVNAME EXPANSION HOOK USECOUNT). */)
(tablename, definitions)) (tablename, definitions)
Lisp_Object tablename, definitions; Lisp_Object tablename, definitions;
{ {
Lisp_Object name, exp, hook, count; Lisp_Object name, exp, hook, count;
...@@ -541,64 +541,64 @@ of the form (ABBREVNAME EXPANSION HOOK USECOUNT). */ ...@@ -541,64 +541,64 @@ of the form (ABBREVNAME EXPANSION HOOK USECOUNT). */
void void
syms_of_abbrev () syms_of_abbrev ()
{ {
DEFVAR_LISP ("abbrev-table-name-list", &Vabbrev_table_name_list DEFVAR_LISP ("abbrev-table-name-list", &Vabbrev_table_name_list,
/* List of symbols whose values are abbrev tables. */); doc: /* List of symbols whose values are abbrev tables. */);
Vabbrev_table_name_list = Fcons (intern ("fundamental-mode-abbrev-table"), Vabbrev_table_name_list = Fcons (intern ("fundamental-mode-abbrev-table"),
Fcons (intern ("global-abbrev-table"), Fcons (intern ("global-abbrev-table"),
Qnil)); Qnil));
DEFVAR_LISP ("global-abbrev-table", &Vglobal_abbrev_table DEFVAR_LISP ("global-abbrev-table", &Vglobal_abbrev_table,
/* The abbrev table whose abbrevs affect all buffers. doc: /* The abbrev table whose abbrevs affect all buffers.
Each buffer may also have a local abbrev table. Each buffer may also have a local abbrev table.
If it does, the local table overrides the global one If it does, the local table overrides the global one
for any particular abbrev defined in both. */); for any particular abbrev defined in both. */);
Vglobal_abbrev_table = Fmake_abbrev_table (); Vglobal_abbrev_table = Fmake_abbrev_table ();
DEFVAR_LISP ("fundamental-mode-abbrev-table", &Vfundamental_mode_abbrev_table DEFVAR_LISP ("fundamental-mode-abbrev-table", &Vfundamental_mode_abbrev_table,
/* The abbrev table of mode-specific abbrevs for Fundamental Mode. */); doc: /* The abbrev table of mode-specific abbrevs for Fundamental Mode. */);
Vfundamental_mode_abbrev_table = Fmake_abbrev_table (); Vfundamental_mode_abbrev_table = Fmake_abbrev_table ();
current_buffer->abbrev_table = Vfundamental_mode_abbrev_table; current_buffer->abbrev_table = Vfundamental_mode_abbrev_table;
buffer_defaults.abbrev_table = Vfundamental_mode_abbrev_table; buffer_defaults.abbrev_table = Vfundamental_mode_abbrev_table;
DEFVAR_LISP ("last-abbrev", &Vlast_abbrev DEFVAR_LISP ("last-abbrev", &Vlast_abbrev,
/* The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'. */); doc: /* The abbrev-symbol of the last abbrev expanded. See `abbrev-symbol'. */);
DEFVAR_LISP ("last-abbrev-text", &Vlast_abbrev_text DEFVAR_LISP ("last-abbrev-text", &Vlast_abbrev_text,
/* The exact text of the last abbrev expanded. doc: /* The exact text of the last abbrev expanded.
nil if the abbrev has already been unexpanded. */); nil if the abbrev has already been unexpanded. */);
DEFVAR_INT ("last-abbrev-location", &last_abbrev_point DEFVAR_INT ("last-abbrev-location", &last_abbrev_point,
/* The location of the start of the last abbrev expanded. */); doc: /* The location of the start of the last abbrev expanded. */);
Vlast_abbrev = Qnil; Vlast_abbrev = Qnil;
Vlast_abbrev_text = Qnil; Vlast_abbrev_text = Qnil;
last_abbrev_point = 0; last_abbrev_point = 0;
DEFVAR_LISP ("abbrev-start-location", &Vabbrev_start_location DEFVAR_LISP ("abbrev-start-location", &Vabbrev_start_location,
/* Buffer position for `expand-abbrev' to use as the start of the abbrev. doc: /* Buffer position for `expand-abbrev' to use as the start of the abbrev.
nil means use the word before point as the abbrev. nil means use the word before point as the abbrev.
Calling `expand-abbrev' sets this to nil. */); Calling `expand-abbrev' sets this to nil. */);
Vabbrev_start_location = Qnil; Vabbrev_start_location = Qnil;
DEFVAR_LISP ("abbrev-start-location-buffer", &Vabbrev_start_location_buffer DEFVAR_LISP ("abbrev-start-location-buffer", &Vabbrev_start_location_buffer,
/* Buffer that `abbrev-start-location' has been set for. doc: /* Buffer that `abbrev-start-location' has been set for.
Trying to expand an abbrev in any other buffer clears `abbrev-start-location'. */); Trying to expand an abbrev in any other buffer clears `abbrev-start-location'. */);
Vabbrev_start_location_buffer = Qnil; Vabbrev_start_location_buffer = Qnil;
DEFVAR_PER_BUFFER ("local-abbrev-table", &current_buffer->abbrev_table, Qnil DEFVAR_PER_BUFFER ("local-abbrev-table", &current_buffer->abbrev_table, Qnil,
/* Local (mode-specific) abbrev table of current buffer. */); doc: /* Local (mode-specific) abbrev table of current buffer. */);
DEFVAR_BOOL ("abbrevs-changed", &abbrevs_changed DEFVAR_BOOL ("abbrevs-changed", &abbrevs_changed,
/* Set non-nil by defining or altering any word abbrevs. doc: /* Set non-nil by defining or altering any word abbrevs.
This causes `save-some-buffers' to offer to save the abbrevs. */); This causes `save-some-buffers' to offer to save the abbrevs. */);
abbrevs_changed = 0; abbrevs_changed = 0;
DEFVAR_BOOL ("abbrev-all-caps", &abbrev_all_caps DEFVAR_BOOL ("abbrev-all-caps", &abbrev_all_caps,
/* *Set non-nil means expand multi-word abbrevs all caps if abbrev was so. */); doc: /* *Set non-nil means expand multi-word abbrevs all caps if abbrev was so. */);
abbrev_all_caps = 0; abbrev_all_caps = 0;
DEFVAR_LISP ("pre-abbrev-expand-hook", &Vpre_abbrev_expand_hook DEFVAR_LISP ("pre-abbrev-expand-hook", &Vpre_abbrev_expand_hook,
/* Function or functions to be called before abbrev expansion is done. doc: /* Function or functions to be called before abbrev expansion is done.
This is the first thing that `expand-abbrev' does, and so this may change This is the first thing that `expand-abbrev' does, and so this may change
the current abbrev table before abbrev lookup happens. */); the current abbrev table before abbrev lookup happens. */);
Vpre_abbrev_expand_hook = Qnil; Vpre_abbrev_expand_hook = Qnil;
......
...@@ -38,7 +38,6 @@ Boston, MA 02111-1307, USA. */ ...@@ -38,7 +38,6 @@ Boston, MA 02111-1307, USA. */
replaced, this file likely will not be used. */ replaced, this file likely will not be used. */
#undef HIDE_LISP_IMPLEMENTATION #undef HIDE_LISP_IMPLEMENTATION
#define DOC_STRINGS_IN_COMMENTS
#include "lisp.h" #include "lisp.h"
#include "process.h" #include "process.h"
#include "intervals.h" #include "intervals.h"
...@@ -1660,9 +1659,9 @@ compact_small_strings () ...@@ -1660,9 +1659,9 @@ compact_small_strings ()
DEFUN ("make-string", Fmake_string, Smake_string, 2, 2, 0, DEFUN ("make-string", Fmake_string, Smake_string, 2, 2, 0,
/* Return a newly created string of length LENGTH, with each element being INIT. doc: /* Return a newly created string of length LENGTH, with each element being INIT.
Both LENGTH and INIT must be numbers. */ Both LENGTH and INIT must be numbers. */)
(length, init)) (length, init)
Lisp_Object length, init; Lisp_Object length, init;
{ {
register Lisp_Object val; register Lisp_Object val;
...@@ -1704,9 +1703,9 @@ Both LENGTH and INIT must be numbers. */ ...@@ -1704,9 +1703,9 @@ Both LENGTH and INIT must be numbers. */
DEFUN ("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,
/* Return a new bool-vector of length LENGTH, using INIT for as each element. doc: /* Return a new bool-vector of length LENGTH, using INIT for as each element.
LENGTH must be a number. INIT matters only in whether it is t or nil. */ LENGTH must be a number. INIT matters only in whether it is t or nil. */)
(length, init)) (length, init)
Lisp_Object length, init; Lisp_Object length, init;
{ {
register Lisp_Object val; register Lisp_Object val;
...@@ -2058,8 +2057,8 @@ free_cons (ptr) ...@@ -2058,8 +2057,8 @@ free_cons (ptr)
DEFUN ("cons", Fcons, Scons, 2, 2, 0, DEFUN ("cons", Fcons, Scons, 2, 2, 0,
/* Create a new cons, give it CAR and CDR as components, and return it. */ doc: /* Create a new cons, give it CAR and CDR as components, and return it. */)
(car, cdr)) (car, cdr)
Lisp_Object car, cdr; Lisp_Object car, cdr;
{ {
register Lisp_Object val; register Lisp_Object val;
...@@ -2131,9 +2130,9 @@ list5 (arg1, arg2, arg3, arg4, arg5) ...@@ -2131,9 +2130,9 @@ list5 (arg1, arg2, arg3, arg4, arg5)
DEFUN ("list", Flist, Slist, 0, MANY, 0, DEFUN ("list", Flist, Slist, 0, MANY, 0,
/* Return a newly created list with specified arguments as elements. doc: /* Return a newly created list with specified arguments as elements.
Any number of arguments, even zero arguments, are allowed. */ Any number of arguments, even zero arguments, are allowed. */)
(nargs, args)) (nargs, args)
int nargs; int nargs;
register Lisp_Object *args; register Lisp_Object *args;
{ {
...@@ -2150,8 +2149,8 @@ Any number of arguments, even zero arguments, are allowed. */ ...@@ -2150,8 +2149,8 @@ Any number of arguments, even zero arguments, are allowed. */
DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0, DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0,
/* Return a newly created list of length LENGTH, with each element being INIT. */ doc: /* Return a newly created list of length LENGTH, with each element being INIT. */)
(length, init)) (length, init)
register Lisp_Object length, init; register Lisp_Object length, init;
{ {
register Lisp_Object val; register Lisp_Object val;
...@@ -2337,9 +2336,9 @@ allocate_other_vector (len) ...@@ -2337,9 +2336,9 @@ allocate_other_vector (len)
DEFUN ("make-vector", Fmake_vector, Smake_vector, 2, 2, 0, DEFUN ("make-vector", Fmake_vector, Smake_vector, 2, 2, 0,
/* Return a newly created vector of length LENGTH, with each element being INIT. doc: /* Return a newly created vector of length LENGTH, with each element being INIT.
See also the function `vector'. */ See also the function `vector'. */)
(length, init)) (length, init)
register Lisp_Object length, init; register Lisp_Object length, init;
{ {
Lisp_Object vector; Lisp_Object vector;
...@@ -2360,11 +2359,11 @@ See also the function `vector'. */ ...@@ -2360,11 +2359,11 @@ See also the function `vector'. */
DEFUN ("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,
/* Return a newly created char-table, with purpose PURPOSE. doc: /* Return a newly created char-table, with purpose PURPOSE.
Each element is initialized to INIT, which defaults to nil. Each element is initialized to INIT, which defaults to nil.
PURPOSE should be a symbol which has a `char-table-extra-slots' property. PURPOSE should be a symbol which has a `char-table-extra-slots' property.
The property's value should be an integer between 0 and 10. */ The property's value should be an integer between 0 and 10. */)
(purpose, init)) (purpose, init)
register Lisp_Object purpose, init; register Lisp_Object purpose, init;
{ {
Lisp_Object vector; Lisp_Object vector;
...@@ -2403,9 +2402,9 @@ make_sub_char_table (defalt) ...@@ -2403,9 +2402,9 @@ make_sub_char_table (defalt)
DEFUN ("vector", Fvector, Svector, 0, MANY, 0, DEFUN ("vector", Fvector, Svector, 0, MANY, 0,
/* Return a newly created vector with specified arguments as elements. doc: /* Return a newly created vector with specified arguments as elements.
Any number of arguments, even zero arguments, are allowed. */ Any number of arguments, even zero arguments, are allowed. */)
(nargs, args)) (nargs, args)
register int nargs; register int nargs;
Lisp_Object *args; Lisp_Object *args;
{ {
...@@ -2423,12 +2422,12 @@ Any number of arguments, even zero arguments, are allowed. */ ...@@ -2423,12 +2422,12 @@ Any number of arguments, even zero arguments, are allowed. */
DEFUN ("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,
/* Create a byte-code object with specified arguments as elements. doc: /* Create a byte-code object with specified arguments as elements.
The arguments should be the arglist, bytecode-string, constant vector, The arguments should be the arglist, bytecode-string, constant vector,
stack size, (optional) doc string, and (optional) interactive spec. stack size, (optional) doc string, and (optional) interactive spec.
The first four arguments are required; at most six have any The first four arguments are required; at most six have any
significance. */ significance. */)
(nargs, args)) (nargs, args)
register int nargs; register int nargs;
Lisp_Object *args; Lisp_Object *args;
{ {
...@@ -2511,9 +2510,9 @@ init_symbol () ...@@ -2511,9 +2510,9 @@ init_symbol ()
DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0, DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0,
/* Return a newly allocated uninterned symbol whose name is NAME. doc: /* Return a newly allocated uninterned symbol whose name is NAME.
Its value and function definition are void, and its property list is nil. */ Its value and function definition are void, and its property list is nil. */)
(name)) (name)
Lisp_Object name; Lisp_Object name;
{ {
register Lisp_Object val; register Lisp_Object val;
...@@ -2629,8 +2628,8 @@ allocate_misc () ...@@ -2629,8 +2628,8 @@ allocate_misc ()
} }
DEFUN ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0, DEFUN ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0,
/* Return a newly allocated marker which does not point at any place. */ doc: /* Return a newly allocated marker which does not point at any place. */)
()) ()
{ {
register Lisp_Object val; register Lisp_Object val;
register struct Lisp_Marker *p; register struct Lisp_Marker *p;
...@@ -3300,8 +3299,8 @@ static int max_live, max_zombies; ...@@ -3300,8 +3299,8 @@ static int max_live, max_zombies;
static double avg_live; static double avg_live;
DEFUN ("gc-status", Fgc_status, Sgc_status, 0, 0, "", DEFUN ("gc-status", Fgc_status, Sgc_status, 0, 0, "",
/* Show information about live and zombie objects. */ doc: /* Show information about live and zombie objects. */)
()) ()
{ {
Lisp_Object args[7]; Lisp_Object args[7];
args[0] = build_string ("%d GCs, avg live/zombies = %.2f/%.2f (%f%%), max %d/%d"); args[0] = build_string ("%d GCs, avg live/zombies = %.2f/%.2f (%f%%), max %d/%d");
...@@ -3540,7 +3539,7 @@ mark_memory (start, end) ...@@ -3540,7 +3539,7 @@ mark_memory (start, end)
only a pointer to them remains. Example: only a pointer to them remains. Example:
DEFUN ("testme", Ftestme, Stestme, 0, 0, 0, "") DEFUN ("testme", Ftestme, Stestme, 0, 0, 0, "")
() ()
{ {
Lisp_Object obj = build_string ("test"); Lisp_Object obj = build_string ("test");
struct Lisp_String *s = XSTRING (obj); struct Lisp_String *s = XSTRING (obj);
...@@ -3919,10 +3918,10 @@ make_pure_vector (len) ...@@ -3919,10 +3918,10 @@ make_pure_vector (len)
DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0, DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0,
/* Make a copy of OBJECT in pure storage. doc: /* Make a copy of OBJECT in pure storage.
Recursively copies contents of vectors and cons cells. Recursively copies contents of vectors and cons cells.
Does not copy symbols. Copies strings without text properties. */ Does not copy symbols. Copies strings without text properties. */)
(obj)) (obj)
register Lisp_Object obj; register Lisp_Object obj;
{ {
if (NILP (Vpurify_flag)) if (NILP (Vpurify_flag))
...@@ -4016,15 +4015,15 @@ inhibit_garbage_collection () ...@@ -4016,15 +4015,15 @@ inhibit_garbage_collection ()
DEFUN ("garbage-collect", Fgarbage_collect, Sgarbage_collect, 0, 0, "", DEFUN ("garbage-collect", Fgarbage_collect, Sgarbage_collect, 0, 0, "",
/* Reclaim storage for Lisp objects no longer needed. doc: /* Reclaim storage for Lisp objects no longer needed.
Returns info on amount of space in use: Returns info on amount of space in use:
((USED-CONSES . FREE-CONSES) (USED-SYMS . FREE-SYMS) ((USED-CONSES . FREE-CONSES) (USED-SYMS . FREE-SYMS)
(USED-MARKERS . FREE-MARKERS) USED-STRING-CHARS USED-VECTOR-SLOTS (USED-MARKERS . FREE-MARKERS) USED-STRING-CHARS USED-VECTOR-SLOTS
(USED-FLOATS . FREE-FLOATS) (USED-INTERVALS . FREE-INTERVALS) (USED-FLOATS . FREE-FLOATS) (USED-INTERVALS . FREE-INTERVALS)
(USED-STRINGS . FREE-STRINGS)) (USED-STRINGS . FREE-STRINGS))
Garbage collection happens automatically if you cons more than Garbage collection happens automatically if you cons more than
`gc-cons-threshold' bytes of Lisp data since previous garbage collection. */ `gc-cons-threshold' bytes of Lisp data since previous garbage collection. */)
()) ()
{ {
register struct gcpro *tail; register struct gcpro *tail;
register struct specbinding *bind; register struct specbinding *bind;
...@@ -5321,10 +5320,10 @@ gc_sweep () ...@@ -5321,10 +5320,10 @@ gc_sweep ()
/* Debugging aids. */ /* Debugging aids. */
DEFUN ("memory-limit", Fmemory_limit, Smemory_limit, 0, 0, 0, DEFUN ("memory-limit", Fmemory_limit, Smemory_limit, 0, 0, 0,
/* Return the address of the last byte Emacs has allocated, divided by 1024. doc: /* Return the address of the last byte Emacs has allocated, divided by 1024.
This may be helpful in debugging Emacs's memory usage. This may be helpful in debugging Emacs's memory usage.
We divide the value by 1024 to make sure it fits in a Lisp integer. */ We divide the value by 1024 to make sure it fits in a Lisp integer. */)
()) ()
{ {
Lisp_Object end; Lisp_Object end;
...@@ -5334,7 +5333,7 @@ We divide the value by 1024 to make sure it fits in a Lisp integer. */ ...@@ -5334,7 +5333,7 @@ We divide the value by 1024 to make sure it fits in a Lisp integer. */
} }
DEFUN ("memory-use-counts", Fmemory_use_counts, Smemory_use_counts, 0, 0, 0, DEFUN ("memory-use-counts", Fmemory_use_counts, Smemory_use_counts, 0, 0, 0,
/* Return a list of counters that measure how much consing there has been. doc: /* Return a list of counters that measure how much consing there has been.
Each of these counters increments for a certain kind of object. Each of these counters increments for a certain kind of object.
The counters wrap around from the largest positive integer to zero. The counters wrap around from the largest positive integer to zero.
Garbage collection does not decrease them. Garbage collection does not decrease them.
...@@ -5345,8 +5344,8 @@ except for VECTOR-CELLS and STRING-CHARS, which count the total length of ...@@ -5345,8 +5344,8 @@ except for VECTOR-CELLS and STRING-CHARS, which count the total length of
objects consed. objects consed.
MISCS include overlays, markers, and some internal types. MISCS include overlays, markers, and some internal types.
Frames, windows, buffers, and subprocesses count as vectors Frames, windows, buffers, and subprocesses count as vectors
(but the contents of a buffer's text do not count here). */