summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/find-func.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-08-19 16:11:00 +0200
committerAndrea Corallo <akrl@sdf.org>2020-08-19 16:11:00 +0200
commit886377fefd03a7b893afad28746e69615a300994 (patch)
tree03111a6e9c917daefd63daa7efa3f029ae6485af /lisp/emacs-lisp/find-func.el
parentfc9b68636b1aec69295726d2b3be2b520911f40b (diff)
parentf8d3d18168a742691d095a3f0c83512f19621725 (diff)
downloademacs-886377fefd03a7b893afad28746e69615a300994.tar.gz
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/find-func.el')
-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 2db976f8c5c..60b16257a3e 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -296,12 +296,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