*** empty log message ***

diff --git a/THANKS b/THANKS
index 2dcb60b..877a5fc 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -22,6 +22,7 @@ For fixes or providing information which led to a fix:
       Craig Brozefsky
       Diego Dainese
        Mark Galassi
+        Ian Grant
        Greg Harvey
        Jon Hellan      
     Richard Kim

diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index 0ff562b..913561d 100644 (file)
--- a/guile-readline/ChangeLog
+++ b/guile-readline/ChangeLog
@@ -1,3 +1,19 @@
+2000-06-06  Mikael Djurfeldt  <mdj@mdj.nada.kth.se>
+
+       * readline.c: Always provide scm_init_readline, also if readline
+       support is not included.  Otherwise, a strange dynamic loading
+       error will occur.  (It would be better not to install
+       libguilereadline at all.)
+
+       * readline-activator.scm (activate-readline): Report an error if
+       readline isn't provided by Guile.
+
+       * readline.scm: Report an error if readline isn't provided by
+       Guile;  Added :no-backtrace to module header.
+
+       * configure.in: Put more ink before readline version warning.
+       (Thanks to Ian Grant.)
+
 2000-06-01  Michael Livshin  <mlivshin@bigfoot.com>
 
        * autogen.sh: call ../guile-aclocal.sh instead of aclocal

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 13412c6..d700824 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-06  Mikael Djurfeldt  <mdj@mdj.nada.kth.se>
+
+       * modules.c (scm_system_module_env_p): Fixed detection of system
+       modules.
+
 2000-06-06  Marius Vollmer  <mvo@zagadka.ping.de>
 
        * scmsigs.c (scm_sigaction): Silently ignore setting handlers for
@@ -38,7 +43,6 @@
        validate.h (SCM_VALIDATE_BOOL_COPY, SCM_VALIDATE_PROC):  Replace
        uses of SCM_TRUE_P (x) with SCM_EQ_P (x, SCM_BOOL_T).
 
->>>>>>> 1.990
 2000-06-04  Mikael Djurfeldt  <mdj@thalamus.nada.kth.se>
 
        * eval.c (scm_badformalsp): New static function.