Skip to content

Fix compatibility issues with recent Emacs versions #44

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 4 commits into
base: master
Choose a base branch
from
Open

Fix compatibility issues with recent Emacs versions #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e7240e
Escape single quote in helm-rg-default-directory docstrings
imiric Jul 16, 2025
403dfc2
Replace usage of obsolete helm-attrset
imiric Jul 16, 2025
f31844f
Replace usage of obsolete point-at-bol
imiric Jul 16, 2025
350b737
Replace usage of removed with-helm-quittable
imiric Jul 16, 2025
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
10 changes: 5 additions & 5 deletions helm-rg.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,8 +673,8 @@ particular ripgrep option and set of options."
"Specification for starting directory to invoke ripgrep in.
Used in `helm-rg--interpret-starting-dir'. Possible values:

'default => Use `default-directory'.
'git-root => Use \"git rev-parse --show-toplevel\" (see
\='default => Use `default-directory'.
\='git-root => Use \"git rev-parse --show-toplevel\" (see
`helm-rg-git-executable').
<string> => Use the directory at path <string>."
:type '(choice symbol string)
Expand Down Expand Up @@ -1069,7 +1069,7 @@ any results."
(helm-rg--make-face 'helm-rg-error-message "no results for input")
(helm-rg--make-face 'font-lock-string-face input-repr)
(helm-rg--make-face 'helm-rg-error-message err-msg))))
(helm-attrset 'name helm-src-name)
(helm-set-attr 'name helm-src-name)
dummy-proc))

(defun helm-rg--validate-or-make-dummy-process (input)
Expand Down Expand Up @@ -1137,7 +1137,7 @@ functions."
:noquery t))
(helm-src-name
(format "argv: %s" (helm-rg--join " " argv))))
(helm-attrset 'name helm-src-name)
(helm-set-attr 'name helm-src-name)
(set-process-query-on-exit-flag real-proc nil)
real-proc))

Expand Down Expand Up @@ -1463,7 +1463,7 @@ TODO: add ert testing for this function!"

(defun helm-rg--current-line-contents ()
"`helm-current-line-contents' doesn't keep text properties."
(buffer-substring (point-at-bol) (point-at-eol)))
(buffer-substring (line-beginning-position) (line-end-position)))

(cl-defun helm-rg--nullable-states-different (a b &key (cmp #'eq))
"Compare A and B respecting nullability using CMP.
Expand Down
4 changes: 2 additions & 2 deletions tests/helm-rg-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@

(defun helm-rg-test--assert-current-line (line)
"Assert the contents of the current line, either in the `helm-rg' buffer, or in a matched file."
(let ((cur-line (buffer-substring (point-at-bol) (point-at-eol))))
(let ((cur-line (buffer-substring (line-beginning-position) (line-end-position))))
(should (equal cur-line line))))

(helm-rg-test--define-interactive-test test-helm-rg/helm-resume
"Test that the right file is visited when resuming a `helm-rg' session with `helm-resume'."
(helm-rg-test--delayed-do
(helm-keyboard-quit))
(with-helm-quittable
(with-local-quit
(helm-rg-test--find-gpl))
(let ((helm-rg-buf helm-last-buffer))
(sit-for helm-rg-test--time-step)
Expand Down