Revert the temporary workaround for bug #162

	* lisp/build-autoloads.el (find-emod-directories): Revert the
	workaround.

	* lisp/emod-utils.el (emodule-completions): Ditto.

	* lisp/emod-utils.el (list-modules): Ditto.

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/lisp/build-autoloads.el b/lisp/build-autoloads.el
index 642420c..35f531a 100644 (file)
--- a/lisp/build-autoloads.el
+++ b/lisp/build-autoloads.el
@@ -65,21 +65,13 @@
 (defun find-emod-directories ()
   (let* ((objdir "../modules/")
         (files (directory-files-recur
-                objdir 'full (concat
-                              "\\.\\("
-                              (mapconcat
-                               #'(lambda (e)
-                                   (replace-in-string e "\\." ""))
-                               module-extensions "\\|")
-                              "\\)$")
-                             ;; http://issues.sxemacs.org/show_bug.cgi?id=162
-                             ;; (mapfam
-                             ;;  #'(lambda (e)
-                             ;;      (replace-in-string e "\\." ""))
-                             ;;  :initiator "\\.\\("
-                             ;;  :terminator "\\)$"
-                             ;;  :separator "\\|"
-                             ;;  :result-type #'concat module-extensions)
+                objdir 'full (mapfam
+                              #'(lambda (e)
+                                  (replace-in-string e "\\." ""))
+                              :initiator "\\.\\("
+                              :terminator "\\)$"
+                              :separator "\\|"
+                              :result-type #'concat module-extensions)
                 'list t 1))
         (dir-bloom (make-bloom))
         directories)

diff --git a/lisp/emod-utils.el b/lisp/emod-utils.el
index 6ce6011..4b2d17c 100644 (file)
--- a/lisp/emod-utils.el
+++ b/lisp/emod-utils.el
@@ -67,20 +67,13 @@ delimited path string."
                      (split-string-by-char path ?:)
                    path)
                  module-load-path))
-       (types (concat "\\.\\("
-                      (mapconcat
-                       #'(lambda (e)
-                           (replace-in-string e "\\." ""))
-                       module-extensions "\\|")
-                      "\\)$"))
-               ;; http://issues.sxemacs.org/show_bug.cgi?id=162
-               ;; (mapfam
-              ;;  #'(lambda (e)
-              ;;      (replace-in-string e "\\." ""))
-              ;;  :initiator "\\.\\("
-              ;;  :terminator "\\)$"
-              ;;  :separator "\\|"
-              ;;  :result-type #'concat module-extensions))
+       (types (mapfam
+               #'(lambda (e)
+                   (replace-in-string e "\\." ""))
+               :initiator "\\.\\("
+               :terminator "\\)$"
+               :separator "\\|"
+               :result-type #'concat module-extensions))
        completions)
     (while dirs
       (let ((files (directory-files-recur (car dirs) nil types 'list t 0)))
@@ -132,9 +125,7 @@ delimited path string."
     (let ((emods (list-loaded-modules)))
       (if (interactive-p)
          (message "Loaded emodules: %s"
-                  (mapconcat #'identity emods " "))
-                   ;; http://issues.sxemacs.org/show_bug.cgi?id=162
-                  ;; (mapfam nil emods :separator " " :result-type #'concat))
+                  (mapfam nil emods :separator " " :result-type #'concat))
        emods))))
 
 (provide 'emod-utils)