summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorTobias Zawada <i_inbox@tn-home.de>2020-08-13 18:42:28 +0200
committerStefan Kangas <stefankangas@gmail.com>2020-08-13 18:59:41 +0200
commit975acf5737248eb25900363e01d828a9c1cada64 (patch)
treec74f3d20629f50bded15e7e4243550f5d105b7a7 /lisp/emacs-lisp
parent3e00a78a32cc50a0e4a587cfafb8850e52331dd7 (diff)
downloademacs-975acf5737248eb25900363e01d828a9c1cada64.tar.gz
emacs-975acf5737248eb25900363e01d828a9c1cada64.tar.bz2
emacs-975acf5737248eb25900363e01d828a9c1cada64.zip
Handle nil load-path element in read-library-name
* lisp/emacs-lisp/find-func.el (read-library-name): Fix handling of nil 'load-path' element. (Bug#41998) Copyright-paperwork-exempt: yes
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/find-func.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index e35db56550d..56b3e32a3e3 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -292,12 +292,13 @@ if non-nil)."
(find-library-suffixes)
"\\|"))
(table (cl-loop for dir in (or find-function-source-path load-path)
- when (file-readable-p dir)
+ 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 nil
+ (directory-files dir-or-default nil
suffix-regexp))))
(def (if (eq (function-called-at-point) 'require)
;; `function-called-at-point' may return 'require