* read.c, read.h (scm_read_options, scm_read_opts): Removed

readline options.  They should reside in their own options array.

diff --git a/libguile/read.c b/libguile/read.c
index 1d6a1f1..e6ff136 100644 (file)
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -67,19 +67,8 @@ scm_option scm_read_opts[] = {
     "Convert symbols to lower case."},
   { SCM_OPTION_SCM, "keywords", SCM_BOOL_F,
     "Style of keyword recognition: #f or 'prefix"}
-#ifdef HAVE_RL_GETC_FUNCTION
-  ,
-  { SCM_OPTION_BOOLEAN, "history-file", 1,
-    "Use history file." },
-  { SCM_OPTION_INTEGER, "history-length", 200,
-    "History length." }
-#endif /* HAVE_RL_GETC_FUNCTION */
 };
 
-#ifdef HAVE_RL_GETC_FUNCTION
-extern void stifle_history (int max);
-#endif
-
 SCM_PROC (s_read_options, "read-options-interface", 0, 1, 0, scm_read_options);
 
 SCM
@@ -92,9 +81,6 @@ scm_read_options (setting)
                         s_read_options);
   if (SCM_COPY_SOURCE_P)
     SCM_RECORD_POSITIONS_P = 1;
-#ifdef HAVE_RL_GETC_FUNCTION
-  stifle_history (SCM_HISTORY_LENGTH);
-#endif
   return ans;
 }
 

diff --git a/libguile/read.h b/libguile/read.h
index 7ede1be..f5e21ca 100644 (file)
--- a/libguile/read.h
+++ b/libguile/read.h
@@ -73,13 +73,7 @@ extern scm_option scm_read_opts[];
 #define SCM_RECORD_POSITIONS_P scm_read_opts[1].val
 #define SCM_CASE_INSENSITIVE_P scm_read_opts[2].val
 #define SCM_KEYWORD_STYLE      scm_read_opts[3].val
-#ifndef HAVE_RL_GETC_FUNCTION
 #define SCM_N_READ_OPTIONS 4
-#else
-#define SCM_HISTORY_FILE_P     scm_read_opts[4].val
-#define SCM_HISTORY_LENGTH     scm_read_opts[5].val
-#define SCM_N_READ_OPTIONS 6
-#endif /* HAVE_RL_GETC_FUNCTION */
 
 \f