Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix package count when using package.el and straight.el simultaneously #233

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
Nov 25, 2020
Merged

Fix package count when using package.el and straight.el simultaneously #233

merged 6 commits into from
Nov 25, 2020

Conversation

konkrotte
Copy link
Contributor

Fix package count when someone is using straight.el and package.el at the same time.

@jcs090218 jcs090218 mentioned this pull request Oct 29, 2020
Merged
@jcs090218
Copy link
Member

@2bruh4me Can you resolve the conflict for us? Thanks! 😄

@konkrotte
Copy link
Contributor Author

What is causing the tests to fail?

@jcs090218
Copy link
Member

Here is the log.

dashboard-widgets.el:162:0 (fill-column) line length 100 exceeded
dashboard-widgets.el:164:0 (fill-column) line length 100 exceeded
dashboard-widgets.el FAIL
Makefile:19: recipe for target 'lint' failed
make: *** [lint] Error 1

@konkrotte konkrotte changed the title Add fix for people using straight.el and package.el in dashboard-init… Fix package count when using package.el and straight.el simultaneously Nov 15, 2020
@konkrotte
Copy link
Contributor Author

All the problems are resolved now.

@jcs090218
Copy link
Member

Sorry that we have changed this part of code from if to cond operation. Do you think you can resolve the conflict from this changes? Sorry for the inconvenience! 😖

@konkrotte
Copy link
Contributor Author

@jcs090218 Is this good enough?

@jcs090218
Copy link
Member

Yes! Thanks for your contribution! ;)

@jcs090218 jcs090218 merged commit dcebb89 into emacs-dashboard:master Nov 25, 2020
@jcs090218 jcs090218 mentioned this pull request Nov 25, 2020
Merged
@konkrotte konkrotte deleted the package-and-straight-fix branch November 25, 2020 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jcs090218 jcs090218 jcs090218 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@konkrotte @jcs090218