Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
k9ki10 committed Nov 12, 2024
2 parents 7b55b11 + 9106aea commit d08d688
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
* Fix fall back to sample `prelude-modules.el` not working if user has installed to non-default location.
* Stop requiring `helm-config` since upstream has removed the module.
* Require `typescript-mode` using `prelude-require-packages` to avoid error upon inclusion in `personal/prelude-modules.el`.
* Turn off `super-save` in `rust-mode` to prevent severe hangs during autocomplete.
* Update `prelude-dart.el` to use `lsp-dart-dap-setup` instead of deprecated `dap-dart-setup` function.

## 1.1.0 (2021-02-14)

Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
site_name: "Prelude: A sleek, modern, simple and powerful Emacs experience for everyone"
repo_url: https://github.com/bbatsov/prelude
copyright: "Copyright (C) 2011-2023 Bozhidar Batsov and Prelude contributors"
copyright: "Copyright (C) 2011-2024 Bozhidar Batsov and Prelude contributors"
docs_dir: docs
nav:
- Home: index.md
Expand Down
2 changes: 1 addition & 1 deletion modules/prelude-dart.el
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
;; Add to default dart-mode key bindings
(lsp-dart-define-key "s o" #'lsp-dart-show-outline)
(lsp-dart-define-key "s f" #'lsp-dart-show-flutter-outline)
(dap-dart-setup))
(lsp-dart-dap-setup))

(setq prelude-dart-mode-hook 'prelude-dart-mode-defaults)

Expand Down
3 changes: 3 additions & 0 deletions modules/prelude-rust.el
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
(require 'tree-sitter)
(require 'tree-sitter-langs)

(add-to-list 'super-save-predicates
(lambda () (not (eq major-mode 'rust-mode))))

(with-eval-after-load 'rust-mode
(add-hook 'rust-mode-hook 'cargo-minor-mode)
(add-hook 'flycheck-mode-hook 'flycheck-rust-setup)
Expand Down
14 changes: 14 additions & 0 deletions readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Read the Docs configuration file for MkDocs projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.12"

mkdocs:
configuration: mkdocs.yml

0 comments on commit d08d688

Please sign in to comment.