guile/guile-core/ice-9 ChangeLog session.scm

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  00/12/13 01:44:28

Modified files:
        guile-core/ice-9: ChangeLog session.scm 

Log message:
        * Fixed the last patch (which was uncomplete).  Thanks to Dale P. Smith.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/ice-9/ChangeLog.diff?r1=1.362&r2=1.363
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/ice-9/session.scm.diff?r1=1.22&r2=1.23

Patches:
Index: guile/guile-core/ice-9/ChangeLog
diff -u guile/guile-core/ice-9/ChangeLog:1.362 
guile/guile-core/ice-9/ChangeLog:1.363
--- guile/guile-core/ice-9/ChangeLog:1.362      Tue Dec 12 10:36:35 2000
+++ guile/guile-core/ice-9/ChangeLog    Wed Dec 13 01:44:28 2000
@@ -1,3 +1,8 @@
+2000-12-13  Dirk Herrmann  <address@hidden>
+
+       * session.scm (apropos):  Completed the last patch, which did only
+       half the job.  Thanks to Dale P. Smith.
+
 2000-12-12  Dirk Herrmann  <address@hidden>
 
        * session.scm (apropos, apropos-fold):  There are no weak bindings
Index: guile/guile-core/ice-9/session.scm
diff -u guile/guile-core/ice-9/session.scm:1.22 
guile/guile-core/ice-9/session.scm:1.23
--- guile/guile-core/ice-9/session.scm:1.22     Tue Dec 12 10:36:35 2000
+++ guile/guile-core/ice-9/session.scm  Wed Dec 13 01:44:28 2000
@@ -198,40 +198,36 @@
           (let* ((builtin (or (eq? module the-scm-module)
                               (eq? module the-root-module)))
                  (name (module-name module))
-                 (obarrays (if builtin
-                               (list (builtin-bindings))
-                               (list (module-obarray module))))
-                 (get-refs (if builtin
-                               (list id id)
-                               (list variable-ref)))
-                 )
-            (for-each
-             (lambda (obarray get-ref)
-               (array-for-each
-                (lambda (oblist)
-                  (for-each
-                   (lambda (x)
-                     (cond ((regexp-exec match (symbol->string (car x)))
-                            (display name)
-                            (display ": ")
-                            (display (car x))
-                            (cond ((procedure? (get-ref (cdr x)))
-                                   (display separator)
-                                   (display (get-ref (cdr x))))
-                                  (value
-                                   (display separator)
-                                   (display (get-ref (cdr x)))))
-                            (if (and shadow
-                                     (not (eq? (module-ref module
-                                                           (car x))
-                                               (module-ref (current-module)
-                                                           (car x)))))
-                                (display " shadowed"))
-                            (newline)
-                            )))
-                   oblist))
-                obarray))
-             obarrays get-refs)))
+                 (obarray (if builtin
+                              (builtin-bindings)
+                              (module-obarray module)))
+                 (get-ref (if builtin
+                              id
+                              variable-ref)))
+            (array-for-each
+             (lambda (oblist)
+               (for-each
+                (lambda (x)
+                  (cond ((regexp-exec match (symbol->string (car x)))
+                         (display name)
+                         (display ": ")
+                         (display (car x))
+                         (cond ((procedure? (get-ref (cdr x)))
+                                (display separator)
+                                (display (get-ref (cdr x))))
+                               (value
+                                (display separator)
+                                (display (get-ref (cdr x)))))
+                         (if (and shadow
+                                  (not (eq? (module-ref module
+                                                        (car x))
+                                            (module-ref (current-module)
+                                                        (car x)))))
+                             (display " shadowed"))
+                         (newline)
+                         )))
+                oblist))
+             obarray)))
         modules))))
 
 (define-public (apropos-internal rgx)