[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 7629aa7: Revert "Fix completion in `read-library-name'"

From: Lars Ingebrigtsen
Subject: master 7629aa7: Revert "Fix completion in `read-library-name'"
Date: Mon, 14 Sep 2020 07:27:56 -0400 (EDT)

branch: master
commit 7629aa74091d43370da751d86b0584ba3516ea75
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Revert "Fix completion in `read-library-name'"
    This reverts commit ed44217d3245ddc8f2cf75c9499d5bb37848cfd7.
    This commit broke the use case of `M-x load-library RET o/or TAB' to
    expand to org/org.
 lisp/emacs-lisp/find-func.el | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 9e252d8..f3f3944 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -286,20 +286,10 @@ Interactively, prompt for LIBRARY using the one at or 
near point."
 A library name is the filename of an Emacs Lisp library located
 in a directory under `load-path' (or `find-function-source-path',
 if non-nil)."
-  (let* ((suffix-regexp (mapconcat
-                         (lambda (suffix)
-                           (concat (regexp-quote suffix) "\\'"))
-                         (find-library-suffixes)
-                         "\\|"))
-         (table (cl-loop for dir in (or find-function-source-path load-path)
-                         for dir-or-default = (or dir default-directory)
-                         when (file-readable-p dir-or-default)
-                         append (mapcar
-                                 (lambda (file)
-                                   (replace-regexp-in-string suffix-regexp
-                                                             "" file))
-                                 (directory-files dir-or-default nil
-                                                  suffix-regexp))))
+  (let* ((dirs (or find-function-source-path load-path))
+         (suffixes (find-library-suffixes))
+         (table (apply-partially 'locate-file-completion-table
+                                 dirs suffixes))
          (def (if (eq (function-called-at-point) 'require)
                   ;; `function-called-at-point' may return 'require
                   ;; with `point' anywhere on this line.  So wrap the

reply via email to

[Prev in Thread] Current Thread [Next in Thread]