Skip to content

fish: Make CTRL-R work on empty/invalid $fish_color{normal,comment}#4831

Merged
bitraid merged 1 commit into
junegunn:masterfrom
bitraid:fish-hist
Jun 14, 2026
Merged

fish: Make CTRL-R work on empty/invalid $fish_color{normal,comment}#4831
bitraid merged 1 commit into
junegunn:masterfrom
bitraid:fish-hist

Conversation

@bitraid

@bitraid bitraid commented Jun 13, 2026

Copy link
Copy Markdown
Collaborator

Fix #4767
Fix #4830

Contribution Policy

We do not accept pull requests generated primarily by AI without genuine understanding or real-world usage context.

All contributions are expected to demonstrate:

  • A clear understanding of the codebase
  • Alignment with product direction
  • Thoughtful reasoning behind changes
  • Evidence of real-world usage or hands-on experience with the problem

If these expectations are not met, we would prefer to implement the changes ourselves rather than spend time reviewing low-effort submissions.


Acknowledgement

  • I confirm that this PR meets the above expectations and reflects my own understanding and real-world context.

@bitraid bitraid requested a review from junegunn as a code owner June 13, 2026 09:32
@github-actions github-actions Bot added shell Shell scripts fish Fish shell labels Jun 13, 2026
@junegunn junegunn requested a review from Copilot June 13, 2026 12:22

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR aims to fix Fish shell Ctrl-R history search failures caused by invalid/empty $fish_color_comment and/or $fish_color_normal, which can currently result in set_color errors and a blank fzf list (as reported in #4767 and #4830).

Changes:

  • Updates the Fish Ctrl-R history command to fall back to set_color normal when $fish_color_comment is invalid/empty, avoiding set_color errors during --show-time formatting.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread shell/key-bindings.fish

@junegunn junegunn left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Thanks!

@bitraid bitraid merged commit 3c9965a into junegunn:master Jun 14, 2026
6 checks passed
@bitraid bitraid deleted the fish-hist branch June 14, 2026 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fish Fish shell shell Shell scripts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CTRL-R no longer working properly in Fish history search broken in fish shell

3 participants