From bd84934806706368e5f6349cebc79c6b372f7cf0 Mon Sep 17 00:00:00 2001 From: Steve Youngs Date: Sat, 5 Oct 2013 12:36:57 +1000 Subject: [PATCH] Temporary work-around for bug 162 http://issues.sxemacs.org/show_bug.cgi?id=162 * lisp/build-autoloads.el (find-emod-directories): Use #'mapconcat instead of #'mapfam to work-around bug 162 * lisp/emod-utils.el (emodule-completions): Ditto. * lisp/emod-utils.el (list-modules): Ditto. Signed-off-by: Steve Youngs --- lisp/build-autoloads.el | 22 +++++++++++++++------- lisp/emod-utils.el | 25 +++++++++++++++++-------- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/lisp/build-autoloads.el b/lisp/build-autoloads.el index 123c457..642420c 100644 --- a/lisp/build-autoloads.el +++ b/lisp/build-autoloads.el @@ -65,13 +65,21 @@ (defun find-emod-directories () (let* ((objdir "../modules/") (files (directory-files-recur - objdir 'full (mapfam - #'(lambda (e) - (replace-in-string e "\\." "")) - :initiator "\\.\\(" - :terminator "\\)$" - :separator "\\|" - :result-type #'concat module-extensions) + 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) 'list t 1)) (dir-bloom (make-bloom)) directories) diff --git a/lisp/emod-utils.el b/lisp/emod-utils.el index a885097..6ce6011 100644 --- a/lisp/emod-utils.el +++ b/lisp/emod-utils.el @@ -67,13 +67,20 @@ delimited path string." (split-string-by-char path ?:) path) module-load-path)) - (types (mapfam - #'(lambda (e) - (replace-in-string e "\\." "")) - :initiator "\\.\\(" - :terminator "\\)$" - :separator "\\|" - :result-type #'concat module-extensions)) + (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)) completions) (while dirs (let ((files (directory-files-recur (car dirs) nil types 'list t 0))) @@ -125,7 +132,9 @@ delimited path string." (let ((emods (list-loaded-modules))) (if (interactive-p) (message "Loaded emodules: %s" - (mapfam nil emods :separator " " :result-type #'concat)) + (mapconcat #'identity emods " ")) + ;; http://issues.sxemacs.org/show_bug.cgi?id=162 + ;; (mapfam nil emods :separator " " :result-type #'concat)) emods)))) (provide 'emod-utils) -- 2.34.1