[nongnu] elpa/geiser-guile 503e239 137/284: Guile: tweaks to the previous fix.

[Philip Kaludercic]

branch: elpa/geiser-guile
commit 503e2395bc245a1e3ec23f12563e91be6b28d041
Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
Commit: Jose Antonio Ortega Ruiz <jao@gnu.org>

    Guile: tweaks to the previous fix.
---
 geiser/modules.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/geiser/modules.scm b/geiser/modules.scm
index a57145e..15b9737 100644
--- a/geiser/modules.scm
+++ b/geiser/modules.scm
@@ -88,10 +88,11 @@
          (elts (hash-fold classify-module-object
                           (list '() '() '())
                           (module-obarray mod)))
-         (elts (map sort-symbols! elts)))
-    (list (cons 'modules (append
-                          (map module-name (submodules mod))
-                          (map (lambda (m) `(,@mod-name ,m)) (car elts))))
+         (elts (map sort-symbols! elts))
+         (subs (map module-name (submodules (resolve-module mod-name #f)))))
+    (list (cons 'modules (append subs
+                                 (map (lambda (m)
+                                        `(,@mod-name ,m)) (car elts))))
           (cons 'procs (cadr elts))
           (cons 'vars (caddr elts)))))