[Guile-commits] GNU Guile branch, master, updated. release_1-9-15-15-g6090483

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=6090483143d53a136e46186887edb3961b825682

The branch, master has been updated
       via  6090483143d53a136e46186887edb3961b825682 (commit)
       via  4181e9200b0ce62b8bbfa58a7c846f414ab0116c (commit)
       via  f92119034e25b1211ddf0257fffa6c946095988c (commit)
      from  1497e87a4f2eb414dcb2fde306d98013067dd410 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6090483143d53a136e46186887edb3961b825682
Author: Andy Wingo <address@hidden>
Date:   Tue Feb 8 23:44:27 2011 +0100

    uninstalled-env ordering tweaks to fix readline's file name
    
    * meta/uninstalled-env.in (subdirs_with_ltlibs): Remove "srfi".
      Reorder the load-path and load-compiled-path to put the root dir after
      guile-readline, so that relative canonicalization computes the correct
      path for ice-9/readline.scm.

commit 4181e9200b0ce62b8bbfa58a7c846f414ab0116c
Author: Andy Wingo <address@hidden>
Date:   Tue Feb 8 23:37:54 2011 +0100

    module-use-interfaces! handles duplicate interfaces
    
    * module/ice-9/boot-9.scm (module-use-interfaces!): Fix to have the same
      interface de-duplication characteristics as module-use!.

commit f92119034e25b1211ddf0257fffa6c946095988c
Author: Andy Wingo <address@hidden>
Date:   Tue Feb 8 23:24:36 2011 +0100

    remove readline-activator.scm
    
    * guile-readline/readline-activator.scm: Remove this file that was
      deprecated in Guile 1.4.

-----------------------------------------------------------------------

Summary of changes:
 guile-readline/readline-activator.scm |   17 -----------------
 meta/uninstalled-env.in               |   14 +++++++-------
 module/ice-9/boot-9.scm               |   14 ++++++++++----
 3 files changed, 17 insertions(+), 28 deletions(-)
 delete mode 100644 guile-readline/readline-activator.scm

diff --git a/guile-readline/readline-activator.scm 
b/guile-readline/readline-activator.scm
deleted file mode 100644
index 42ed113..0000000
--- a/guile-readline/readline-activator.scm
+++ /dev/null
@@ -1,17 +0,0 @@
-(define-module (readline-activator))
-
-(define-public (activate-readline)
-  (if (not (provided? 'readline))
-      (scm-error 'misc-error
-                'activate-readline
-                "readline is not provided in this Guile installation"
-                '()
-                '()))
-  (save-module-excursion
-   (lambda ()
-     (define-module (guile))
-     (dynamic-call "scm_init_readline" (dynamic-link "libguilereadline.so"))
-     (if (isatty? (current-input-port))
-        (begin
-          (define-module (guile) :use-module (ice-9 readline))
-          (define-module (guile-user) :use-module (ice-9 readline)))))))
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 918b94d..b3deed5 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#      Copyright (C) 2003, 2006, 2008, 2009, 2010 Free Software Foundation
+#      Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011 Free Software 
Foundation
 #
 #   This file is part of GUILE.
 #
@@ -32,7 +32,7 @@
 # Example: ../../uninstalled-env ./guile-test-foo
 
 # config
-subdirs_with_ltlibs="srfi guile-readline libguile"       # maintain me
+subdirs_with_ltlibs="guile-readline libguile"       # maintain me
 
 # env (set by configure)
 top_srcdir="@top_srcdir_absolute@"
@@ -48,12 +48,12 @@ top_builddir="@top_builddir_absolute@"
 
 if [ x"$GUILE_LOAD_PATH" = x ]
 then
-    
GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}:${top_srcdir}/guile-readline"
+    
GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}/guile-readline:${top_srcdir}"
     if test "${top_srcdir}" != "${top_builddir}"; then
-        
GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}:${top_builddir}/guile-readline"
+        
GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}"
     fi
 else
-  for d in "/module" "" "/guile-readline"
+  for d in "/module" "/guile-readline" ""
   do
     # This hair prevents double inclusion.
     # The ":" prevents prefix aliasing.
@@ -71,9 +71,9 @@ export GUILE_LOAD_PATH
 
 if [ x"$GUILE_LOAD_COMPILED_PATH" = x ]
 then
-  
GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}:${top_builddir}/guile-readline"
+  
GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/guile-readline:${top_builddir}"
 else
-  for d in "/module" "" "/guile-readline"
+  for d in "/module" "/guile-readline" ""
   do
     # This hair prevents double inclusion.
     # The ":" prevents prefix aliasing.
diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index da882a4..fe7f2b2 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -1965,10 +1965,16 @@ VALUE."
 ;; Same as MODULE-USE! but add multiple interfaces and check for duplicates
 ;;
 (define (module-use-interfaces! module interfaces)
-  (set-module-uses! module
-                    (append (module-uses module) interfaces))
-  (hash-clear! (module-import-obarray module))
-  (module-modified module))
+  (let ((prev (filter (lambda (used)
+                        (and-map (lambda (iface)
+                                   (not (equal? (module-name used)
+                                                (module-name iface))))
+                                 interfaces))
+                      (module-uses module))))
+    (set-module-uses! module
+                      (append prev interfaces))
+    (hash-clear! (module-import-obarray module))
+    (module-modified module)))
 
 
 


hooks/post-receive
-- 
GNU Guile