mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 06:01:22 -08:00
Code Issues Projects Releases Wiki Activity

Revert "Fix completion in `read-library-name'"

Browse source 
This reverts commit ed44217d32.

This commit broke the use case of `M-x load-library RET o/or TAB' to
expand to org/org.
This commit is contained in:
Lars Ingebrigtsen 2020-09-14 13:26:17 +02:00
parent 7cc1614338
commit 7629aa7409
1 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/emacs-lisp/find-func.el
View file

@ -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