diff options
| author | Dan Nicolaescu | 2010-07-08 14:25:08 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-08 14:25:08 -0700 |
| commit | 5842a27bbfb7efa6872824e501bc7ec98b631553 (patch) | |
| tree | d173899af9cbed9d90d94cfc710e6ecc06dd1f6b /src/lread.c | |
| parent | 71c44c04bb996abe77db8efd88255fde06532b10 (diff) | |
| download | emacs-5842a27bbfb7efa6872824e501bc7ec98b631553.tar.gz emacs-5842a27bbfb7efa6872824e501bc7ec98b631553.zip | |
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.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/src/lread.c b/src/lread.c index 8df689c4afa..42925f8ac09 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -779,8 +779,7 @@ If the optional argument SECONDS is non-nil, it should be a number | |||
| 779 | specifying the maximum number of seconds to wait for input. If no | 779 | specifying the maximum number of seconds to wait for input. If no |
| 780 | input arrives in that time, return nil. SECONDS may be a | 780 | input arrives in that time, return nil. SECONDS may be a |
| 781 | floating-point value. */) | 781 | floating-point value. */) |
| 782 | (prompt, inherit_input_method, seconds) | 782 | (Lisp_Object prompt, Lisp_Object inherit_input_method, Lisp_Object seconds) |
| 783 | Lisp_Object prompt, inherit_input_method, seconds; | ||
| 784 | { | 783 | { |
| 785 | Lisp_Object val; | 784 | Lisp_Object val; |
| 786 | 785 | ||
| @@ -802,8 +801,7 @@ If the optional argument SECONDS is non-nil, it should be a number | |||
| 802 | specifying the maximum number of seconds to wait for input. If no | 801 | specifying the maximum number of seconds to wait for input. If no |
| 803 | input arrives in that time, return nil. SECONDS may be a | 802 | input arrives in that time, return nil. SECONDS may be a |
| 804 | floating-point value. */) | 803 | floating-point value. */) |
| 805 | (prompt, inherit_input_method, seconds) | 804 | (Lisp_Object prompt, Lisp_Object inherit_input_method, Lisp_Object seconds) |
| 806 | Lisp_Object prompt, inherit_input_method, seconds; | ||
| 807 | { | 805 | { |
| 808 | if (! NILP (prompt)) | 806 | if (! NILP (prompt)) |
| 809 | message_with_string ("%s", prompt, 0); | 807 | message_with_string ("%s", prompt, 0); |
| @@ -824,8 +822,7 @@ If the optional argument SECONDS is non-nil, it should be a number | |||
| 824 | specifying the maximum number of seconds to wait for input. If no | 822 | specifying the maximum number of seconds to wait for input. If no |
| 825 | input arrives in that time, return nil. SECONDS may be a | 823 | input arrives in that time, return nil. SECONDS may be a |
| 826 | floating-point value. */) | 824 | floating-point value. */) |
| 827 | (prompt, inherit_input_method, seconds) | 825 | (Lisp_Object prompt, Lisp_Object inherit_input_method, Lisp_Object seconds) |
| 828 | Lisp_Object prompt, inherit_input_method, seconds; | ||
| 829 | { | 826 | { |
| 830 | Lisp_Object val; | 827 | Lisp_Object val; |
| 831 | 828 | ||
| @@ -840,7 +837,7 @@ floating-point value. */) | |||
| 840 | 837 | ||
| 841 | DEFUN ("get-file-char", Fget_file_char, Sget_file_char, 0, 0, 0, | 838 | DEFUN ("get-file-char", Fget_file_char, Sget_file_char, 0, 0, 0, |
| 842 | doc: /* Don't use this yourself. */) | 839 | doc: /* Don't use this yourself. */) |
| 843 | () | 840 | (void) |
| 844 | { | 841 | { |
| 845 | register Lisp_Object val; | 842 | register Lisp_Object val; |
| 846 | BLOCK_INPUT; | 843 | BLOCK_INPUT; |
| @@ -925,7 +922,7 @@ DEFUN ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0, | |||
| 925 | doc: /* Return the suffixes that `load' should try if a suffix is \ | 922 | doc: /* Return the suffixes that `load' should try if a suffix is \ |
| 926 | required. | 923 | required. |
| 927 | This uses the variables `load-suffixes' and `load-file-rep-suffixes'. */) | 924 | This uses the variables `load-suffixes' and `load-file-rep-suffixes'. */) |
| 928 | () | 925 | (void) |
| 929 | { | 926 | { |
| 930 | Lisp_Object lst = Qnil, suffixes = Vload_suffixes, suffix, ext; | 927 | Lisp_Object lst = Qnil, suffixes = Vload_suffixes, suffix, ext; |
| 931 | while (CONSP (suffixes)) | 928 | while (CONSP (suffixes)) |
| @@ -980,8 +977,7 @@ Loading a file records its definitions, and its `provide' and | |||
| 980 | car is the file name loaded. See `load-history'. | 977 | car is the file name loaded. See `load-history'. |
| 981 | 978 | ||
| 982 | Return t if the file exists and loads successfully. */) | 979 | Return t if the file exists and loads successfully. */) |
| 983 | (file, noerror, nomessage, nosuffix, must_suffix) | 980 | (Lisp_Object file, Lisp_Object noerror, Lisp_Object nomessage, Lisp_Object nosuffix, Lisp_Object must_suffix) |
| 984 | Lisp_Object file, noerror, nomessage, nosuffix, must_suffix; | ||
| 985 | { | 981 | { |
| 986 | register FILE *stream; | 982 | register FILE *stream; |
| 987 | register int fd = -1; | 983 | register int fd = -1; |
| @@ -1331,8 +1327,7 @@ file name when searching. | |||
| 1331 | If non-nil, PREDICATE is used instead of `file-readable-p'. | 1327 | If non-nil, PREDICATE is used instead of `file-readable-p'. |
| 1332 | PREDICATE can also be an integer to pass to the access(2) function, | 1328 | PREDICATE can also be an integer to pass to the access(2) function, |
| 1333 | in which case file-name-handlers are ignored. */) | 1329 | in which case file-name-handlers are ignored. */) |
| 1334 | (filename, path, suffixes, predicate) | 1330 | (Lisp_Object filename, Lisp_Object path, Lisp_Object suffixes, Lisp_Object predicate) |
| 1335 | Lisp_Object filename, path, suffixes, predicate; | ||
| 1336 | { | 1331 | { |
| 1337 | Lisp_Object file; | 1332 | Lisp_Object file; |
| 1338 | int fd = openp (path, filename, suffixes, &file, predicate); | 1333 | int fd = openp (path, filename, suffixes, &file, predicate); |
| @@ -1785,8 +1780,7 @@ DO-ALLOW-PRINT, if non-nil, specifies that `print' and related | |||
| 1785 | functions should work normally even if PRINTFLAG is nil. | 1780 | functions should work normally even if PRINTFLAG is nil. |
| 1786 | 1781 | ||
| 1787 | This function preserves the position of point. */) | 1782 | This function preserves the position of point. */) |
| 1788 | (buffer, printflag, filename, unibyte, do_allow_print) | 1783 | (Lisp_Object buffer, Lisp_Object printflag, Lisp_Object filename, Lisp_Object unibyte, Lisp_Object do_allow_print) |
| 1789 | Lisp_Object buffer, printflag, filename, unibyte, do_allow_print; | ||
| 1790 | { | 1784 | { |
| 1791 | int count = SPECPDL_INDEX (); | 1785 | int count = SPECPDL_INDEX (); |
| 1792 | Lisp_Object tem, buf; | 1786 | Lisp_Object tem, buf; |
| @@ -1829,8 +1823,7 @@ instead of `read' to read each expression. It gets one argument | |||
| 1829 | which is the input stream for reading characters. | 1823 | which is the input stream for reading characters. |
| 1830 | 1824 | ||
| 1831 | This function does not move point. */) | 1825 | This function does not move point. */) |
| 1832 | (start, end, printflag, read_function) | 1826 | (Lisp_Object start, Lisp_Object end, Lisp_Object printflag, Lisp_Object read_function) |
| 1833 | Lisp_Object start, end, printflag, read_function; | ||
| 1834 | { | 1827 | { |
| 1835 | int count = SPECPDL_INDEX (); | 1828 | int count = SPECPDL_INDEX (); |
| 1836 | Lisp_Object tem, cbuf; | 1829 | Lisp_Object tem, cbuf; |
| @@ -1864,8 +1857,7 @@ STREAM or the value of `standard-input' may be: | |||
| 1864 | a string (takes text from string, starting at the beginning) | 1857 | a string (takes text from string, starting at the beginning) |
| 1865 | t (read text line using minibuffer and use it, or read from | 1858 | t (read text line using minibuffer and use it, or read from |
| 1866 | standard input in batch mode). */) | 1859 | standard input in batch mode). */) |
| 1867 | (stream) | 1860 | (Lisp_Object stream) |
| 1868 | Lisp_Object stream; | ||
| 1869 | { | 1861 | { |
| 1870 | if (NILP (stream)) | 1862 | if (NILP (stream)) |
| 1871 | stream = Vstandard_input; | 1863 | stream = Vstandard_input; |
| @@ -1882,8 +1874,7 @@ DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0, | |||
| 1882 | Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX). | 1874 | Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX). |
| 1883 | START and END optionally delimit a substring of STRING from which to read; | 1875 | START and END optionally delimit a substring of STRING from which to read; |
| 1884 | they default to 0 and (length STRING) respectively. */) | 1876 | they default to 0 and (length STRING) respectively. */) |
| 1885 | (string, start, end) | 1877 | (Lisp_Object string, Lisp_Object start, Lisp_Object end) |
| 1886 | Lisp_Object string, start, end; | ||
| 1887 | { | 1878 | { |
| 1888 | Lisp_Object ret; | 1879 | Lisp_Object ret; |
| 1889 | CHECK_STRING (string); | 1880 | CHECK_STRING (string); |
| @@ -3609,8 +3600,7 @@ DEFUN ("intern", Fintern, Sintern, 1, 2, 0, | |||
| 3609 | If there is none, one is created by this function and returned. | 3600 | If there is none, one is created by this function and returned. |
| 3610 | A second optional argument specifies the obarray to use; | 3601 | A second optional argument specifies the obarray to use; |
| 3611 | it defaults to the value of `obarray'. */) | 3602 | it defaults to the value of `obarray'. */) |
| 3612 | (string, obarray) | 3603 | (Lisp_Object string, Lisp_Object obarray) |
| 3613 | Lisp_Object string, obarray; | ||
| 3614 | { | 3604 | { |
| 3615 | register Lisp_Object tem, sym, *ptr; | 3605 | register Lisp_Object tem, sym, *ptr; |
| 3616 | 3606 | ||
| @@ -3657,8 +3647,7 @@ NAME may be a string or a symbol. If it is a symbol, that exact | |||
| 3657 | symbol is searched for. | 3647 | symbol is searched for. |
| 3658 | A second optional argument specifies the obarray to use; | 3648 | A second optional argument specifies the obarray to use; |
| 3659 | it defaults to the value of `obarray'. */) | 3649 | it defaults to the value of `obarray'. */) |
| 3660 | (name, obarray) | 3650 | (Lisp_Object name, Lisp_Object obarray) |
| 3661 | Lisp_Object name, obarray; | ||
| 3662 | { | 3651 | { |
| 3663 | register Lisp_Object tem, string; | 3652 | register Lisp_Object tem, string; |
| 3664 | 3653 | ||
| @@ -3686,8 +3675,7 @@ The value is t if a symbol was found and deleted, nil otherwise. | |||
| 3686 | NAME may be a string or a symbol. If it is a symbol, that symbol | 3675 | NAME may be a string or a symbol. If it is a symbol, that symbol |
| 3687 | is deleted, if it belongs to OBARRAY--no other symbol is deleted. | 3676 | is deleted, if it belongs to OBARRAY--no other symbol is deleted. |
| 3688 | OBARRAY defaults to the value of the variable `obarray'. */) | 3677 | OBARRAY defaults to the value of the variable `obarray'. */) |
| 3689 | (name, obarray) | 3678 | (Lisp_Object name, Lisp_Object obarray) |
| 3690 | Lisp_Object name, obarray; | ||
| 3691 | { | 3679 | { |
| 3692 | register Lisp_Object string, tem; | 3680 | register Lisp_Object string, tem; |
| 3693 | int hash; | 3681 | int hash; |
| @@ -3839,8 +3827,7 @@ mapatoms_1 (Lisp_Object sym, Lisp_Object function) | |||
| 3839 | DEFUN ("mapatoms", Fmapatoms, Smapatoms, 1, 2, 0, | 3827 | DEFUN ("mapatoms", Fmapatoms, Smapatoms, 1, 2, 0, |
| 3840 | doc: /* Call FUNCTION on every symbol in OBARRAY. | 3828 | doc: /* Call FUNCTION on every symbol in OBARRAY. |
| 3841 | OBARRAY defaults to the value of `obarray'. */) | 3829 | OBARRAY defaults to the value of `obarray'. */) |
| 3842 | (function, obarray) | 3830 | (Lisp_Object function, Lisp_Object obarray) |
| 3843 | Lisp_Object function, obarray; | ||
| 3844 | { | 3831 | { |
| 3845 | if (NILP (obarray)) obarray = Vobarray; | 3832 | if (NILP (obarray)) obarray = Vobarray; |
| 3846 | obarray = check_obarray (obarray); | 3833 | obarray = check_obarray (obarray); |