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

Use corfu--initial-state instead of corfu--initial-state #159

Merged
merged 1 commit into from
Jan 6, 2024

Conversation

zonuexe
Copy link
Contributor

@zonuexe zonuexe commented Dec 31, 2023

Fixes #158

I don't have a good understanding of corfu and prescient, so I haven't confirmed that they work properly. This patch may be insufficient. In that case, please feel free to close this PR.

@okamsn
Copy link
Contributor

okamsn commented Jan 3, 2024

This seems to work for me. Thank you for making this pull request.

@raxod, how do you want to handle the changed variable? Do you want the Prescient code to still work with the older variable until a new stable version of Corfu is published (which this PR currently does)?

@raxod502
Copy link
Member

raxod502 commented Jan 3, 2024

That seems prudent, if the change was recent, then people might be using either the new version or the old version. Unless it's difficult, it makes sense to me to support both.

Of course, it goes without saying that it'd be nice if there were a public interface exposed that could be used instead.

@zonuexe
Copy link
Contributor Author

zonuexe commented Jan 5, 2024

Currently, the package dependencies are as follows:

;; Package-Requires: ((emacs "27.1") (prescient "6.1.0") (corfu "0.28"))

Corfu has been released 10 times since 0.28, but the variable change was included in 1.1.

- If `corfu--state-vars` is not bound, use the new
  `corfu--initial-state` instead.
- Bump the required Corfu version from 0.28 to 1.1.  Once the next
  stable version is released, we can bump it again and remove
  references to the old variable.
- Update the changelog.

See:
- Corfu commit 63d1de2696adcb09a4ea01ba668635364e37a9c2
  (minad/corfu@63d1de2)
- This PR radian-software#159.
- Prescient issue radian-software#158, reporting this change.
@okamsn okamsn merged commit 4b875be into radian-software:main Jan 6, 2024
4 checks passed
@okamsn
Copy link
Contributor

okamsn commented Jan 6, 2024

Currently, the package dependencies are as follows:

;; Package-Requires: ((emacs "27.1") (prescient "6.1.0") (corfu "0.28"))

Corfu has been released 10 times since 0.28, but the variable change was included in 1.1.

I think that Emacs treats the 0.28 as a minimum version number, so it shouldn't cause any problems for the version before the change. Still, I have bumped it to 1.1. I will increase the required version number again once the next stable version of Corfu is released.

I have merged the PR. Thanks to those that created the issue and thank you for providing the fix.

chuxubank added a commit to chuxubank/cat-emacs that referenced this pull request Jan 7, 2024
@zonuexe zonuexe deleted the fix/corf-initial-state branch January 7, 2024 10:54
@zonuexe
Copy link
Contributor Author

zonuexe commented Jan 7, 2024

@okamsn Thanks for improving and merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Corfu changes the corfu--state-vars to corfu--initial-state
3 participants