Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/help-fns.el (help-fns-short-filename): Skip relative file names

Browse source
This commit is contained in:
Stefan Monnier 2024-12-13 17:47:22 -05:00
parent 5923d8ebef
commit dde5d0a41e
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lisp/help-fns.el
View file

@ -1064,22 +1064,30 @@ TYPE indicates the namespace and is `fun' or `var'."
rt)))
(defun help-fns-short-filename (filename)
(let* ((short (help-fns--filename filename))
(prefixes (radix-tree-prefixes (help-fns--radix-tree load-path)
(file-name-directory short))))
(if (not prefixes)
;; The file is not inside the `load-path'.
;; FIXME: Here's the old code (too slow, bug#73766),
;; which used to try and shorten it with "../" as well.
;; (dolist (dir load-path)
;; (let ((rel (file-relative-name filename dir)))
;; (if (< (length rel) (length short))
;; (setq short rel)))
;; (let ((rel (file-relative-name abbrev dir)))
;; (if (< (length rel) (length short))
;; (setq short rel))))
short
(file-relative-name short (caar prefixes)))))
"Turn a full Elisp file name to one relative to `load-path'."
(if (not (file-name-absolute-p filename))
;; This happens when FILENAME is a `src/*.c' returned by
;; `help-C-file-name', in which case it's not searched through
;; `load-path' anyway (bug#74504).
;; Even if it came from elsewhere it's not clear to
;; which directory it is relative.
filename
(let* ((short (help-fns--filename filename))
(prefixes (radix-tree-prefixes (help-fns--radix-tree load-path)
(file-name-directory short))))
(if (not prefixes)
;; The file is not inside the `load-path'.
;; FIXME: Here's the old code (too slow, bug#73766),
;; which used to try and shorten it with "../" as well.
;; (dolist (dir load-path)
;; (let ((rel (file-relative-name filename dir)))
;; (if (< (length rel) (length short))
;; (setq short rel)))
;; (let ((rel (file-relative-name abbrev dir)))
;; (if (< (length rel) (length short))
;; (setq short rel))))
short
(file-relative-name short (caar prefixes))))))
(defun help-fns--analyze-function (function)
;; FIXME: Document/explain the differences between FUNCTION,