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

CoqIDE: load coqiderc after coqide.keys #10014

Merged
merged 3 commits into from Apr 29, 2019

Conversation

@herbelin
Copy link
Member

commented Apr 27, 2019

Kind: bug fix

Partly addresses #9899.

  • Entry added in CHANGES.md.
herbelin added 3 commits Apr 27, 2019
CoqiDE: Load coqide.keys after coqiderc (addressing part of #9899).
This avoids the modifiers keys to overwrite changes made in
coqide.keys.
CoqIDE, cosmetic: removing obsolete comments.
There is no more uses of "old style preferences" but the comment was
still there.
@maximedenes

This comment has been minimized.

Copy link
Member

commented Apr 29, 2019

@ppedrot Can you have a look?

@ppedrot ppedrot self-assigned this Apr 29, 2019

@coqbot coqbot added this to Request 8.10 inclusion in Coq 8.10 Apr 29, 2019

@ppedrot ppedrot merged commit 8edf5a8 into coq:master Apr 29, 2019

8 checks passed

GitLab CI pipeline Pipeline completed on GitLab CI
Details
Pull request checks Passed.
Details
coq.coq Build #20190427.12 succeeded
Details
coq.coq (Windows) Windows succeeded
Details
coq.coq (macOS) macOS succeeded
Details
doc:ml-api:odoc: ml-api artifact Link to ml-api build artifact.
Details
doc:refman: refman artifact Link to refman build artifact.
Details
doc:refman: stdlib artifact Link to stdlib build artifact.
Details
ppedrot added a commit that referenced this pull request Apr 29, 2019
Zimmi48 added a commit to Zimmi48/coq that referenced this pull request Apr 29, 2019
vbgl added a commit to vbgl/coq that referenced this pull request Apr 29, 2019
Zimmi48 added a commit to Zimmi48/coq that referenced this pull request Apr 29, 2019

@coqbot coqbot moved this from Request 8.10 inclusion to Shipped in 8.10+beta1 in Coq 8.10 Apr 30, 2019

Zimmi48 added a commit to Zimmi48/coq that referenced this pull request Apr 30, 2019
vbgl added a commit to vbgl/coq that referenced this pull request Apr 30, 2019
Change entry for coq#10014.
(cherry picked from commit 73a0d92)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
You can’t perform that action at this time.