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 <steve@sxemacs.org>
(defun find-emod-directories ()
(let* ((objdir "../modules/")
(files (directory-files-recur
(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)
'list t 1))
(dir-bloom (make-bloom))
directories)
(split-string-by-char path ?:)
path)
module-load-path))
(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)))
completions)
(while dirs
(let ((files (directory-files-recur (car dirs) nil types 'list t 0)))
(let ((emods (list-loaded-modules)))
(if (interactive-p)
(message "Loaded emodules: %s"
(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)
emods))))
(provide 'emod-utils)