From 4f880f1e6741affb7720575e92c9892067915f0a Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 21 Feb 2023 04:55:04 -0500 Subject: [PATCH 01/20] Fix installation of typescript-mode via prelude-ts (#1398) --- CHANGELOG.md | 1 + modules/prelude-ts.el | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1708b5bdf..6b74685a96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ * Fix **Edit on GitHub** link in ReadTheDocs site. * 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` ## 1.1.0 (2021-02-14) diff --git a/modules/prelude-ts.el b/modules/prelude-ts.el index 6c3d348576..27e4067421 100644 --- a/modules/prelude-ts.el +++ b/modules/prelude-ts.el @@ -30,9 +30,7 @@ ;;; Code: (require 'prelude-programming) -(prelude-require-packages '(tide)) - -(require 'typescript-mode) +(prelude-require-packages '(tide typescript-mode)) (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-mode)) From 23bbfc80fa819d568fa40ac013974eb9c9c8c2c1 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 07:57:29 +0100 Subject: [PATCH 02/20] Bump the copyright years --- README.md | 2 +- core/prelude-core.el | 2 +- core/prelude-custom.el | 2 +- core/prelude-editor.el | 2 +- core/prelude-global-keybindings.el | 2 +- core/prelude-linux.el | 2 +- core/prelude-macos.el | 2 +- core/prelude-mode.el | 2 +- core/prelude-packages.el | 2 +- core/prelude-ui.el | 2 +- core/prelude-windows.el | 2 +- core/prelude-wsl.el | 2 +- init.el | 2 +- mkdocs.yml | 2 +- modules/prelude-c.el | 2 +- modules/prelude-clojure.el | 2 +- modules/prelude-coffee.el | 2 +- modules/prelude-common-lisp.el | 2 +- modules/prelude-company.el | 2 +- modules/prelude-css.el | 2 +- modules/prelude-dart.el | 2 +- modules/prelude-elixir.el | 2 +- modules/prelude-emacs-lisp.el | 2 +- modules/prelude-erc.el | 2 +- modules/prelude-erlang.el | 2 +- modules/prelude-evil.el | 2 +- modules/prelude-haskell.el | 2 +- modules/prelude-helm-everywhere.el | 2 +- modules/prelude-helm.el | 2 +- modules/prelude-ido.el | 2 +- modules/prelude-ivy.el | 2 +- modules/prelude-js.el | 2 +- modules/prelude-key-chord.el | 2 +- modules/prelude-latex.el | 2 +- modules/prelude-lisp.el | 2 +- modules/prelude-lsp.el | 2 +- modules/prelude-lua.el | 2 +- modules/prelude-ocaml.el | 2 +- modules/prelude-org.el | 2 +- modules/prelude-perl.el | 2 +- modules/prelude-programming.el | 2 +- modules/prelude-python.el | 2 +- modules/prelude-racket.el | 2 +- modules/prelude-ruby.el | 2 +- modules/prelude-scala.el | 2 +- modules/prelude-scheme.el | 2 +- modules/prelude-scss.el | 2 +- modules/prelude-selectrum.el | 2 +- modules/prelude-shell.el | 2 +- modules/prelude-ts.el | 2 +- modules/prelude-web.el | 2 +- modules/prelude-xml.el | 2 +- modules/prelude-yaml.el | 2 +- sample/prelude-modules.el | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index 5a94a41cb3..2f0565e891 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ welcome. GitHub pull requests are even better! :-) ## License -Copyright © 2011-2022 Bozhidar Batsov and +Copyright © 2011-2023 Bozhidar Batsov and [contributors](https://github.com/bbatsov/prelude/contributors). Distributed under the GNU General Public License, version 3 diff --git a/core/prelude-core.el b/core/prelude-core.el index 2b969c4792..62db08d8e2 100644 --- a/core/prelude-core.el +++ b/core/prelude-core.el @@ -1,6 +1,6 @@ ;;; prelude-core.el --- Emacs Prelude: Core Prelude functions. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/core/prelude-custom.el b/core/prelude-custom.el index b421543385..2de41227ff 100644 --- a/core/prelude-custom.el +++ b/core/prelude-custom.el @@ -1,6 +1,6 @@ ;;; prelude-custom.el --- Emacs Prelude: Prelude's customizable variables. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/core/prelude-editor.el b/core/prelude-editor.el index 86ea0ea478..2dfcf3d524 100644 --- a/core/prelude-editor.el +++ b/core/prelude-editor.el @@ -1,6 +1,6 @@ ;;; prelude-editor.el --- Emacs Prelude: enhanced core editing experience. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/core/prelude-global-keybindings.el b/core/prelude-global-keybindings.el index d79ed46510..13dd8d91a8 100644 --- a/core/prelude-global-keybindings.el +++ b/core/prelude-global-keybindings.el @@ -1,6 +1,6 @@ ;;; prelude-global-keybindings.el --- Emacs Prelude: some useful keybindings. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/core/prelude-linux.el b/core/prelude-linux.el index a166bab51c..6e4139c40f 100644 --- a/core/prelude-linux.el +++ b/core/prelude-linux.el @@ -1,6 +1,6 @@ ;;; prelude-linux.el --- Emacs Prelude: linux specific settings. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Stanislav Arnaudov ;; URL: https://github.com/bbatsov/prelude diff --git a/core/prelude-macos.el b/core/prelude-macos.el index aae18287ac..62c80822a5 100644 --- a/core/prelude-macos.el +++ b/core/prelude-macos.el @@ -1,6 +1,6 @@ ;;; prelude-macos.el --- Emacs Prelude: macOS specific settings. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/core/prelude-mode.el b/core/prelude-mode.el index 42562cb185..e46369dfd4 100644 --- a/core/prelude-mode.el +++ b/core/prelude-mode.el @@ -1,6 +1,6 @@ ;;; prelude-mode.el --- Emacs Prelude: minor mode ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/core/prelude-packages.el b/core/prelude-packages.el index f92104eaff..05f831ca86 100644 --- a/core/prelude-packages.el +++ b/core/prelude-packages.el @@ -1,6 +1,6 @@ ;;; prelude-packages.el --- Emacs Prelude: default package selection. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/core/prelude-ui.el b/core/prelude-ui.el index 9178ad7c5b..29483239ba 100644 --- a/core/prelude-ui.el +++ b/core/prelude-ui.el @@ -1,6 +1,6 @@ ;;; prelude-ui.el --- Emacs Prelude: UI optimizations and tweaks. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/core/prelude-windows.el b/core/prelude-windows.el index 2a157fa09f..425e069bb8 100644 --- a/core/prelude-windows.el +++ b/core/prelude-windows.el @@ -1,6 +1,6 @@ ;;; prelude-windows.el --- Emacs Prelude: Windows-specific setup. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; URL: https://github.com/bbatsov/prelude diff --git a/core/prelude-wsl.el b/core/prelude-wsl.el index 2dbac13860..14bfc54ab5 100644 --- a/core/prelude-wsl.el +++ b/core/prelude-wsl.el @@ -1,6 +1,6 @@ ;;; prelude-wsl.el --- Emacs Prelude: WSL-specific setup. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; URL: https://github.com/bbatsov/prelude diff --git a/init.el b/init.el index 955c9f301e..f37fb5ff7d 100644 --- a/init.el +++ b/init.el @@ -1,6 +1,6 @@ ;;; init.el --- Prelude's configuration entry point. ;; -;; Copyright (c) 2011-2022 Bozhidar Batsov +;; Copyright (c) 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/mkdocs.yml b/mkdocs.yml index 7839a2671e..30fad1eab5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -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-2022 Bozhidar Batsov and Prelude contributors" +copyright: "Copyright (C) 2011-2023 Bozhidar Batsov and Prelude contributors" docs_dir: docs nav: - Home: index.md diff --git a/modules/prelude-c.el b/modules/prelude-c.el index 0480b41605..ebc2e52456 100644 --- a/modules/prelude-c.el +++ b/modules/prelude-c.el @@ -1,6 +1,6 @@ ;;; prelude-c.el --- Emacs Prelude: cc-mode configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-clojure.el b/modules/prelude-clojure.el index 8a0b7a9e31..12f730b825 100644 --- a/modules/prelude-clojure.el +++ b/modules/prelude-clojure.el @@ -1,6 +1,6 @@ ;;; prelude-clojure.el --- Emacs Prelude: Clojure programming configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-coffee.el b/modules/prelude-coffee.el index 361e1fa4bb..875effc999 100644 --- a/modules/prelude-coffee.el +++ b/modules/prelude-coffee.el @@ -1,6 +1,6 @@ ;;; prelude-coffee.el --- Emacs Prelude: CoffeeScript programming support. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-common-lisp.el b/modules/prelude-common-lisp.el index 308011b8bc..7640390d5d 100644 --- a/modules/prelude-common-lisp.el +++ b/modules/prelude-common-lisp.el @@ -1,6 +1,6 @@ ;;; prelude-common-lisp.el --- Emacs Prelude: lisp-mode and SLIME config. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-company.el b/modules/prelude-company.el index bab25c4fa9..d9de6b927a 100644 --- a/modules/prelude-company.el +++ b/modules/prelude-company.el @@ -1,6 +1,6 @@ ;;; prelude-company.el --- company-mode setup ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-css.el b/modules/prelude-css.el index 71ea75b23b..2d833d631e 100644 --- a/modules/prelude-css.el +++ b/modules/prelude-css.el @@ -1,6 +1,6 @@ ;;; prelude-css.el --- Emacs Prelude: css support ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-dart.el b/modules/prelude-dart.el index a06bdec045..3e4bb6872a 100644 --- a/modules/prelude-dart.el +++ b/modules/prelude-dart.el @@ -1,6 +1,6 @@ ;;; prelude-dart.el --- Emacs Prelude: Dart programming configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Rafael Medina ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-elixir.el b/modules/prelude-elixir.el index 8550c32267..a6094dfcef 100644 --- a/modules/prelude-elixir.el +++ b/modules/prelude-elixir.el @@ -1,6 +1,6 @@ ;;; prelude-elixir.el --- Emacs Prelude: Elixir programming support. ;; -;; Copyright © 2014-2022 Samuel Tonini +;; Copyright © 2014-2023 Samuel Tonini ;; ;; Author: Samuel Tonini diff --git a/modules/prelude-emacs-lisp.el b/modules/prelude-emacs-lisp.el index 6cb5592d58..c7fe80de92 100644 --- a/modules/prelude-emacs-lisp.el +++ b/modules/prelude-emacs-lisp.el @@ -1,6 +1,6 @@ ;;; prelude-emacs-lisp.el --- Emacs Prelude: Nice config for Elisp programming. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-erc.el b/modules/prelude-erc.el index 196ede6172..a4cd472eb7 100644 --- a/modules/prelude-erc.el +++ b/modules/prelude-erc.el @@ -1,6 +1,6 @@ ;;; prelude-erc.el --- Emacs Prelude: ERC mode configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-erlang.el b/modules/prelude-erlang.el index 2c4dc5476b..4278ab0aa2 100644 --- a/modules/prelude-erlang.el +++ b/modules/prelude-erlang.el @@ -1,6 +1,6 @@ ;;; prelude-erlang.el --- Emacs Prelude: Erlang programming support. ;; -;; Copyright © 2011-2022 Gleb Peregud +;; Copyright © 2011-2023 Gleb Peregud ;; ;; Author: Gleb Peregud diff --git a/modules/prelude-evil.el b/modules/prelude-evil.el index 9f46db5e63..eae90ae686 100644 --- a/modules/prelude-evil.el +++ b/modules/prelude-evil.el @@ -1,6 +1,6 @@ ;;; prelude-evil.el --- Emacs Prelude: evil-mode configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-haskell.el b/modules/prelude-haskell.el index 90edfe57c0..0c4a4deb2a 100644 --- a/modules/prelude-haskell.el +++ b/modules/prelude-haskell.el @@ -1,6 +1,6 @@ ;;; prelude-haskell.el --- Emacs Prelude: Nice config for Haskell programming. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-helm-everywhere.el b/modules/prelude-helm-everywhere.el index 0166bdd1a4..7132d6c081 100644 --- a/modules/prelude-helm-everywhere.el +++ b/modules/prelude-helm-everywhere.el @@ -1,6 +1,6 @@ ;;; prelude-helm-everywhere.el --- Enable Helm everywhere ;; -;; Copyright © 2014-2022 Tu, Do Hoang +;; Copyright © 2014-2023 Tu, Do Hoang ;; ;; Author: Tu, Do Hoang (tuhdo1710@gmail.com) ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-helm.el b/modules/prelude-helm.el index 75b0e5fa9b..439591ac44 100644 --- a/modules/prelude-helm.el +++ b/modules/prelude-helm.el @@ -1,6 +1,6 @@ ;;; prelude-helm.el --- Helm setup ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-ido.el b/modules/prelude-ido.el index 4f18da801a..0a6fcf570f 100644 --- a/modules/prelude-ido.el +++ b/modules/prelude-ido.el @@ -1,6 +1,6 @@ ;;; prelude-ido.el --- Ido setup ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-ivy.el b/modules/prelude-ivy.el index 642051a32f..e5b42c95e4 100644 --- a/modules/prelude-ivy.el +++ b/modules/prelude-ivy.el @@ -1,6 +1,6 @@ ;;; prelude-ivy.el --- Ivy setup ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-js.el b/modules/prelude-js.el index 645426c35d..91e16bf079 100644 --- a/modules/prelude-js.el +++ b/modules/prelude-js.el @@ -1,6 +1,6 @@ ;;; prelude-js.el --- Emacs Prelude: js-mode configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-key-chord.el b/modules/prelude-key-chord.el index eed249da87..1bda008e24 100644 --- a/modules/prelude-key-chord.el +++ b/modules/prelude-key-chord.el @@ -1,6 +1,6 @@ ;;; prelude-key-chord.el --- Key chord setup ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-latex.el b/modules/prelude-latex.el index c233adf700..60fe2f1c24 100644 --- a/modules/prelude-latex.el +++ b/modules/prelude-latex.el @@ -1,6 +1,6 @@ ;;; prelude-latex.el --- Emacs Prelude: Sane setup for LaTeX writers. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-lisp.el b/modules/prelude-lisp.el index 4279afe4d6..6129caf6ad 100644 --- a/modules/prelude-lisp.el +++ b/modules/prelude-lisp.el @@ -1,6 +1,6 @@ ;;; prelude-lisp.el --- Emacs Prelude: Configuration common to all lisp modes. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-lsp.el b/modules/prelude-lsp.el index 7b8655041c..a778d798eb 100644 --- a/modules/prelude-lsp.el +++ b/modules/prelude-lsp.el @@ -1,6 +1,6 @@ ;;; prelude-lsp.el --- lsp-mode setup ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov, Ben Alex ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-lua.el b/modules/prelude-lua.el index d9ad153ec3..f1fc63bee6 100644 --- a/modules/prelude-lua.el +++ b/modules/prelude-lua.el @@ -1,6 +1,6 @@ ;;; prelude-lua.el --- Emacs Prelude: Lua programming configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Xiongfei Shi ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-ocaml.el b/modules/prelude-ocaml.el index e59814cfe9..f1d05e42c1 100644 --- a/modules/prelude-ocaml.el +++ b/modules/prelude-ocaml.el @@ -1,6 +1,6 @@ ;;; prelude-ocaml.el --- Emacs Prelude: decent Perl coding settings. ;; -;; Copyright © 2014-2022 Geoff Shannon +;; Copyright © 2014-2023 Geoff Shannon ;; ;; Author: Geoff Shannon ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-org.el b/modules/prelude-org.el index 73f1706b59..f02733ec10 100644 --- a/modules/prelude-org.el +++ b/modules/prelude-org.el @@ -1,6 +1,6 @@ ;;; prelude-org.el --- Emacs Prelude: org-mode configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-perl.el b/modules/prelude-perl.el index c122f80396..74878cb9e8 100644 --- a/modules/prelude-perl.el +++ b/modules/prelude-perl.el @@ -1,6 +1,6 @@ ;;; prelude-perl.el --- Emacs Prelude: decent Perl coding settings. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-programming.el b/modules/prelude-programming.el index 5f9a5f03a4..b147b5ae4d 100644 --- a/modules/prelude-programming.el +++ b/modules/prelude-programming.el @@ -1,6 +1,6 @@ ;;; prelude-programming.el --- Emacs Prelude: prog-mode configuration ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-python.el b/modules/prelude-python.el index ccccb1f85c..dfaceb5de4 100644 --- a/modules/prelude-python.el +++ b/modules/prelude-python.el @@ -1,6 +1,6 @@ ;;; prelude-python.el --- Emacs Prelude: python.el configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-racket.el b/modules/prelude-racket.el index 5ac3ca4eac..60f6c3ada5 100644 --- a/modules/prelude-racket.el +++ b/modules/prelude-racket.el @@ -1,6 +1,6 @@ ;;; prelude-racket.el --- Emacs Prelude: Racket programming support. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Xiongfei Shi ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-ruby.el b/modules/prelude-ruby.el index 8a9f0924ff..e166244b7d 100644 --- a/modules/prelude-ruby.el +++ b/modules/prelude-ruby.el @@ -1,6 +1,6 @@ ;;; prelude-ruby.el --- Emacs Prelude: A nice setup for Ruby (and Rails) devs. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-scala.el b/modules/prelude-scala.el index c4969e36ef..ac59f7dee0 100644 --- a/modules/prelude-scala.el +++ b/modules/prelude-scala.el @@ -1,6 +1,6 @@ ;;; prelude-scala.el --- Emacs Prelude: scala-mode configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-scheme.el b/modules/prelude-scheme.el index fc6b42835e..3806be2902 100644 --- a/modules/prelude-scheme.el +++ b/modules/prelude-scheme.el @@ -1,6 +1,6 @@ ;;; prelude-scheme.el --- Emacs Prelude: Some defaults for Scheme. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-scss.el b/modules/prelude-scss.el index 6c93e71fa4..fb68ff2590 100644 --- a/modules/prelude-scss.el +++ b/modules/prelude-scss.el @@ -1,6 +1,6 @@ ;;; prelude-scss.el --- Emacs Prelude: scss support ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: http://www.batsov.com/emacs-prelude diff --git a/modules/prelude-selectrum.el b/modules/prelude-selectrum.el index b87934e87e..034a75d93e 100644 --- a/modules/prelude-selectrum.el +++ b/modules/prelude-selectrum.el @@ -1,6 +1,6 @@ ;;; prelude-selectrum.el --- Selectrum setup ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-shell.el b/modules/prelude-shell.el index 370d82579e..a8a2214263 100644 --- a/modules/prelude-shell.el +++ b/modules/prelude-shell.el @@ -1,6 +1,6 @@ ;;; prelude-shell.el --- Emacs Prelude: sh-mode configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-ts.el b/modules/prelude-ts.el index 27e4067421..435421c8e1 100644 --- a/modules/prelude-ts.el +++ b/modules/prelude-ts.el @@ -1,6 +1,6 @@ ;;; prelude-ts.el --- Emacs Prelude: Typescript programming support. ;; -;; Copyright © 2011-2022 LEE Dongjun +;; Copyright © 2011-2023 LEE Dongjun ;; ;; Author: LEE Dongjun diff --git a/modules/prelude-web.el b/modules/prelude-web.el index 6f490cf7d6..c6483fc567 100644 --- a/modules/prelude-web.el +++ b/modules/prelude-web.el @@ -1,6 +1,6 @@ ;;; prelude-web.el --- Emacs Prelude: web template support ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-xml.el b/modules/prelude-xml.el index 771a408d31..06a8a9029c 100644 --- a/modules/prelude-xml.el +++ b/modules/prelude-xml.el @@ -1,6 +1,6 @@ ;;; prelude-xml.el --- Emacs Prelude: XML editing configuration. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude diff --git a/modules/prelude-yaml.el b/modules/prelude-yaml.el index bb6d84f49a..ea53249921 100644 --- a/modules/prelude-yaml.el +++ b/modules/prelude-yaml.el @@ -1,6 +1,6 @@ ;;; prelude-yaml.el --- Emacs Prelude: YAML programming support. ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: ToBeReplaced ;; URL: https://github.com/bbatsov/prelude diff --git a/sample/prelude-modules.el b/sample/prelude-modules.el index 7fa964f45e..6f11b42d65 100644 --- a/sample/prelude-modules.el +++ b/sample/prelude-modules.el @@ -1,6 +1,6 @@ ;;; prelude-modules.el --- A listing of modules to load on startup ;; -;; Copyright © 2011-2022 Bozhidar Batsov +;; Copyright © 2011-2023 Bozhidar Batsov ;; ;; Author: Bozhidar Batsov ;; URL: https://github.com/bbatsov/prelude From e83f905cdbd006542d488cdd302957710da6cdd1 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:18:21 +0100 Subject: [PATCH 03/20] Auto-install use-package --- CHANGELOG.md | 1 + core/prelude-packages.el | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b74685a96..20b04a1add 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * Add a Lua module. * Auto-install `racket-mode` if needed. * Add a F# module. +* Auto-install `use-package`. ### Changes diff --git a/core/prelude-packages.el b/core/prelude-packages.el index 05f831ca86..ecf8b97f21 100644 --- a/core/prelude-packages.el +++ b/core/prelude-packages.el @@ -53,6 +53,13 @@ (setq package-user-dir (expand-file-name "elpa" prelude-dir)) (package-initialize) +;; install & enable use-package +(unless (package-installed-p 'use-package) + (package-install 'use-package)) + +(require 'use-package) +(setq use-package-verbose t) + (defvar prelude-packages '(ace-window ag From b70ecb4ba0d300807488ba4fc9813900eead9436 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:21:40 +0100 Subject: [PATCH 04/20] Add a vertico module --- CHANGELOG.md | 1 + docs/installation.md | 2 +- docs/modules/index.md | 1 + modules/prelude-vertico.el | 124 +++++++++++++++++++++++++++++++++++++ sample/prelude-modules.el | 2 +- 5 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 modules/prelude-vertico.el diff --git a/CHANGELOG.md b/CHANGELOG.md index 20b04a1add..f8f9c79794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ * Auto-install `racket-mode` if needed. * Add a F# module. * Auto-install `use-package`. +* Add `prelude-vertico` module. Vertico a simpler alternative to `ivy-mode` and supersedes Selectrum. ### Changes diff --git a/docs/installation.md b/docs/installation.md index f1b9abec29..e9dafa0724 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -117,7 +117,7 @@ modules visit the [docs](modules/index.md). ;; (require 'prelude-ido) ;; Supercharges Emacs completion for C-x C-f and more (require 'prelude-ivy) ;; A mighty modern alternative to ido -;; (require 'prelude-selectrum) ;; A powerful, yet simple, alternative to ivy +;; (require 'prelude-vertico) ;; A powerful, yet simple, alternative to ivy ;; (require 'prelude-helm) ;; Interface for narrowing and search ;; (require 'prelude-helm-everywhere) ;; Enable Helm everywhere (require 'prelude-company) diff --git a/docs/modules/index.md b/docs/modules/index.md index c1d3d2607e..f2fbed90d1 100644 --- a/docs/modules/index.md +++ b/docs/modules/index.md @@ -100,3 +100,4 @@ The following programming languages have enhanced support in Prelude: - key-chord - Org Mode - selectrum +- vertico diff --git a/modules/prelude-vertico.el b/modules/prelude-vertico.el new file mode 100644 index 0000000000..c2ca75af7f --- /dev/null +++ b/modules/prelude-vertico.el @@ -0,0 +1,124 @@ +;;; prelude-vertico.el --- Vertico setup +;; +;; Copyright © 2011-2023 Bozhidar Batsov +;; +;; Author: Bozhidar Batsov +;; URL: https://github.com/bbatsov/prelude + +;; This file is not part of GNU Emacs. + +;;; Commentary: + +;; Vertico-related config. Vertico is a smart framework for minibuffer +;; completion/filtering/selection (think of ivy/ido). + +;;; License: + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License +;; as published by the Free Software Foundation; either version 3 +;; of the License, or (at your option) any later version. +;; +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;; Enable vertico +(use-package vertico + :ensure t + :init + (vertico-mode) + + ;; Different scroll margin + ;; (setq vertico-scroll-margin 0) + + ;; Show more candidates + ;; (setq vertico-count 20) + + ;; Grow and shrink the Vertico minibuffer + ;; (setq vertico-resize t) + + ;; Optionally enable cycling for `vertico-next' and `vertico-previous'. + ;; (setq vertico-cycle t) + ) + +;; A few more useful configurations for Vertico +(use-package emacs + :init + ;; Add prompt indicator to `completing-read-multiple'. + ;; We display [CRM], e.g., [CRM,] if the separator is a comma. + (defun crm-indicator (args) + (cons (format "[CRM%s] %s" + (replace-regexp-in-string + "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" "" + crm-separator) + (car args)) + (cdr args))) + (advice-add #'completing-read-multiple :filter-args #'crm-indicator) + + ;; Do not allow the cursor in the minibuffer prompt + (setq minibuffer-prompt-properties + '(read-only t cursor-intangible t face minibuffer-prompt)) + (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode) + + ;; Emacs 28: Hide commands in M-x which do not work in the current mode. + ;; Vertico commands are hidden in normal buffers. + ;; (setq read-extended-command-predicate + ;; #'command-completion-default-include-p) + + ;; Enable recursive minibuffers + (setq enable-recursive-minibuffers t)) + +;; use the `orderless' completion style. +(use-package orderless + :ensure t + :init + ;; Configure a custom style dispatcher (see the Consult wiki) + ;; (setq orderless-style-dispatchers '(+orderless-dispatch) + ;; orderless-component-separator #'orderless-escapable-split-on-space) + (setq completion-styles '(orderless basic) + completion-category-defaults nil + completion-category-overrides '((file (styles partial-completion))))) + +(use-package consult + :ensure t + :bind ( + ;; C-x bindings (ctl-x-map) + ("C-x M-:" . consult-complex-command) ;; orig. repeat-complex-command + ("C-x b" . consult-buffer) ;; orig. switch-to-buffer + ("C-x 4 b" . consult-buffer-other-window) ;; orig. switch-to-buffer-other-window + ("C-x 5 b" . consult-buffer-other-frame) ;; orig. switch-to-buffer-other-frame + ;; Custom M-# bindings for fast register access + ("M-#" . consult-register-load) + ("M-'" . consult-register-store) ;; orig. abbrev-prefix-mark (unrelated) + ("C-M-#" . consult-register) + ;; Other custom bindings + ("M-y" . consult-yank-pop) ;; orig. yank-pop + (" a" . consult-apropos) ;; orig. apropos-command + ;; M-g bindings (goto-map) + ("M-g e" . consult-compile-error) + ("M-g f" . consult-flycheck) + ("M-g g" . consult-goto-line) ;; orig. goto-line + ("M-g M-g" . consult-goto-line) ;; orig. goto-line + ("M-g o" . consult-outline) ;; Alternative: consult-org-heading + ("M-g m" . consult-mark) + ("M-g k" . consult-global-mark) + ("M-g i" . consult-imenu) + ("M-g I" . consult-imenu-multi) + ;; M-s bindings (search-map) + ("M-s f" . consult-find) + ("M-s F" . consult-locate) + ("M-s g" . consult-grep) + ("M-s G" . consult-git-grep) + ("M-s r" . consult-ripgrep) + ("M-s l" . consult-line) + ("M-s L" . consult-line-multi) + ("M-s m" . consult-multi-occur) + ("M-s k" . consult-keep-lines) + ("M-s u" . consult-focus-lines))) diff --git a/sample/prelude-modules.el b/sample/prelude-modules.el index 6f11b42d65..eaee42575c 100644 --- a/sample/prelude-modules.el +++ b/sample/prelude-modules.el @@ -43,7 +43,7 @@ ;; (require 'prelude-ido) ;; Supercharges Emacs completion for C-x C-f and more (require 'prelude-ivy) ;; A mighty modern alternative to ido -;; (require 'prelude-selectrum) ;; A powerful, yet simple, alternative to ivy +;; (require 'prelude-vertico) ;; A powerful, yet simple, alternative to ivy ;; (require 'prelude-helm) ;; Interface for narrowing and search ;; (require 'prelude-helm-everywhere) ;; Enable Helm everywhere (require 'prelude-company) From 48be92af9f970fe9fe3817d64315812640149e02 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:22:49 +0100 Subject: [PATCH 05/20] Prefer vertico over ivy --- docs/installation.md | 4 ++-- sample/prelude-modules.el | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index e9dafa0724..86f0b2192a 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -116,8 +116,8 @@ modules visit the [docs](modules/index.md). ;;; General productivity tools ;; (require 'prelude-ido) ;; Supercharges Emacs completion for C-x C-f and more -(require 'prelude-ivy) ;; A mighty modern alternative to ido -;; (require 'prelude-vertico) ;; A powerful, yet simple, alternative to ivy +;; (require 'prelude-ivy) ;; A mighty modern alternative to ido +(require 'prelude-vertico) ;; A powerful, yet simple, alternative to ivy ;; (require 'prelude-helm) ;; Interface for narrowing and search ;; (require 'prelude-helm-everywhere) ;; Enable Helm everywhere (require 'prelude-company) diff --git a/sample/prelude-modules.el b/sample/prelude-modules.el index eaee42575c..bdf8c80448 100644 --- a/sample/prelude-modules.el +++ b/sample/prelude-modules.el @@ -42,8 +42,8 @@ ;;; General productivity tools ;; (require 'prelude-ido) ;; Supercharges Emacs completion for C-x C-f and more -(require 'prelude-ivy) ;; A mighty modern alternative to ido -;; (require 'prelude-vertico) ;; A powerful, yet simple, alternative to ivy +;; (require 'prelude-ivy) ;; A mighty modern alternative to ido +(require 'prelude-vertico) ;; A powerful, yet simple, alternative to ivy ;; (require 'prelude-helm) ;; Interface for narrowing and search ;; (require 'prelude-helm-everywhere) ;; Enable Helm everywhere (require 'prelude-company) From 8c6b043139c93d45460ba8efba3e379b24059149 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:28:57 +0100 Subject: [PATCH 06/20] Tweak some changelog entries --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8f9c79794..4e286708f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,10 @@ ### New features -* Enable org-habits -* Neatly track TODO state changes in a drawer (LOGBOOK) thereby +* Enable `org-habits`. +* Neatly track `TODO` state changes in a drawer (LOGBOOK) thereby. improving readability -* Add a module to enable Literate Programming +* Add a module to enable Literate Programming (`prelude-literal-programming.el`). * Add a Racket module. * Add a Lua module. * Auto-install `racket-mode` if needed. @@ -21,8 +21,8 @@ * Remove `company-lsp`. * Replace `yank-pop` key-binding to `counse-yank-pop` for `ivy-mode`. * The keybinding for `proced` is now enabled unconditionally. -* Replace prelude-go backend with `lsp` instead of unmaintained tools -* Use `rust-analyzer` as language server for prelude-rust and provide nicer syntax highlighting with `tree-sitter` +* Replace prelude-go backend with `lsp` instead of unmaintained tools. +* Use `rust-analyzer` as language server for prelude-rust and provide nicer syntax highlighting with `tree-sitter`. ### Bugs fixed @@ -32,7 +32,7 @@ * Fix **Edit on GitHub** link in ReadTheDocs site. * 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` +* Require `typescript-mode` using `prelude-require-packages` to avoid error upon inclusion in `personal/prelude-modules.el`. ## 1.1.0 (2021-02-14) From 635e9948735fc943a1fce25926d012ac2bfface8 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:33:55 +0100 Subject: [PATCH 07/20] [Docs] Update the FAQ for use-package --- docs/faq.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/faq.md b/docs/faq.md index 0cdb33bef0..2639e78feb 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -19,6 +19,8 @@ Given how modular the structure of Prelude is, there's relatively little to be g I have a stripped-down version of Prelude for personal use, based on `use-package` [here](https://github.com/bbatsov/emacs.d). I guess it might be of interest to some of you. +**Update (2023): ** There are now plans to include `use-package` in Emacs 29, which will likely increase its prominence. Prelude 1.2 auto-installs `use-package` and newer Prelude modules might make use of `use-package`. `prelude-vertico` is one such example. + ## Why does Prelude use MELPA instead of MELPA Stable by default? Mostly because many package authors/maintainers don't have the habit to cut From f5a7ce061f96420eee7a1d3d2475d1bea53f6ac5 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:38:16 +0100 Subject: [PATCH 08/20] Add a missing require --- modules/prelude-vertico.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/prelude-vertico.el b/modules/prelude-vertico.el index c2ca75af7f..7335730d25 100644 --- a/modules/prelude-vertico.el +++ b/modules/prelude-vertico.el @@ -29,6 +29,8 @@ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. +(require 'use-package) + ;; Enable vertico (use-package vertico :ensure t From 7bec9bf97072d113dac8d3a2799771f68eba50ef Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:39:08 +0100 Subject: [PATCH 09/20] Tweak the name of a helper function --- modules/prelude-vertico.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/prelude-vertico.el b/modules/prelude-vertico.el index 7335730d25..c31624d141 100644 --- a/modules/prelude-vertico.el +++ b/modules/prelude-vertico.el @@ -55,14 +55,14 @@ :init ;; Add prompt indicator to `completing-read-multiple'. ;; We display [CRM], e.g., [CRM,] if the separator is a comma. - (defun crm-indicator (args) + (defun prelude-crm-indicator (args) (cons (format "[CRM%s] %s" (replace-regexp-in-string "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" "" crm-separator) (car args)) (cdr args))) - (advice-add #'completing-read-multiple :filter-args #'crm-indicator) + (advice-add #'completing-read-multiple :filter-args #'prelude-crm-indicator) ;; Do not allow the cursor in the minibuffer prompt (setq minibuffer-prompt-properties From a64772100983d9e73514c9c584c0408403d378fb Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:40:35 +0100 Subject: [PATCH 10/20] Add a missing provide --- modules/prelude-vertico.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/prelude-vertico.el b/modules/prelude-vertico.el index c31624d141..8be1e99d46 100644 --- a/modules/prelude-vertico.el +++ b/modules/prelude-vertico.el @@ -124,3 +124,6 @@ ("M-s m" . consult-multi-occur) ("M-s k" . consult-keep-lines) ("M-s u" . consult-focus-lines))) + +(provide 'prelude-vertico) +;;; prelude-vertico.el ends here From 6e9adfc36bfc0925c5f6bcda0ec629b703c3f1bb Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:41:23 +0100 Subject: [PATCH 11/20] Add a missing section heading --- modules/prelude-vertico.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/prelude-vertico.el b/modules/prelude-vertico.el index 8be1e99d46..8772d55234 100644 --- a/modules/prelude-vertico.el +++ b/modules/prelude-vertico.el @@ -29,6 +29,7 @@ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. +;;; Code: (require 'use-package) ;; Enable vertico From 8602e6a3e7987b9aefe8f4f125b3e34e59561d72 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:52:31 +0100 Subject: [PATCH 12/20] Add a CI badge to the README --- .github/workflows/{github-actions.yml => ci.yml} | 2 +- README.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename .github/workflows/{github-actions.yml => ci.yml} (95%) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/ci.yml similarity index 95% rename from .github/workflows/github-actions.yml rename to .github/workflows/ci.yml index 0a3e8149b2..f8f33adf4d 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Prelude CI +name: CI on: push jobs: build: diff --git a/README.md b/README.md index 2f0565e891..238f362bb3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![License GPL 3][badge-license]](http://www.gnu.org/licenses/gpl-3.0.txt) +[![CI](https://github.com/bbatsov/prelude/workflows/CI/badge.svg)](https://github.com/bbatsov/prelude/actions/workflows/ci.yml) [![Patreon](https://img.shields.io/badge/patreon-donate-orange.svg)](https://www.patreon.com/bbatsov) Emacs Prelude From fcb629acb645cdff7fdd5f7332bb669c75527fdb Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 24 Feb 2023 08:55:01 +0100 Subject: [PATCH 13/20] Add a Discord badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 238f362bb3..0b0b05f6e9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![License GPL 3][badge-license]](http://www.gnu.org/licenses/gpl-3.0.txt) [![CI](https://github.com/bbatsov/prelude/workflows/CI/badge.svg)](https://github.com/bbatsov/prelude/actions/workflows/ci.yml) [![Patreon](https://img.shields.io/badge/patreon-donate-orange.svg)](https://www.patreon.com/bbatsov) +[![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg?sanitize=true)](https://discord.gg/3Cf2Qpyry5) Emacs Prelude ============= From ce8628612711467e3055e0db0391368e96717a83 Mon Sep 17 00:00:00 2001 From: Byron Clark Date: Sat, 18 Mar 2023 15:57:14 -0600 Subject: [PATCH 14/20] Remove consult-apropos consult.el [Version 0.32](https://github.com/minad/consult/blob/main/CHANGELOG.org#version-032-2023-02-06) removed the `consult-apropos` function. Remove the keybinding from prelude configuration so that a working apropos is available. --- modules/prelude-vertico.el | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/prelude-vertico.el b/modules/prelude-vertico.el index 8772d55234..e49e900254 100644 --- a/modules/prelude-vertico.el +++ b/modules/prelude-vertico.el @@ -103,7 +103,6 @@ ("C-M-#" . consult-register) ;; Other custom bindings ("M-y" . consult-yank-pop) ;; orig. yank-pop - (" a" . consult-apropos) ;; orig. apropos-command ;; M-g bindings (goto-map) ("M-g e" . consult-compile-error) ("M-g f" . consult-flycheck) From b57ff48e0985a6ef0f1ed9b279ec487c55982334 Mon Sep 17 00:00:00 2001 From: Byron Clark Date: Fri, 14 Apr 2023 13:06:17 -0600 Subject: [PATCH 15/20] Use js2-mode for additional Node.js extensions. Node.js can file extensions to force ECMAScript (.mjs) versus CommonJS (.cjs) module systems. They're both JavaScript files so use js2-mode when editing them. --- CHANGELOG.md | 1 + modules/prelude-js.el | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e286708f8..6fd33339b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ * The keybinding for `proced` is now enabled unconditionally. * Replace prelude-go backend with `lsp` instead of unmaintained tools. * Use `rust-analyzer` as language server for prelude-rust and provide nicer syntax highlighting with `tree-sitter`. +* Use `js2-mode` for Node.js specific `.cjs` and `.mjs` extensions. ### Bugs fixed diff --git a/modules/prelude-js.el b/modules/prelude-js.el index 91e16bf079..6bfe04e090 100644 --- a/modules/prelude-js.el +++ b/modules/prelude-js.el @@ -35,9 +35,10 @@ (require 'js2-mode) -(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) -(add-to-list 'auto-mode-alist '("\\.pac\\'" . js2-mode)) -(add-to-list 'interpreter-mode-alist '("node" . js2-mode)) +(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) +(add-to-list 'auto-mode-alist '("\\.[cm]js\\'" . js2-mode)) +(add-to-list 'auto-mode-alist '("\\.pac\\'" . js2-mode)) +(add-to-list 'interpreter-mode-alist '("node" . js2-mode)) (with-eval-after-load 'js2-mode (defun prelude-js-mode-defaults () From ac5fd5c9e3b33c744c447471a119b3ea63c5e8e6 Mon Sep 17 00:00:00 2001 From: Yves Martin Date: Sun, 10 Sep 2023 18:41:29 +0200 Subject: [PATCH 16/20] Add details about Windows HOME --- docs/installation.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/installation.md b/docs/installation.md index 86f0b2192a..ab991e4b53 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -72,6 +72,8 @@ $ cd ~/.emacs.d If you are using Windows, you should check what Emacs thinks the `~` directory is by running Emacs and typing `C-x d ~/`, and then adjust the command appropriately. + It is recommended to explicitly set HOME environment variable. + For details, please refer to [Emacs manual Windows-HOME section](https://www.gnu.org/software/emacs/manual/html_node/emacs/Windows-HOME.html) ### System-wide (site-wide) From ed0996ddad6ac0e95d1fee7f3087c2cc13d13015 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Thu, 15 Feb 2024 15:46:10 +0200 Subject: [PATCH 17/20] Update the copyright years --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 30fad1eab5..a3917894ea 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -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 From 7aa4ae9fc170f80f77c69b2aa01b4c985e7575a9 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Thu, 15 Feb 2024 15:46:23 +0200 Subject: [PATCH 18/20] Add the required readthedocs.yml --- readthedocs.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 readthedocs.yml diff --git a/readthedocs.yml b/readthedocs.yml new file mode 100644 index 0000000000..376dcc3a90 --- /dev/null +++ b/readthedocs.yml @@ -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 From 1e9336dc031f21499d0bbe93d2dff5b8fce540a6 Mon Sep 17 00:00:00 2001 From: Jennifer Page Date: Sat, 16 Dec 2023 15:18:05 -0500 Subject: [PATCH 19/20] Turn off super-save in rust-mode Related to #1372, it appears that `super-save` doesn't play nicely with LSP features in `rust-mode`. --- CHANGELOG.md | 1 + modules/prelude-rust.el | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fd33339b7..eff677604a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ * 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. ## 1.1.0 (2021-02-14) diff --git a/modules/prelude-rust.el b/modules/prelude-rust.el index 339d745349..69463ec598 100644 --- a/modules/prelude-rust.el +++ b/modules/prelude-rust.el @@ -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) From 9106aea3413c92bc8c4e9c3421efc980e1dcb6e3 Mon Sep 17 00:00:00 2001 From: Youngwook Kim Date: Fri, 30 Aug 2024 20:44:55 +0900 Subject: [PATCH 20/20] Update dap-dart-setup to lsp-dart-dap-setup in prelude-dart.el (#1420) This commit updates the deprecated function in prelude-dart.el to the latest one. --- CHANGELOG.md | 1 + modules/prelude-dart.el | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eff677604a..66464a3ce3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ * 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) diff --git a/modules/prelude-dart.el b/modules/prelude-dart.el index 3e4bb6872a..583d41d70b 100644 --- a/modules/prelude-dart.el +++ b/modules/prelude-dart.el @@ -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)