Skip to content

Commit 439f2f4

Browse files
authored
Merge pull request #2 from bbatsov/master
Update
2 parents 09139df + 460bc16 commit 439f2f4

84 files changed

Lines changed: 519 additions & 392 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/stale.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Markdown Lint
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
lint:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v4
10+
with:
11+
fetch-depth: 0
12+
- uses: tj-actions/changed-files@v45
13+
id: changed-files
14+
with:
15+
files: '**/*.md'
16+
separator: ","
17+
- uses: DavidAnson/markdownlint-cli2-action@v19
18+
if: steps.changed-files.outputs.any_changed == 'true'
19+
with:
20+
globs: ${{ steps.changed-files.outputs.all_changed_files }}
21+
separator: ","

.github/workflows/stale.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Close inactive issues and pull requests
2+
on:
3+
schedule:
4+
- cron: "30 1 * * *"
5+
6+
jobs:
7+
close-issues:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
issues: write
11+
pull-requests: write
12+
steps:
13+
- uses: actions/stale@v9
14+
with:
15+
days-before-issue-stale: 30
16+
days-before-issue-close: 30
17+
stale-issue-label: "stale"
18+
exempt-issue-labels: "bug, high priority, good first issue, pinned"
19+
stale-issue-message: >-
20+
This issue has been automatically marked as stale because it has not
21+
had any recent activity. It will be closed soon if no further
22+
activity occurs. Thank you for your understanding!
23+
close-issue-message: >-
24+
This issue been automatically closed due to lack of activity. Feel free to re-open it
25+
if you ever come back to it.
26+
days-before-pr-stale: 30
27+
days-before-pr-close: 30
28+
exempt-pr-labels: "high priority, good first issue, pinned"
29+
stale-pr-message: >-
30+
This pull request has been automatically marked as stale because it has not
31+
had any recent activity. It will be closed soon if no further
32+
activity occurs. Thank you for your contribution and understanding!
33+
close-pr-message: >-
34+
This pull request been automatically closed due to lack of activity. Feel free to re-open it
35+
if you ever come back to it.
36+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/unstale.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Unmark issues and pull requests as stale on activity
2+
on:
3+
issue_comment:
4+
types: [created]
5+
6+
# actions/stale does this automatically, but only once a day.
7+
# This immediately removes the label when the user creates a comment.
8+
jobs:
9+
remove-stale-label:
10+
if: (github.repository == 'bbatsov/prelude')
11+
runs-on: ubuntu-latest
12+
permissions:
13+
issues: write
14+
pull-requests: write
15+
steps:
16+
- name: Remove stale label
17+
env:
18+
GH_TOKEN: ${{ github.token }}
19+
run: gh issue edit ${{ github.event.issue.number }} --remove-label "stale" -R ${{ github.repository }}

.markdownlint-cli2.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
config:
2+
default: true
3+
# Use only dashes for unordered lists
4+
MD004:
5+
style: dash
6+
MD007:
7+
indent: 2
8+
MD029:
9+
style: ordered
10+
# Allow inline HTML
11+
MD033: false

CHANGELOG.md

Lines changed: 58 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,85 @@
1+
<!-- markdownlint-disable MD013 MD024 -->
2+
13
# Change log
24

35
## master (unreleased)
46

57
### New features
68

7-
* Enable `org-habits`.
8-
* Neatly track `TODO` state changes in a drawer (LOGBOOK) thereby.
9-
improving readability
10-
* Add a module to enable Literate Programming (`prelude-literal-programming.el`).
11-
* Add a Racket module.
12-
* Add a Lua module.
13-
* Auto-install `racket-mode` if needed.
14-
* Add a F# module.
15-
* Auto-install `use-package`.
16-
* Add `prelude-vertico` module. Vertico a simpler alternative to `ivy-mode` and supersedes Selectrum.
9+
- [PR 1432](https://github.com/bbatsov/prelude/pull/1432): Allow directories of custom Emacs Lisp files in `personal/preload`.
10+
- Enable `org-habits`.
11+
- Neatly track `TODO` state changes in a drawer (LOGBOOK), thereby improving readability.
12+
- Add a module to enable Literate Programming (`prelude-literal-programming.el`).
13+
- Add a Racket module.
14+
- Add a Lua module.
15+
- Auto-install `racket-mode` if needed.
16+
- Add a F# module.
17+
- Auto-install `use-package`.
18+
- Add `prelude-vertico` module. Vertico a simpler alternative to `ivy-mode` and supersedes Selectrum.
19+
- [#1421](https://github.com/bbatsov/prelude/issues/1421): Make it possible to configure the TypeScript format action using `prelude-ts-format-action`.
20+
- [#1354](https://github.com/bbatsov/prelude/issues/1354): Remove default `C--` and `C-+` keybindings to increase/decrease the font size.
21+
- Add `prelude-projectile` user option, allowing Projectile integration to be disabled.
22+
- Add `prelude-hippie-expand` user option, allowing hippie-expand support to be disabled.
1723

1824
### Changes
1925

20-
* Bind all essential `avy` commands to their recommended keybindings.
21-
* Remove `company-lsp`.
22-
* Replace `yank-pop` key-binding to `counse-yank-pop` for `ivy-mode`.
23-
* The keybinding for `proced` is now enabled unconditionally.
24-
* Replace prelude-go backend with `lsp` instead of unmaintained tools.
25-
* Use `rust-analyzer` as language server for prelude-rust and provide nicer syntax highlighting with `tree-sitter`.
26-
* Use `js2-mode` for Node.js specific `.cjs` and `.mjs` extensions.
26+
- Remove redundant addition to `auto-mode-alist` for Markdown
27+
(note: this reverts the default to `markdown-mode` instead of `gfm-mode`).
28+
- Bind all essential `avy` commands to their recommended keybindings.
29+
- Remove `company-lsp`.
30+
- Replace `yank-pop` key-binding to `counse-yank-pop` for `ivy-mode`.
31+
- The keybinding for `proced` is now enabled unconditionally.
32+
- Replace prelude-go backend with `lsp` instead of unmaintained tools.
33+
- Use `rust-analyzer` as language server for prelude-rust and provide nicer syntax highlighting with `tree-sitter`.
34+
- Use `js2-mode` for Node.js specific `.cjs` and `.mjs` extensions.
35+
- Add `prelude-undo-tree` custom variable: allows user disable
36+
undo-tree integration. Enabled by default to maintain backward-compatibility.
2737

2838
### Bugs fixed
2939

30-
* Fix `company` still being visible in the mode line.
31-
* [#1335](https://github.com/bbatsov/prelude/issues/1335): Workaround
40+
- [PR 1433](https://github.com/bbatsov/prelude/pull/1433): Remove a duplicate `when` call in `modules/prelude-helm-everywhere.el` causing an emacs init error when `prelude-helm-everywhere` is enabled.
41+
- Fix `company` still being visible in the mode line.
42+
- [#1335](https://github.com/bbatsov/prelude/issues/1335): Workaround
3243
for `which-key` bug causing display issues in clients to `emacs --daemon`.
33-
* Fix **Edit on GitHub** link in ReadTheDocs site.
34-
* Fix fall back to sample `prelude-modules.el` not working if user has installed to non-default location.
35-
* Stop requiring `helm-config` since upstream has removed the module.
36-
* Require `typescript-mode` using `prelude-require-packages` to avoid error upon inclusion in `personal/prelude-modules.el`.
37-
* Turn off `super-save` in `rust-mode` to prevent severe hangs during autocomplete.
38-
* Update `prelude-dart.el` to use `lsp-dart-dap-setup` instead of deprecated `dap-dart-setup` function.
44+
- Fix **Edit on GitHub** link in ReadTheDocs site.
45+
- Fix fall back to sample `prelude-modules.el` not working if user has installed to non-default location.
46+
- Stop requiring `helm-config` since upstream has removed the module.
47+
- Require `typescript-mode` using `prelude-require-packages` to avoid error upon inclusion in `personal/prelude-modules.el`.
48+
- Turn off `super-save` in `rust-mode` to prevent severe hangs during autocomplete.
49+
- Update `prelude-dart.el` to use `lsp-dart-dap-setup` instead of deprecated `dap-dart-setup` function.
3950

4051
## 1.1.0 (2021-02-14)
4152

4253
### New features
4354

44-
* Enable `nlinum-mode` or `display-line-numbers-mode` by default. Can be disabled by setting `prelude-minimalistic-ui` to `t`.
45-
* Enable site-wide installation for Prelude.
46-
* Auto-installs `julia-mode` if needed.
47-
* Auto-install `adoc-mode` for AsciiDoc files.
48-
* Add the `ag` package. It provides a nice alternative to `grep` and has nice Projectile integration.
49-
* Added additional configuration modules for WSL (`prelude-wsl`) and Windows (`prelude-windows`).
50-
* Add `prelude-selectrum` module. Selectrum a simpler alternative to `ivy-mode`.
55+
- Enable `nlinum-mode` or `display-line-numbers-mode` by default. Can be disabled by setting `prelude-minimalistic-ui` to `t`.
56+
- Enable site-wide installation for Prelude.
57+
- Auto-installs `julia-mode` if needed.
58+
- Auto-install `adoc-mode` for AsciiDoc files.
59+
- Add the `ag` package. It provides a nice alternative to `grep` and has nice Projectile integration.
60+
- Added additional configuration modules for WSL (`prelude-wsl`) and Windows (`prelude-windows`).
61+
- Add `prelude-selectrum` module. Selectrum a simpler alternative to `ivy-mode`.
5162

5263
### Changes
5364

54-
* [#1292](https://github.com/bbatsov/prelude/issues/1292): Add `prelude-python-mode-set-encoding-automatically` defcustom inn `prelude-python.el` module with nil default value.
55-
* [#1278](https://github.com/bbatsov/prelude/issues/1278): Don't disable `menu-bar-mode` unless `prelude-minimalistic-ui` is enabled.
56-
* [#1277](https://github.com/bbatsov/prelude/issues/1277): Make it possible to disable the creation of `Super`-based keybindings via `prelude-super-keybindings`.
57-
* Removed deprecated alias `prelude-ensure-module-deps`.
58-
* Remove `prelude-fullscreen`, as these days people can use `toggle-frame-fullscreen` instead. (it was introduced in Emacs 24.4)
59-
* Removed `beacon-mode`.
60-
* Added `transient/` to `.gitignore`.
61-
* Fallback to `sample/prelude-modules.el` in the absence of a `prelude-modules.el` in one's personal folder.
62-
* [Ruby] Don't auto-insert coding comments.
63-
* Hide (via `diminish`) `editorconfig-mode`, `super-save`, `company`, `abbrev` and `ivy` in the modeline.
64-
* Use `lsp-workspace-restart` function instead of deprecated `lsp-restart-workspace`.
65-
* Bind all online search commands under `C-c C-/` to avoid a conflict with `counsel-git` or `magit-file-dispatch`.
66-
* Bound `magit-file-mode` to `C-c g` (it's also bound to `C-c M-g` if you decide to utilize this keybinding for something else.
67-
* Added `.cache/` and `lsp-session*` to `.gitignore`. These are generated by `lsp`.
65+
- [#1292](https://github.com/bbatsov/prelude/issues/1292): Add `prelude-python-mode-set-encoding-automatically` defcustom inn `prelude-python.el` module with nil default value.
66+
- [#1278](https://github.com/bbatsov/prelude/issues/1278): Don't disable `menu-bar-mode` unless `prelude-minimalistic-ui` is enabled.
67+
- [#1277](https://github.com/bbatsov/prelude/issues/1277): Make it possible to disable the creation of `Super`-based keybindings via `prelude-super-keybindings`.
68+
- Removed deprecated alias `prelude-ensure-module-deps`.
69+
- Remove `prelude-fullscreen`, as these days people can use `toggle-frame-fullscreen` instead. (it was introduced in Emacs 24.4)
70+
- Removed `beacon-mode`.
71+
- Added `transient/` to `.gitignore`.
72+
- Fallback to `sample/prelude-modules.el` in the absence of a `prelude-modules.el` in one's personal folder.
73+
- [Ruby] Don't auto-insert coding comments.
74+
- Hide (via `diminish`) `editorconfig-mode`, `super-save`, `company`, `abbrev` and `ivy` in the modeline.
75+
- Use `lsp-workspace-restart` function instead of deprecated `lsp-restart-workspace`.
76+
- Bind all online search commands under `C-c C-/` to avoid a conflict with `counsel-git` or `magit-file-dispatch`.
77+
- Bound `magit-file-mode` to `C-c g` (it's also bound to `C-c M-g` if you decide to utilize this keybinding for something else.
78+
- Added `.cache/` and `lsp-session*` to `.gitignore`. These are generated by `lsp`.
6879

6980
### Bugs fixed
7081

71-
* [#1302](https://github.com/bbatsov/prelude/issues/1302): `C-a` should be bound to `org-beginning-of-line` in org-mode buffers.
82+
- [#1302](https://github.com/bbatsov/prelude/issues/1302): `C-a` should be bound to `org-beginning-of-line` in org-mode buffers.
7283

7384
## 1.0.0 (2020-09-15)
7485

CONTRIBUTING.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ try to follow these guidelines when you do so.
77

88
## Issue reporting
99

10-
* Check that the [issue has not already been reported][2].
11-
* Check that the issue has not already been fixed in the latest code
10+
- Check that the [issue has not already been reported][2].
11+
- Check that the issue has not already been fixed in the latest code
1212
(a.k.a. `master`).
13-
* Be clear, concise and precise in your description of the problem.
14-
* Open an issue with a descriptive title and a summary in grammatically correct,
13+
- Be clear, concise and precise in your description of the problem.
14+
- Open an issue with a descriptive title and a summary in grammatically correct,
1515
complete sentences.
16-
* Include any relevant code to the issue summary.
16+
- Include any relevant code to the issue summary.
1717

1818
## Pull requests
1919

20-
* Read [how to properly contribute to open source projects on GitHub][3].
21-
* Use a topic branch to easily amend a pull request later, if necessary.
22-
* Write [good commit messages][4].
23-
* Update the [changelog][5].
24-
* Use the same coding conventions as the rest of the project.
25-
* Verify your Emacs Lisp code with `checkdoc` (<kbd>C-c ? d</kbd>).
26-
* Open a [pull request][6] that relates to *only* one subject with a clear title
20+
- Read [how to properly contribute to open source projects on GitHub][3].
21+
- Use a topic branch to easily amend a pull request later, if necessary.
22+
- Write [good commit messages][4].
23+
- Update the [changelog][5].
24+
- Use the same coding conventions as the rest of the project.
25+
- Verify your Emacs Lisp code with `checkdoc` (<kbd>C-c ? d</kbd>).
26+
- Open a [pull request][6] that relates to *only* one subject with a clear title
2727
and description in grammatically correct, complete sentences.
2828

2929
[1]: https://github.com/bbatsov/prelude/issues

0 commit comments

Comments
 (0)