Skip to content
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.

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

Ensure history uses fish builtin #65

Merged
merged 2 commits into from
Dec 7, 2020
Merged

Ensure history uses fish builtin #65

merged 2 commits into from
Dec 7, 2020

Conversation

reynn
Copy link
Contributor

@reynn reynn commented Dec 7, 2020

  • specify builtin for history to ensure no aliases

This helps prevent issues with ctrl+r if history is aliased to something else.

PatrickF1 and others added 2 commits November 26, 2020 09:13
I must have accidentally set the execute permission on that file while testing and never noticed it until now.
@@ -1,9 +1,9 @@
function __fzf_search_history --description "Search command history using fzf. Replace the commandline with the selected command."
# history merge incorporates history changes from other fish sessions
history merge
builtin history merge
Copy link
Owner

@PatrickF1 PatrickF1 Dec 7, 2020

Choose a reason for hiding this comment

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

Are you sure we don't want command instead of builtin? Here, we are using the fish provided version of history and command forces us to use that.

Copy link
Owner

Choose a reason for hiding this comment

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

My bad--sorry--you are right. History is a builtin and so we want builtin history. Thanks for your PR!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks! Here is a reference to the builtin docs in case anyone else comes upon this https://fishshell.com/docs/current/cmds/builtin.html

@PatrickF1 PatrickF1 merged commit 6f4b6b4 into PatrickF1:main Dec 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants