Commit 5842a27b authored by Dan Nicolaescu's avatar Dan Nicolaescu

Convert DEFUNs to standard C.

* src/alloc.c: Convert DEFUNs to standard C.
* src/buffer.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/dosfns.c:
* src/editfns.c:
* src/emacs.c:
* src/eval.c:
* src/fileio.c:
* src/filelock.c:
* src/floatfns.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/image.c:
* src/indent.c:
* src/insdel.c:
* src/keyboard.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/menu.c:
* src/minibuf.c:
* src/msdos.c:
* src/nsfns.m:
* src/nsmenu.m:
* src/nsselect.m:
* src/print.c:
* src/process.c:
* src/search.c:
* src/sound.c:
* src/syntax.c:
* src/term.c:
* src/terminal.c:
* src/textprop.c:
* src/undo.c:
* src/w16select.c:
* src/w32console.c:
* src/w32fns.c:
* src/w32font.c:
* src/w32menu.c:
* src/w32proc.c:
* src/w32select.c:
* src/window.c:
* src/xdisp.c:
* src/xfaces.c:
* src/xfns.c:
* src/xmenu.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c: Likewise.
parent 71c44c04
2010-07-08 Dan Nicolaescu <dann@ics.uci.edu>
* alloc.c: Convert DEFUNs to standard C.
* buffer.c:
* bytecode.c:
* callint.c:
* callproc.c:
* casefiddle.c:
* casetab.c:
* category.c:
* character.c:
* charset.c:
* chartab.c:
* cmds.c:
* coding.c:
* composite.c:
* data.c:
* dbusbind.c:
* dired.c:
* dispnew.c:
* doc.c:
* dosfns.c:
* editfns.c:
* emacs.c:
* eval.c:
* fileio.c:
* filelock.c:
* floatfns.c:
* fns.c:
* font.c:
* fontset.c:
* frame.c:
* fringe.c:
* image.c:
* indent.c:
* insdel.c:
* keyboard.c:
* keymap.c:
* lread.c:
* macros.c:
* marker.c:
* menu.c:
* minibuf.c:
* msdos.c:
* nsfns.m:
* nsmenu.m:
* nsselect.m:
* print.c:
* process.c:
* search.c:
* sound.c:
* syntax.c:
* term.c:
* terminal.c:
* textprop.c:
* undo.c:
* w16select.c:
* w32console.c:
* w32fns.c:
* w32font.c:
* w32menu.c:
* w32proc.c:
* w32select.c:
* window.c:
* xdisp.c:
* xfaces.c:
* xfns.c:
* xmenu.c:
* xselect.c:
* xsettings.c:
* xsmfns.c: Likewise.
2010-07-08 Eli Zaretskii <eliz@gnu.org>
* process.c (kbd_is_on_hold, hold_keyboard_input)
......
......@@ -2250,8 +2250,7 @@ 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. */)
(length, init)
Lisp_Object length, init;
(Lisp_Object length, Lisp_Object init)
{
register Lisp_Object val;
register unsigned char *p, *end;
......@@ -2294,8 +2293,7 @@ INIT must be an integer that represents a character. */)
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. */)
(length, init)
Lisp_Object length, init;
(Lisp_Object length, Lisp_Object init)
{
register Lisp_Object val;
struct Lisp_Bool_Vector *p;
......@@ -2687,8 +2685,7 @@ free_cons (struct Lisp_Cons *ptr)
DEFUN ("cons", Fcons, Scons, 2, 2, 0,
doc: /* Create a new cons, give it CAR and CDR as components, and return it. */)
(car, cdr)
Lisp_Object car, cdr;
(Lisp_Object car, Lisp_Object cdr)
{
register Lisp_Object val;
......@@ -2783,9 +2780,7 @@ 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) */)
(nargs, args)
int nargs;
register Lisp_Object *args;
(int nargs, register Lisp_Object *args)
{
register Lisp_Object val;
val = Qnil;
......@@ -2801,8 +2796,7 @@ usage: (list &rest OBJECTS) */)
DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0,
doc: /* Return a newly created list of length LENGTH, with each element being INIT. */)
(length, init)
register Lisp_Object length, init;
(register Lisp_Object length, Lisp_Object init)
{
register Lisp_Object val;
register int size;
......@@ -2979,8 +2973,7 @@ allocate_process (void)
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'. */)
(length, init)
register Lisp_Object length, init;
(register Lisp_Object length, Lisp_Object init)
{
Lisp_Object vector;
register EMACS_INT sizei;
......@@ -3003,9 +2996,7 @@ 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) */)
(nargs, args)
register int nargs;
Lisp_Object *args;
(register int nargs, Lisp_Object *args)
{
register Lisp_Object len, val;
register int index;
......@@ -3027,9 +3018,7 @@ stack size, (optional) doc string, and (optional) interactive spec.
The first four arguments are required; at most six have any
significance.
usage: (make-byte-code ARGLIST BYTE-CODE CONSTANTS DEPTH &optional DOCSTRING INTERACTIVE-SPEC &rest ELEMENTS) */)
(nargs, args)
register int nargs;
Lisp_Object *args;
(register int nargs, Lisp_Object *args)
{
register Lisp_Object len, val;
register int index;
......@@ -3111,8 +3100,7 @@ init_symbol (void)
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. */)
(name)
Lisp_Object name;
(Lisp_Object name)
{
register Lisp_Object val;
register struct Lisp_Symbol *p;
......@@ -3273,7 +3261,7 @@ make_save_value (void *pointer, int integer)
DEFUN ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0,
doc: /* Return a newly allocated marker which does not point at any place. */)
()
(void)
{
register Lisp_Object val;
register struct Lisp_Marker *p;
......@@ -4002,7 +3990,7 @@ static double avg_live;
DEFUN ("gc-status", Fgc_status, Sgc_status, 0, 0, "",
doc: /* Show information about live and zombie objects. */)
()
(void)
{
Lisp_Object args[8], zombie_list = Qnil;
int i;
......@@ -4796,8 +4784,7 @@ 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. */)
(obj)
register Lisp_Object obj;
(register Lisp_Object obj)
{
if (NILP (Vpurify_flag))
return obj;
......@@ -4898,7 +4885,7 @@ Garbage collection happens automatically if you cons more than
(USED-STRINGS . FREE-STRINGS))
However, if there was overflow in pure space, `garbage-collect'
returns nil, because real GC can't be done. */)
()
(void)
{
register struct specbinding *bind;
struct catchtag *catch;
......@@ -6115,7 +6102,7 @@ DEFUN ("memory-limit", Fmemory_limit, Smemory_limit, 0, 0, 0,
doc: /* Return the address of the last byte Emacs has allocated, divided by 1024.
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. */)
()
(void)
{
Lisp_Object end;
......@@ -6137,7 +6124,7 @@ objects consed.
MISCS include overlays, markers, and some internal types.
Frames, windows, buffers, and subprocesses count as vectors
(but the contents of a buffer's text do not count here). */)
()
(void)
{
Lisp_Object consed[8];
......
This diff is collapsed.
......@@ -403,8 +403,7 @@ The first argument, BYTESTR, is a string of byte code;
the second, VECTOR, a vector of constants;
the third, MAXDEPTH, the maximum stack depth used in this function.
If the third argument is incorrect, Emacs may crash. */)
(bytestr, vector, maxdepth)
Lisp_Object bytestr, vector, maxdepth;
(Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth)
{
int count = SPECPDL_INDEX ();
#ifdef BYTE_CODE_METER
......
......@@ -131,8 +131,7 @@ If the string begins with `^' and `shift-select-mode' is non-nil,
You may use `@', `*', and `^' together. They are processed in the
order that they appear, before reading any arguments.
usage: (interactive &optional ARGS) */)
(args)
Lisp_Object args;
(Lisp_Object args)
{
return Qnil;
}
......@@ -263,8 +262,7 @@ Optional third arg KEYS, if given, specifies the sequence of events to
supply, as a vector, if the command inquires which events were used to
invoke it. If KEYS is omitted or nil, the return value of
`this-command-keys-vector' is used. */)
(function, record_flag, keys)
Lisp_Object function, record_flag, keys;
(Lisp_Object function, Lisp_Object record_flag, Lisp_Object keys)
{
Lisp_Object *args, *visargs;
Lisp_Object specs;
......@@ -872,8 +870,7 @@ DEFUN ("prefix-numeric-value", Fprefix_numeric_value, Sprefix_numeric_value,
doc: /* Return numeric meaning of raw prefix argument RAW.
A raw prefix argument is what you get from `(interactive "P")'.
Its numeric meaning is what you would get from `(interactive "p")'. */)
(raw)
Lisp_Object raw;
(Lisp_Object raw)
{
Lisp_Object val;
......
......@@ -215,9 +215,7 @@ and returns a numeric exit status or a signal description string.
If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.
usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
(nargs, args)
int nargs;
register Lisp_Object *args;
(int nargs, register Lisp_Object *args)
{
Lisp_Object infile, buffer, current_dir, path;
int display_p;
......@@ -877,9 +875,7 @@ and returns a numeric exit status or a signal description string.
If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.
usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &rest ARGS) */)
(nargs, args)
int nargs;
register Lisp_Object *args;
(int nargs, register Lisp_Object *args)
{
struct gcpro gcpro1;
Lisp_Object filename_string;
......@@ -1383,8 +1379,7 @@ This function searches `process-environment' for VARIABLE.
If optional parameter ENV is a list, then search this list instead of
`process-environment', and return t when encountering a negative entry
\(an entry for a variable with no value). */)
(variable, env)
Lisp_Object variable, env;
(Lisp_Object variable, Lisp_Object env)
{
char *value;
int valuelen;
......
......@@ -153,8 +153,7 @@ DEFUN ("upcase", Fupcase, Supcase, 1, 1, 0,
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.
See also `capitalize', `downcase' and `upcase-initials'. */)
(obj)
Lisp_Object obj;
(Lisp_Object obj)
{
return casify_object (CASE_UP, obj);
}
......@@ -163,8 +162,7 @@ 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. */)
(obj)
Lisp_Object obj;
(Lisp_Object obj)
{
return casify_object (CASE_DOWN, obj);
}
......@@ -175,8 +173,7 @@ This means that each word's first character is upper case
and the rest is lower case.
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. */)
(obj)
Lisp_Object obj;
(Lisp_Object obj)
{
return casify_object (CASE_CAPITALIZE, obj);
}
......@@ -188,8 +185,7 @@ DEFUN ("upcase-initials", Fupcase_initials, Supcase_initials, 1, 1, 0,
Do not change the other letters of each word.
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. */)
(obj)
Lisp_Object obj;
(Lisp_Object obj)
{
return casify_object (CASE_CAPITALIZE_UP, obj);
}
......@@ -306,8 +302,7 @@ These arguments specify the starting and ending character numbers of
the region to operate on. When used as a command, the text between
point and the mark is operated on.
See also `capitalize-region'. */)
(beg, end)
Lisp_Object beg, end;
(Lisp_Object beg, Lisp_Object end)
{
casify_region (CASE_UP, beg, end);
return Qnil;
......@@ -318,8 +313,7 @@ DEFUN ("downcase-region", Fdowncase_region, Sdowncase_region, 2, 2, "r",
These arguments specify the starting and ending character numbers of
the region to operate on. When used as a command, the text between
point and the mark is operated on. */)
(beg, end)
Lisp_Object beg, end;
(Lisp_Object beg, Lisp_Object end)
{
casify_region (CASE_DOWN, beg, end);
return Qnil;
......@@ -331,8 +325,7 @@ Capitalized form means each word's first character is upper case
and the rest of it is lower case.
In programs, give two arguments, the starting and ending
character positions to operate on. */)
(beg, end)
Lisp_Object beg, end;
(Lisp_Object beg, Lisp_Object end)
{
casify_region (CASE_CAPITALIZE, beg, end);
return Qnil;
......@@ -346,8 +339,7 @@ DEFUN ("upcase-initials-region", Fupcase_initials_region,
Subsequent letters of each word are not changed.
In programs, give two arguments, the starting and ending
character positions to operate on. */)
(beg, end)
Lisp_Object beg, end;
(Lisp_Object beg, Lisp_Object end)
{
casify_region (CASE_CAPITALIZE_UP, beg, end);
return Qnil;
......@@ -376,8 +368,7 @@ DEFUN ("upcase-word", Fupcase_word, Supcase_word, 1, 1, "p",
doc: /* Convert following word (or ARG words) to upper case, moving over.
With negative argument, convert previous words but do not move.
See also `capitalize-word'. */)
(arg)
Lisp_Object arg;
(Lisp_Object arg)
{
Lisp_Object beg, end;
EMACS_INT newpoint;
......@@ -391,8 +382,7 @@ See also `capitalize-word'. */)
DEFUN ("downcase-word", Fdowncase_word, Sdowncase_word, 1, 1, "p",
doc: /* Convert following word (or ARG words) to lower case, moving over.
With negative argument, convert previous words but do not move. */)
(arg)
Lisp_Object arg;
(Lisp_Object arg)
{
Lisp_Object beg, end;
EMACS_INT newpoint;
......@@ -408,8 +398,7 @@ DEFUN ("capitalize-word", Fcapitalize_word, Scapitalize_word, 1, 1, "p",
This gives the word(s) a first character in upper case
and the rest lower case.
With negative argument, capitalize previous words but do not move. */)
(arg)
Lisp_Object arg;
(Lisp_Object arg)
{
Lisp_Object beg, end;
EMACS_INT newpoint;
......
......@@ -41,8 +41,7 @@ static void shuffle (Lisp_Object table, Lisp_Object c, Lisp_Object elt);
DEFUN ("case-table-p", Fcase_table_p, Scase_table_p, 1, 1, 0,
doc: /* Return t if OBJECT is a case table.
See `set-case-table' for more information on these data structures. */)
(object)
Lisp_Object object;
(Lisp_Object object)
{
Lisp_Object up, canon, eqv;
......@@ -71,7 +70,7 @@ check_case_table (Lisp_Object obj)
DEFUN ("current-case-table", Fcurrent_case_table, Scurrent_case_table, 0, 0, 0,
doc: /* Return the case table of the current buffer. */)
()
(void)
{
return current_buffer->downcase_table;
}
......@@ -79,7 +78,7 @@ DEFUN ("current-case-table", Fcurrent_case_table, Scurrent_case_table, 0, 0, 0,
DEFUN ("standard-case-table", Fstandard_case_table, Sstandard_case_table, 0, 0, 0,
doc: /* Return the standard case table.
This is the one used for new buffers. */)
()
(void)
{
return Vascii_downcase_table;
}
......@@ -103,8 +102,7 @@ CANONICALIZE maps each character to a canonical equivalent;
EQUIVALENCES is a map that cyclicly permutes each equivalence class
(of characters with the same canonical equivalent); it may be nil,
in which case it is deduced from CANONICALIZE. */)
(table)
Lisp_Object table;
(Lisp_Object table)
{
return set_case_table (table, 0);
}
......@@ -112,8 +110,7 @@ EQUIVALENCES is a map that cyclicly permutes each equivalence class
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. */)
(table)
Lisp_Object table;
(Lisp_Object table)
{
return set_case_table (table, 1);
}
......
......@@ -89,8 +89,7 @@ DEFUN ("make-category-set", Fmake_category_set, Smake_category_set, 1, 1, 0,
CATEGORIES is a string of category mnemonics.
The value is a bool-vector which has t at the indices corresponding to
those categories. */)
(categories)
Lisp_Object categories;
(Lisp_Object categories)
{
Lisp_Object val;
int len;
......@@ -126,8 +125,7 @@ should be a terse text (preferably less than 16 characters),
and the rest lines should be the full description.
The category is defined only in category table TABLE, which defaults to
the current buffer's category table. */)
(category, docstring, table)
Lisp_Object category, docstring, table;
(Lisp_Object category, Lisp_Object docstring, Lisp_Object table)
{
CHECK_CATEGORY (category);
CHECK_STRING (docstring);
......@@ -146,8 +144,7 @@ DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0,
doc: /* Return the documentation string of CATEGORY, as defined in TABLE.
TABLE should be a category table and defaults to the current buffer's
category table. */)
(category, table)
Lisp_Object category, table;
(Lisp_Object category, Lisp_Object table)
{
CHECK_CATEGORY (category);
table = check_category_table (table);
......@@ -161,8 +158,7 @@ DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category,
If no category remains available, return nil.
The optional argument TABLE specifies which category table to modify;
it defaults to the current buffer's category table. */)
(table)
Lisp_Object table;
(Lisp_Object table)
{
int i;
......@@ -180,8 +176,7 @@ it defaults to the current buffer's category table. */)
DEFUN ("category-table-p", Fcategory_table_p, Scategory_table_p, 1, 1, 0,
doc: /* Return t if ARG is a category table. */)
(arg)
Lisp_Object arg;
(Lisp_Object arg)
{
if (CHAR_TABLE_P (arg)
&& EQ (XCHAR_TABLE (arg)->purpose, Qcategory_table))
......@@ -206,7 +201,7 @@ check_category_table (Lisp_Object table)
DEFUN ("category-table", Fcategory_table, Scategory_table, 0, 0, 0,
doc: /* Return the current category table.
This is the one specified by the current buffer. */)
()
(void)
{
return current_buffer->category_table;
}
......@@ -215,7 +210,7 @@ DEFUN ("standard-category-table", Fstandard_category_table,
Sstandard_category_table, 0, 0, 0,
doc: /* Return the standard category table.
This is the one used for new buffers. */)
()
(void)
{
return Vstandard_category_table;
}
......@@ -255,8 +250,7 @@ DEFUN ("copy-category-table", Fcopy_category_table, Scopy_category_table,
0, 1, 0,
doc: /* Construct a new category table and return it.
It is a copy of the TABLE, which defaults to the standard category table. */)
(table)
Lisp_Object table;
(Lisp_Object table)
{
if (!NILP (table))
check_category_table (table);
......@@ -269,7 +263,7 @@ It is a copy of the TABLE, which defaults to the standard category table. */)
DEFUN ("make-category-table", Fmake_category_table, Smake_category_table,
0, 0, 0,
doc: /* Construct a new and empty category table and return it. */)
()
(void)
{
Lisp_Object val;
int i;
......@@ -286,8 +280,7 @@ DEFUN ("make-category-table", Fmake_category_table, Smake_category_table,
DEFUN ("set-category-table", Fset_category_table, Sset_category_table, 1, 1, 0,
doc: /* Specify TABLE as the category table for the current buffer.
Return TABLE. */)
(table)
Lisp_Object table;
(Lisp_Object table)
{
int idx;
table = check_category_table (table);
......@@ -308,8 +301,7 @@ char_category_set (int c)
DEFUN ("char-category-set", Fchar_category_set, Schar_category_set, 1, 1, 0,
doc: /* Return the category set of CHAR.
usage: (char-category-set CHAR) */)
(ch)
Lisp_Object ch;
(Lisp_Object ch)
{
CHECK_NUMBER (ch);
return CATEGORY_SET (XFASTINT (ch));
......@@ -321,8 +313,7 @@ DEFUN ("category-set-mnemonics", Fcategory_set_mnemonics,
CATEGORY-SET is a bool-vector, and the categories \"in\" it are those
that are indexes where t occurs in the bool-vector.
The return value is a string containing those same categories. */)
(category_set)
Lisp_Object category_set;
(Lisp_Object category_set)
{
int i, j;
char str[96];
......@@ -361,8 +352,7 @@ CHARACTER can be either a single character or a cons representing the
lower and upper ends of an inclusive character range to modify.
If optional fourth argument RESET is non-nil,
then delete CATEGORY from the category set instead of adding it. */)
(character, category, table, reset)
Lisp_Object character, category, table, reset;
(Lisp_Object character, Lisp_Object category, Lisp_Object table, Lisp_Object reset)
{
Lisp_Object set_value; /* Actual value to be set in category sets. */
Lisp_Object category_set;
......
......@@ -288,15 +288,14 @@ multibyte_char_to_unibyte_safe (int c)
DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0,
doc: /* Return non-nil if OBJECT is a character. */)
(object, ignore)
Lisp_Object object, ignore;
(Lisp_Object object, Lisp_Object ignore)
{
return (CHARACTERP (object) ? Qt : Qnil);
}
DEFUN ("max-char", Fmax_char, Smax_char, 0, 0, 0,
doc: /* Return the character of the maximum code. */)
()
(void)
{
return make_number (MAX_CHAR);
}
......@@ -304,8 +303,7 @@ DEFUN ("max-char", Fmax_char, Smax_char, 0, 0, 0,
DEFUN ("unibyte-char-to-multibyte", Funibyte_char_to_multibyte,
Sunibyte_char_to_multibyte, 1, 1, 0,
doc: /* Convert the byte CH to multibyte character. */)
(ch)
Lisp_Object ch;
(Lisp_Object ch)
{
int c;
......@@ -321,8 +319,7 @@ DEFUN ("multibyte-char-to-unibyte", Fmultibyte_char_to_unibyte,
Smultibyte_char_to_unibyte, 1, 1, 0,
doc: /* Convert the multibyte character CH to a byte.
If the multibyte character does not represent a byte, return -1. */)
(ch)
Lisp_Object ch;
(Lisp_Object ch)
{
int cm;
......@@ -343,8 +340,7 @@ DEFUN ("char-bytes", Fchar_bytes, Schar_bytes, 1, 1, 0,
doc: /* Return 1 regardless of the argument CHAR.
This is now an obsolete function. We keep it just for backward compatibility.
usage: (char-bytes CHAR) */)
(ch)
Lisp_Object ch;
(Lisp_Object ch)
{
CHECK_CHARACTER (ch);
return make_number (1);
......@@ -355,8 +351,7 @@ DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0,
The width is measured by how many columns it occupies on the screen.
Tab is taken to occupy `tab-width' columns.
usage: (char-width CHAR) */)
(ch)
Lisp_Object ch;
(Lisp_Object ch)
{
Lisp_Object disp;
int c, width;
......@@ -527,8 +522,7 @@ only the base leading-code is considered; the validity of
the following bytes is not checked. Tabs in STRING are always
taken to occupy `tab-width' columns.
usage: (string-width STRING) */)
(str)
Lisp_Object str;
(Lisp_Object str)
{
Lisp_Object val;
......@@ -541,8 +535,7 @@ DEFUN ("char-direction", Fchar_direction, Schar_direction, 1, 1, 0,
doc: /* Return the direction of CHAR.
The returned value is 0 for left-to-right and 1 for right-to-left.
usage: (char-direction CHAR) */)
(ch)
Lisp_Object ch;
(Lisp_Object ch)
{
int c;
......@@ -922,9 +915,7 @@ DEFUN ("string", Fstring, Sstring, 0, MANY, 0,
doc: /*
Concatenate all the argument characters and make the result a string.
usage: (string &rest CHARACTERS) */)
(n, args)
int n;
Lisp_Object *args;
(int n, Lisp_Object *args)
{
int i, c;
unsigned char *buf, *p;
......@@ -949,9 +940,7 @@ usage: (string &rest CHARACTERS) */)
DEFUN ("unibyte-string", Funibyte_string, Sunibyte_string, 0, MANY, 0,
doc: /* Concatenate all the argument bytes and make the result a unibyte string.
usage: (unibyte-string &rest BYTES) */)
(n, args)
int n;
Lisp_Object *args;
(int n, Lisp_Object *args)
{
int i, c;
unsigned char *buf, *p;
......@@ -981,8 +970,7 @@ DEFUN ("char-resolve-modifiers", Fchar_resolve_modifiers,
The value is a character with modifiers resolved into the character
code. Unresolved modifiers are kept in the value.
usage: (char-resolve-modifiers CHAR) */)
(character)
Lisp_Object character;
(Lisp_Object character)
{
int c;
......@@ -1001,8 +989,7 @@ non-nil, is an index of a target character in the string.
If the current buffer (or STRING) is multibyte, and the target
character is not ASCII nor 8-bit character, an error is signalled. */)
(position, string)
Lisp_Object position, string;
(Lisp_Object position, Lisp_Object string)
{
int c;
EMACS_INT pos;
......
......@@ -663,8 +663,7 @@ load_charset (struct charset *charset, int control_flag)
DEFUN ("charsetp", Fcharsetp, Scharsetp, 1, 1, 0,
doc: /* Return non-nil if and only if OBJECT is a charset.*/)
(object)
Lisp_Object object;
(Lisp_Object object)
{
return (CHARSETP (object) ? Qt : Qnil);
}
......@@ -830,8 +829,7 @@ characters contained in CHARSET.
The optional 4th and 5th arguments FROM-CODE and TO-CODE specify the
range of code points (in CHARSET) of target characters. */)
(function, charset, arg, from_code, to_code)
Lisp_Object function, charset, arg, from_code, to_code;
(Lisp_Object function, Lisp_Object charset, Lisp_Object arg, Lisp_Object from_code, Lisp_Object to_code)
{
struct charset *cs;
unsigned from, to;
......@@ -869,9 +867,7 @@ DEFUN ("define-charset-internal", Fdefine_charset_internal,
Sdefine_charset_internal, charset_arg_max, MANY, 0,
doc: /* For internal use only.
usage: (define-charset-internal ...) */)
(nargs, args)
int nargs;
Lisp_Object *args;
(int nargs, Lisp_Object *args)
{
/* Charset attr vector. */
Lisp_Object attrs;
......@@ -1342,8 +1338,7 @@ define_charset_internal (Lisp_Object name,
DEFUN ("define-charset-alias", Fdefine_charset_alias,
Sdefine_charset_alias, 2, 2, 0,
doc: /* Define ALIAS as an alias for charset CHARSET. */)
(alias, charset)
Lisp_Object alias, charset;
(Lisp_Object alias, Lisp_Object charset)
{
Lisp_Object attr;
......@@ -1356,8 +1351,7 @@ DEFUN ("define-charset-alias", Fdefine_charset_alias,
DEFUN ("charset-plist", Fcharset_plist, Scharset_plist, 1, 1, 0,
doc: /* Return the property list of CHARSET. */)
(charset)
Lisp_Object charset;
(Lisp_Object charset)
{
Lisp_Object attrs;
......@@ -1368,8 +1362,7 @@ DEFUN ("charset-plist", Fcharset_plist, Scharset_plist, 1, 1, 0,
DEFUN ("set-charset-plist", Fset_charset_plist, Sset_charset_plist, 2, 2, 0,
doc: /* Set CHARSET's property list to PLIST. */)