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

Avoid performing prompt reset in zle-line-finish hook #477

Merged
merged 1 commit into from
Jun 20, 2019

Conversation

mafredri
Copy link
Collaborator

We can't perform a prompt reset at this point because it removes the prompt marks inserted by macOS Terminal.

This change will no longer allow the prompt to reset (from ❮ to ❯) when the user hits [Enter] in VI-mode. However, this might actually be the right thing to do.

Fixes #476.

We can't perform a prompt reset at this point because it removes the
prompt marks inserted by macOS Terminal.

This change will no longer allow the prompt to reset (from ❮ to ❯) when
the user hits [Enter] in VI-mode. However, this might actually be the
right thing to do.

Fixes #476.
@sindresorhus
Copy link
Owner

@RexYuan Can you confirm this fixes your problem?

@RexYuan
Copy link

RexYuan commented Jun 20, 2019

Sorry for the delay. I just reinstalled with npm but it doesn't seem to work still. Should I have tried something else?

Edit: oh I just realized the PR hasn't gone through yet. I'm not familiar with the inner workings of zsh themes so I'm not really sure if this will fix the problem. Sorry.

@mafredri
Copy link
Collaborator Author

@RexYuan this is not yet part of any release. What you can do is e.g. download pure.zsh from this PR and enable it or replace the one from npm with it.

@RexYuan
Copy link

RexYuan commented Jun 20, 2019

Thanks @mafredri. I tried the pure.zsh you provided and sync.zsh from master and indeed this fixed the problem. The marks are working again.

@sindresorhus sindresorhus merged commit 6fec9d7 into master Jun 20, 2019
@sindresorhus sindresorhus deleted the terminal-mark-fix branch June 20, 2019 14:37
kgrz added a commit to kgrz/pure that referenced this pull request Jul 18, 2019
* upstream/master: (25 commits)
  Fix incorrect color name in the readme (sindresorhus#482)
  1.10.3
  Fix username prompt expansion
  1.10.2
  Bump version number in pure state
  Fix bad set of key/value pairs on old versions of ZSH
  1.10.1
  Suppress warning of WARN_CREATE_GLOBAL option (sindresorhus#479)
  1.10.0
  Update the zsh-async version to reflect the code
  Improve code comments
  Avoid performing prompt reset in zle-line-finish hook (sindresorhus#477)
  Add support for configuring colors with zstyle (sindresorhus#472)
  Improve the style of the continuation prompt (PS2) (sindresorhus#323)
  Fix username color (sindresorhus#450)
  Add `prompt_pure_system_report` for reporting issues (sindresorhus#468)
  Add pure10k to the list of ports (sindresorhus#474)
  Create funding.yml
  Add pure-pwsh to the ports section of the readme (sindresorhus#467)
  Skip grep fork, use native zsh matching (sindresorhus#459)
  ...
filipekiss added a commit to filipekiss/pure that referenced this pull request Jul 19, 2019
* upstream/master:
  Fix incorrect color name in the readme (sindresorhus#482)
  1.10.3
  Fix username prompt expansion
  1.10.2
  Bump version number in pure state
  Fix bad set of key/value pairs on old versions of ZSH
  1.10.1
  Suppress warning of WARN_CREATE_GLOBAL option (sindresorhus#479)
  1.10.0
  Update the zsh-async version to reflect the code
  Improve code comments
  Avoid performing prompt reset in zle-line-finish hook (sindresorhus#477)
  Add support for configuring colors with zstyle (sindresorhus#472)
  Improve the style of the continuation prompt (PS2) (sindresorhus#323)
  Fix username color (sindresorhus#450)
  Add `prompt_pure_system_report` for reporting issues (sindresorhus#468)
  Add pure10k to the list of ports (sindresorhus#474)
  Create funding.yml

# Conflicts:
#	package.json
#	pure.zsh
#	readme.md
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.

Terminal Marks don't work
3 participants