diff src/lread.c @ 278:90d73dddcdc4 r21-0b37

Import from CVS: tag r21-0b37
author cvs
date Mon, 13 Aug 2007 10:31:29 +0200
parents c5d627a313b1
children 7df0dd720c89
line wrap: on
line diff
--- a/src/lread.c	Mon Aug 13 10:30:38 2007 +0200
+++ b/src/lread.c	Mon Aug 13 10:31:29 2007 +0200
@@ -27,7 +27,6 @@
 #include <config.h>
 #include "lisp.h"
 
-#ifndef standalone
 #include "buffer.h"
 #include "bytecode.h"
 #include "commands.h"
@@ -35,7 +34,6 @@
 #include "lstream.h"
 #include "opaque.h"
 #include <paths.h>
-#endif
 #ifdef FILE_CODING
 #include "file-coding.h"
 #endif
@@ -341,20 +339,6 @@
                               int allow_dotted_lists,
 			      int check_for_doc_references);
 
-/* get a character from the tty */
-
-#ifdef standalone     /* This primitive is normally not defined */
-
-#define kludge DEFUN /* to keep this away from make-docfile... */
-kludge ("read-char", Fread_char, Sread_char, 0, 0, 0, "") ()
-{
-  return getchar ();
-}
-#undef kludge
-#endif /* standalone */
-
-
-
 static void readevalloop (Lisp_Object readcharfun,
                           Lisp_Object sourcefile,
                           Lisp_Object (*evalfun) (Lisp_Object),
@@ -1373,8 +1357,6 @@
   unbind_to (speccount, Qnil);
 }
 
-#ifndef standalone
-
 DEFUN ("eval-buffer", Feval_buffer, 0, 2, "bBuffer: ", /*
 Execute BUFFER as Lisp code.
 Programs can pass two arguments, BUFFER and PRINTFLAG.
@@ -1467,8 +1449,6 @@
 
   return unbind_to (speccount, Qnil);
 }
-
-#endif /* standalone */
 
 DEFUN ("read", Fread, 0, 1, 0, /*
 Read one Lisp expression as text from STREAM, return as Lisp object.
@@ -1493,14 +1473,12 @@
 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK
   Vcurrent_compiled_function_annotation = Qnil;
 #endif
-#ifndef standalone
   if (EQ (stream, Qread_char))
     {
       Lisp_Object val = call1 (Qread_from_minibuffer,
 			       build_translated_string ("Lisp expression: "));
       return Fcar (Fread_from_string (val, Qnil, Qnil));
     }
-#endif
 
   if (STRINGP (stream))
     return Fcar (Fread_from_string (stream, Qnil, Qnil));
@@ -3031,9 +3009,6 @@
   DEFSUBR (Flocate_file_clear_hashing);
   DEFSUBR (Feval_buffer);
   DEFSUBR (Feval_region);
-#ifdef standalone
-  DEFSUBR (Fread_char);
-#endif
 
   defsymbol (&Qstandard_input, "standard-input");
   defsymbol (&Qread_char, "read-char");