Merge remote-tracking branch 'upstream/master'

.github/workflows/github-actions.yml → .github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Prelude CI
+name: CI
 on: push
 jobs:
   build:

CHANGELOG.md

@@ -4,23 +4,26 @@
 
 ### 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.
 * Add a F# module.
+* Auto-install `use-package`.
+* Add `prelude-vertico` module. Vertico a simpler alternative to `ivy-mode` and supersedes Selectrum.
 
 ### Changes
 
 * Bind all essential `avy` commands to their recommended keybindings.
 * 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`.
+* Use `js2-mode` for Node.js specific `.cjs` and `.mjs` extensions.
 
 ### Bugs fixed
 
@@ -29,6 +32,8 @@
   for `which-key` bug causing display issues in clients to `emacs --daemon`.
 * 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)
 

README.md

@@ -1,5 +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
 =============
@@ -143,7 +145,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

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -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

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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
 

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
 

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

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 ~/<RET>`, 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)
 
@@ -116,8 +118,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-selectrum) ;; 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)

docs/modules/index.md

@@ -100,3 +100,4 @@ The following programming languages have enhanced support in Prelude:
 - key-chord
 - Org Mode
 - selectrum
+- vertico

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 ([email protected])
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -33,7 +33,6 @@
 
 (prelude-require-packages '(helm helm-projectile))
 
-(require 'helm-config)
 (require 'helm-projectile)
 
 (when (executable-find "curl")

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -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 ()

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

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 <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude