This commit was manufactured by cvs2svn to create branch 'chise-r21-4-19'.

[chise/xemacs-chise.git] / src / lread.c

diff --git a/src/lread.c b/src/lread.c
index d62b0d8..604ccdf 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -1632,26 +1632,6 @@ START and END optionally delimit a substring of STRING from which to read;
   return tem;
 }
 
-Lisp_Object
-read_from_c_string (const unsigned char* str, size_t size)
-{
-  Lisp_Object tem;
-  Lisp_Object lispstream = Qnil;
-  struct gcpro gcpro1;
-
-#ifdef COMPILED_FUNCTION_ANNOTATION_HACK
-  Vcurrent_compiled_function_annotation = Qnil;
-#endif
-  GCPRO1 (lispstream);
-  lispstream = make_fixed_buffer_input_stream (str, size);
-
-  Vread_objects = Qnil;
-
-  tem = read0 (lispstream);
-  Lstream_delete (XLSTREAM (lispstream));
-  UNGCPRO;
-  return tem;
-}
 \f
 #ifdef LISP_BACKQUOTES
 
@@ -1835,25 +1815,6 @@ read_escape (Lisp_Object readcharfun)
          }
        return i;
       }
-    case 'u':
-      {
-       REGISTER Emchar i = 0;
-       REGISTER int count = 0;
-       while (++count <= 6)
-         {
-           c = readchar (readcharfun);
-           /* Remember, can't use isdigit(), isalpha() etc. on Emchars */
-           if      (c >= '0' && c <= '9')  i = (i << 4) + (c - '0');
-           else if (c >= 'a' && c <= 'f')  i = (i << 4) + (c - 'a') + 10;
-            else if (c >= 'A' && c <= 'F')  i = (i << 4) + (c - 'A') + 10;
-           else
-             {
-               unreadchar (readcharfun, c);
-               break;
-             }
-         }
-       return i;
-      }
 
 #ifdef MULE
       /* #### need some way of reading an extended character with
@@ -2237,8 +2198,8 @@ read_structure (Lisp_Object readcharfun)
 
 \f
 static Lisp_Object read_compiled_function (Lisp_Object readcharfun,
-                                          Emchar terminator);
-static Lisp_Object read_vector (Lisp_Object readcharfun, Emchar terminator);
+                                          int terminator);
+static Lisp_Object read_vector (Lisp_Object readcharfun, int terminator);
 
 /* Get the next character; filter out whitespace and comments */