Merge remote-tracking branch 'upstream/master'

.github/workflows/github-actions.yml

@@ -0,0 +1,14 @@
+name: Prelude CI
+on: push
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v1
+      - name: install emacs
+        run: sudo apt-get update && sudo apt-get install -y emacs
+      - name: put prelude in the right place
+        run: ln -s $(pwd) $HOME/.emacs.d
+      - name: load prelude
+        run: emacs --batch --load init.el

.gitignore

@@ -30,3 +30,5 @@ transient/
 var/
 .cache/
 .lsp-session*
+gotools/
+eln-cache/

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ### New features
 
+* Enable org-habits
+* Neatly track TODO state changes in a drawer (LOGBOOK) thereby
+  improving readability
+* Add a module to enable Literate Programming
 * Add a Racket module.
 * Add a Lua module.
 * Auto-install `racket-mode` if needed.
@@ -14,10 +18,17 @@
 * 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`
 
 ### Bugs fixed
 
 * Fix `company` still being visible in the mode line.
+* [#1335](https://github.com/bbatsov/prelude/issues/1335): Workaround
+  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.
 
 ## 1.1.0 (2021-02-14)
 

README.md

@@ -143,7 +143,7 @@ welcome. GitHub pull requests are even better! :-)
 
 ## License
 
-Copyright © 2011-2021 Bozhidar Batsov and
+Copyright © 2011-2022 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-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 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-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 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-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -166,6 +166,7 @@
 ;; note - this should be after volatile-highlights is required
 ;; add the ability to cut the current line, without marking it
 (require 'rect)
+(require 'crux)
 (crux-with-region-or-line kill-region)
 
 ;; tramp, for sudo access

core/prelude-global-keybindings.el

@@ -1,6 +1,6 @@
 ;;; prelude-global-keybindings.el --- Emacs Prelude: some useful keybindings.
 ;;
-;; Copyright © 2011-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -46,8 +46,7 @@
 (global-set-key (kbd "C-^") 'crux-top-join-line)
 
 ;; Start proced in a similar manner to dired
-(unless (eq system-type 'darwin)
-  (global-set-key (kbd "C-x p") 'proced))
+(global-set-key (kbd "C-x p") 'proced)
 
 ;; Start eshell or switch to it if it's active.
 (global-set-key (kbd "C-x m") 'eshell)

core/prelude-linux.el

@@ -1,6 +1,6 @@
 ;;; prelude-linux.el --- Emacs Prelude: linux specific settings.
 ;;
-;; Copyright © 2011-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 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-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 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-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 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-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -70,8 +70,7 @@
     flycheck
     gist
     git-timemachine
-    gitconfig-mode
-    gitignore-mode
+    git-modes
     guru-mode
     hl-todo
     imenu-anywhere

core/prelude-ui.el

@@ -1,6 +1,6 @@
 ;;; prelude-ui.el --- Emacs Prelude: UI optimizations and tweaks.
 ;;
-;; Copyright © 2011-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -83,8 +83,12 @@
   (load-theme prelude-theme t))
 
 ;; show available keybindings after you start typing
-(require 'which-key)
-(which-key-mode +1)
+;; add to hook when running as a daemon as a workaround for a
+;; which-key bug
+;; https://github.com/justbur/emacs-which-key/issues/306
+(if (daemonp)
+    (add-hook 'server-after-make-frame-hook 'which-key-mode)
+  (which-key-mode +1))
 
 (provide 'prelude-ui)
 ;;; prelude-ui.el ends here

core/prelude-windows.el

@@ -1,6 +1,6 @@
 ;;; prelude-windows.el --- Emacs Prelude: Windows-specific setup.
 ;;
-;; Copyright © 2011-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 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-2021 Bozhidar Batsov
+;; Copyright © 2011-2022 Bozhidar Batsov
 ;;
 ;; URL: https://github.com/bbatsov/prelude
 

doc/contributing.md → docs/contributing.md

@@ -2,41 +2,43 @@
 
 ## Issues
 
-Report issues and suggest features and improvements on the
-[GitHub issue tracker](https://github.com/bbatsov/prelude/issues). Don't ask
-questions on the issue tracker - use the [support channels](support.md) instead.
+Report issues and suggest features and improvements on the [GitHub
+issue tracker](https://github.com/bbatsov/prelude/issues). Don't ask
+questions on the issue tracker - use the [support
+channels](support.md) instead.
 
-If you want to file a bug, please provide all the necessary info listed in
-our issue reporting template (it's loaded automatically when you create a
-new GitHub issue).
+If you want to file a bug, please provide all the necessary info
+listed in our issue reporting template (it's loaded automatically when
+you create a new GitHub issue).
 
 ## Patches
 
-Patches in any form are always welcome! GitHub pull requests are even better! :-)
+Patches in any form are always welcome! GitHub pull requests are even
+better! :-)
 
 Before submitting a patch or a pull request make sure that your patch
 is in line with the [contribution
 guidelines](https://github.com/bbatsov/prelude/blob/master/CONTRIBUTING.md).
 
 ## Documentation
 
-Good documentation is just as important as good code.
-Please, consider improving and extending this manual.
+Good documentation is just as important as good code.  Please,
+consider improving and extending this manual.
 
 ### Working on the Manual
 
 The manual is generated from the markdown files in the
-[doc](https://github.com/bbatsov/prelude/tree/master/doc) folder of Prelude's
-GitHub repo and is published to [Read the Docs](readthedocs.org). The
-[MkDocs](http://www.mkdocs.org/) tool is used to convert the markdown sources to
-HTML.
+[docs](https://github.com/bbatsov/prelude/tree/master/docs) folder of
+Prelude's GitHub repo and is published to [Read the
+Docs](https://readthedocs.org). The [MkDocs](http://www.mkdocs.org/)
+tool is used to convert the markdown sources to HTML.
 
-To make changes to the manual you simply have to change the files under
-`doc`. The manual will be regenerated automatically when changes to those files
-are merged in `master` (or the latest stable branch).
+To make changes to the manual you simply have to change the files
+under `docs`. The manual will be regenerated automatically when changes
+to those files are merged in `master` (or the latest stable branch).
 
-You can install `MkDocs` locally and use the command `mkdocs serve` to see the
-result of changes you make to the manual locally:
+You can install `MkDocs` locally and use the command `mkdocs serve` to
+see the result of changes you make to the manual locally:
 
 ```sh
 $ cd path/to/prelude/repo