diff options
| author | Karl Heuer | 1995-07-17 22:24:37 +0000 |
|---|---|---|
| committer | Karl Heuer | 1995-07-17 22:24:37 +0000 |
| commit | 5be02dffe84c76883514514a2cdddfffd5b0992f (patch) | |
| tree | 17b6e1b51243a501e1a33c3cd6db4a0bbda2aec6 /src | |
| parent | 0e7078f5c8e0460fdc8076aec89dcd15c41b77f5 (diff) | |
| download | emacs-5be02dffe84c76883514514a2cdddfffd5b0992f.tar.gz emacs-5be02dffe84c76883514514a2cdddfffd5b0992f.zip | |
(Fread): Rename arg READCHARFUN to STREAM.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lread.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lread.c b/src/lread.c index 65b4b665c19..6995274de5e 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -889,27 +889,27 @@ STREAM or the value of `standard-input' may be:\n\ | |||
| 889 | call it with a char as argument to push a char back)\n\ | 889 | call it with a char as argument to push a char back)\n\ |
| 890 | a string (takes text from string, starting at the beginning)\n\ | 890 | a string (takes text from string, starting at the beginning)\n\ |
| 891 | t (read text line using minibuffer and use it).") | 891 | t (read text line using minibuffer and use it).") |
| 892 | (readcharfun) | 892 | (stream) |
| 893 | Lisp_Object readcharfun; | 893 | Lisp_Object stream; |
| 894 | { | 894 | { |
| 895 | extern Lisp_Object Fread_minibuffer (); | 895 | extern Lisp_Object Fread_minibuffer (); |
| 896 | 896 | ||
| 897 | if (NILP (readcharfun)) | 897 | if (NILP (stream)) |
| 898 | readcharfun = Vstandard_input; | 898 | stream = Vstandard_input; |
| 899 | if (EQ (readcharfun, Qt)) | 899 | if (EQ (stream, Qt)) |
| 900 | readcharfun = Qread_char; | 900 | stream = Qread_char; |
| 901 | 901 | ||
| 902 | new_backquote_flag = 0; | 902 | new_backquote_flag = 0; |
| 903 | 903 | ||
| 904 | #ifndef standalone | 904 | #ifndef standalone |
| 905 | if (EQ (readcharfun, Qread_char)) | 905 | if (EQ (stream, Qread_char)) |
| 906 | return Fread_minibuffer (build_string ("Lisp expression: "), Qnil); | 906 | return Fread_minibuffer (build_string ("Lisp expression: "), Qnil); |
| 907 | #endif | 907 | #endif |
| 908 | 908 | ||
| 909 | if (STRINGP (readcharfun)) | 909 | if (STRINGP (stream)) |
| 910 | return Fcar (Fread_from_string (readcharfun, Qnil, Qnil)); | 910 | return Fcar (Fread_from_string (stream, Qnil, Qnil)); |
| 911 | 911 | ||
| 912 | return read0 (readcharfun); | 912 | return read0 (stream); |
| 913 | } | 913 | } |
| 914 | 914 | ||
| 915 | DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0, | 915 | DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0, |