Skip to content

Remove the dependency on "f" #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove the dependency on "f" #358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions helpful.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
;; URL: https://github.com/Wilfred/helpful
;; Keywords: help, lisp
;; Version: 0.22
;; Package-Requires: ((emacs "25") (dash "2.18.0") (s "1.11.0") (f "0.20.0") (elisp-refs "1.2"))
;; Package-Requires: ((emacs "25") (dash "2.18.0") (s "1.11.0") (elisp-refs "1.2"))

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -47,7 +47,6 @@
(require 'help-fns)
(require 'dash)
(require 's)
(require 'f)
(require 'find-func)
(require 'nadvice)
(require 'info-look)
Expand Down Expand Up @@ -349,8 +348,8 @@ source code to primitives."
(let ((emacs-src-dir (read-directory-name "Path to Emacs source code: ")))
;; Let the user specify the source path with or without src/,
;; which is a subdirectory in the Emacs tree.
(unless (equal (f-filename emacs-src-dir) "src")
(setq emacs-src-dir (f-join emacs-src-dir "src")))
(unless (equal (file-name-nondirectory (directory-file-name emacs-src-dir)) "src")
(setq emacs-src-dir (expand-file-name "src/" emacs-src-dir)))
(setq find-function-C-source-directory emacs-src-dir))
(helpful-update))

Expand Down Expand Up @@ -1333,10 +1332,11 @@ LIBRARY-NAME takes the form \"foo.el\" , \"foo.el\" or
\"src/foo.c\".

If .elc files exist without the corresponding .el, return nil."
(when (member (f-ext library-name) '("c" "rs"))
(when (member (file-name-extension library-name) '("c" "rs"))
(setq library-name
(f-expand library-name
(f-parent find-function-C-source-directory))))
(expand-file-name library-name
Copy link
Author

@Stebalien Stebalien Aug 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is slightly different in that it uses file-name handlers, but I'm pretty sure that's what we want (e.g., if the source directory is on a remote machine, in a docker container, etc.).

(file-name-directory
(directory-file-name find-function-C-source-directory)))))
Comment on lines +1338 to +1339
Copy link
Author

@Stebalien Stebalien Aug 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bit unfortunate. Emacs 29 has file-name-parent-directory but that's rather new.

(condition-case nil
(find-library-name library-name)
(error nil)))
Expand Down Expand Up @@ -2389,7 +2389,7 @@ state of the current symbol."
((and source-path primitive-p)
(format
"Finding references in a .%s file is not supported."
(f-ext source-path)))
(file-name-extension source-path)))
(source-path
(format "%s is unused in %s."
helpful--sym
Expand Down Expand Up @@ -2480,7 +2480,7 @@ state of the current symbol."
(propertize (format "%s Defined in " (if primitive-p "//" ";;"))
'face 'font-lock-comment-face)
(helpful--navigate-button
(f-abbrev source-path)
(abbreviate-file-name source-path)
source-path
pos)
"\n"))
Expand Down
Loading