From bb677cf7a5857e45519b7f2d5a67e43639ad19d2 Mon Sep 17 00:00:00 2001 From: Samuel Jackson Date: Sun, 4 Jul 2021 14:59:29 -0700 Subject: [PATCH 01/14] Prevent extra variable from being passed in macro. In the PDF module, there is a macro that is used to prevent the file-too-big prompt for PDFs since they're always too big. However, this macro has an extra variable listed that then gets passed on to the wrapped function and causes an error if the function doesn't support the extra variable. This fix simply checks if the extra value is present or not and only calls the wrapped function with it if is actually present. After all, the variable will still be nil even if nil isn't passed. --- modules/tools/pdf/config.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/tools/pdf/config.el b/modules/tools/pdf/config.el index 002aa7256..b61dd7dcf 100644 --- a/modules/tools/pdf/config.el +++ b/modules/tools/pdf/config.el @@ -126,7 +126,9 @@ (defadvice! +pdf-suppress-large-file-prompts-a (orig-fn size op-type filename &optional offer-raw) :around #'abort-if-file-too-large (unless (string-match-p "\\.pdf\\'" filename) - (funcall orig-fn size op-type filename offer-raw)))) + (if offer-raw + (funcall orig-fn size op-type filename offer-raw) + (funcall orig-fn size op-type filename))))) (use-package! saveplace-pdf-view From ff2d56794e6c0c3228c7c9ab6c71b6abcd33cfa2 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 5 Jul 2021 13:03:03 -0400 Subject: [PATCH 02/14] Don't activate sly-mode in lisp-mode derived modes Fixes some issues (like indentation or unrelated sly-mode warnings) in lisp-like major modes (like fennel-mode). --- modules/lang/common-lisp/config.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/lang/common-lisp/config.el b/modules/lang/common-lisp/config.el index 86f9ef1be..3601644a6 100644 --- a/modules/lang/common-lisp/config.el +++ b/modules/lang/common-lisp/config.el @@ -16,6 +16,13 @@ (use-package! sly :hook (lisp-mode-local-vars . sly-editing-mode) :init + ;; I moved this hook to `lisp-mode-local-vars', so it only affects + ;; `lisp-mode', and not every other derived lisp mode (like `fennel-mode'). + ;; We run it twice because the hook is both autoloaded and evaluated at + ;; load-time, so it must be removed twice. + (after! (:or emacs sly) + (remove-hook 'lisp-mode-hook #'sly-editing-mode)) + (after! lisp-mode (set-repl-handler! 'lisp-mode #'sly-mrepl) (set-eval-handler! 'lisp-mode #'sly-eval-region) From 044a1a5f2b30476357548d025f7d13b42876467e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Jul 2021 01:54:32 -0400 Subject: [PATCH 03/14] Drop Emacs 26.x support Emacs 27.x has been the stable version of Emacs for nearly a year, and introduces a litany of bugfixes, performance, and quality-of-life improvements that significantly reduce Doom's maintenance burden (like XDG support, early-init.el, image manipulation without imagemagick, a native JSON library, harfbuzz support, pdumper, and others). With so many big changes on Doom's horizon, I like having one less (big) thing to worry about. Also reverts bb677cf7a (#5232) as it is no longer needed. --- README.md | 4 +- bin/doom | 6 +- core/autoload/themes.el | 4 +- core/cli/doctor.el | 8 +-- core/core-lib.el | 67 +--------------------- core/core-ui.el | 31 +++------- core/core.el | 1 - core/packages.el | 2 - docs/getting_started.org | 36 ++++++------ docs/modules.org | 1 - init.example.el | 1 - modules/lang/org/config.el | 11 +--- modules/os/tty/README.org | 56 ++---------------- modules/tools/direnv/config.el | 33 +++++------ modules/tools/lsp/+lsp.el | 6 +- modules/tools/pdf/config.el | 4 +- modules/ui/fill-column/README.org | 92 ------------------------------ modules/ui/fill-column/autoload.el | 15 ----- modules/ui/fill-column/packages.el | 6 -- 19 files changed, 58 insertions(+), 326 deletions(-) delete mode 100644 modules/ui/fill-column/README.org delete mode 100644 modules/ui/fill-column/autoload.el delete mode 100644 modules/ui/fill-column/packages.el diff --git a/README.md b/README.md index 910c23e0b..e397e670a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [Install](#install) • [Documentation] • [FAQ] • [Screenshots] • [Contribute](#contribute) ![Made with Doom Emacs](https://img.shields.io/github/tag/hlissner/doom-emacs.svg?style=flat-square&label=release&color=58839b) -![Minimum Emacs version supported: 26.3](https://img.shields.io/badge/Emacs-26.3+-blueviolet.svg?style=flat-square&logo=GNU%20Emacs&logoColor=white) +![Minimum Emacs version supported: 27.1](https://img.shields.io/badge/Emacs-27.1+-blueviolet.svg?style=flat-square&logo=GNU%20Emacs&logoColor=white) ![Latest commit](https://img.shields.io/github/last-commit/hlissner/doom-emacs/develop?style=flat-square) ![Build status: develop](https://img.shields.io/github/workflow/status/hlissner/doom-emacs/CI/develop?style=flat-square) [![Discord Server](https://img.shields.io/discord/406534637242810369?color=738adb&label=Discord&logo=discord&logoColor=white&style=flat-square)][Discord] @@ -99,7 +99,7 @@ Check out [the FAQ][FAQ] for answers to common questions about the project. # Prerequisites + Git 2.23+ -+ Emacs 26.3+ (*27.2 is recommended*, or [native-comp](https://www.emacswiki.org/emacs/GccEmacs)). ++ Emacs 27.1+ (*27.2 is recommended*, or [native-comp](https://www.emacswiki.org/emacs/GccEmacs)). + [ripgrep] 11.0+ + GNU `find` + *OPTIONAL:* [fd] 7.3.0+ (improves file indexing performance for some commands) diff --git a/bin/doom b/bin/doom index f3db7ff5d..00f6e8904 100755 --- a/bin/doom +++ b/bin/doom @@ -27,11 +27,11 @@ ;; ;;; Sanity checks -(when (version< emacs-version "26.3") +(when (version< emacs-version "27.1") (error (concat "Detected Emacs " emacs-version " (at " (car command-line-args) ").\n\n" - "Doom only supports Emacs 26.3 and newer. 27.1 is highly recommended. A guide\n" - "to install a newer version of Emacs can be found at:\n\n " + "Doom only supports Emacs 27.1 and newer. A guide to install a newer version\n" + "of Emacs can be found at:\n\n " (format "https://doomemacs.org/docs/getting_started.org#%s" (cond ((eq system-type 'darwin) "on-macos") ((memq system-type '(cygwin windows-nt ms-dos)) "on-windows") diff --git a/core/autoload/themes.el b/core/autoload/themes.el index 2f890b364..dd5abac85 100644 --- a/core/autoload/themes.el +++ b/core/autoload/themes.el @@ -40,9 +40,7 @@ all themes. It will apply to all themes once they are loaded." (when (or (get 'doom-theme 'previous-themes) (null doom-theme)) (funcall #',fn)) - ;; TODO Append to `doom-load-theme-hook' with DEPTH instead when Emacs - ;; 26.x support is dropped. - (add-hook 'doom-customize-theme-hook #',fn 'append)))) + (add-hook 'doom-customize-theme-hook #',fn 100)))) ;;;###autoload (defmacro custom-set-faces! (&rest specs) diff --git a/core/cli/doctor.el b/core/cli/doctor.el index 7cb3085a4..90740ec15 100644 --- a/core/cli/doctor.el +++ b/core/cli/doctor.el @@ -54,11 +54,9 @@ in." (warn! "Emacs %s detected" emacs-version) (explain! "Doom supports this version, but you are living on the edge! " "Be prepared for breakages in future versions of Emacs.")) - ((= emacs-major-version 26) - (warn! "Emacs %s detected" emacs-version) - (explain! "Doom is dropping Emacs 26.x support in June 2021. Consider " - "upgrading to Emacs 27.1 (or better: 27.2) soon!" - emacs-version)))) + ((< emacs-major-version 27) + (error! "Emacs %s detected, Doom only supports 27.1 and newer" + emacs-version)))) (print! (start "Checking for Doom's prerequisites...")) (print-group! diff --git a/core/core-lib.el b/core/core-lib.el index 823836bbe..c1309672d 100644 --- a/core/core-lib.el +++ b/core/core-lib.el @@ -625,72 +625,7 @@ testing advice (when combined with `rotate-text'). ;; ;;; Backports -(eval-when! (version< emacs-version "27.0.90") - ;; DEPRECATED Backported from Emacs 27 - (defmacro setq-local (&rest pairs) - "Make variables in PAIRS buffer-local and assign them the corresponding values. - -PAIRS is a list of variable/value pairs. For each variable, make -it buffer-local and assign it the corresponding value. The -variables are literal symbols and should not be quoted. - -The second VALUE is not computed until after the first VARIABLE -is set, and so on; each VALUE can use the new value of variables -set earlier in the ‘setq-local’. The return value of the -‘setq-local’ form is the value of the last VALUE. - -\(fn [VARIABLE VALUE]...)" - (declare (debug setq)) - (unless (zerop (mod (length pairs) 2)) - (error "PAIRS must have an even number of variable/value members")) - (let ((expr nil)) - (while pairs - (unless (symbolp (car pairs)) - (error "Attempting to set a non-symbol: %s" (car pairs))) - ;; Can't use backquote here, it's too early in the bootstrap. - (setq expr - (cons - (list 'set - (list 'make-local-variable (list 'quote (car pairs))) - (car (cdr pairs))) - expr)) - (setq pairs (cdr (cdr pairs)))) - (macroexp-progn (nreverse expr))))) - -(eval-when! (version< emacs-version "27.1") - ;; DEPRECATED Backported from Emacs 27. Remove when 26.x support is dropped. - (defun executable-find (command &optional remote) - "Search for COMMAND in `exec-path' and return the absolute file name. -Return nil if COMMAND is not found anywhere in `exec-path'. If -REMOTE is non-nil, search on the remote host indicated by -`default-directory' instead." - (if (and remote (file-remote-p default-directory)) - (let ((res (locate-file - command - (mapcar - (lambda (x) (concat (file-remote-p default-directory) x)) - (exec-path)) - exec-suffixes 'file-executable-p))) - (when (stringp res) (file-local-name res))) - ;; Use 1 rather than file-executable-p to better match the - ;; behavior of call-process. - (let ((default-directory - (let (file-name-handler-alist) - (file-name-quote default-directory)))) - (locate-file command exec-path exec-suffixes 1))))) - -(eval-when! (not (fboundp 'exec-path)) - ;; DEPRECATED Backported from Emacs 27.1. Remove when 26.x support is dropped. - (defun exec-path () - "Return list of directories to search programs to run in remote subprocesses. -The remote host is identified by `default-directory'. For remote -hosts that do not support subprocesses, this returns `nil'. -If `default-directory' is a local directory, this function returns -the value of the variable `exec-path'." - (let ((handler (find-file-name-handler default-directory 'exec-path))) - (if handler - (funcall handler 'exec-path) - exec-path)))) +;; None at the moment! (provide 'core-lib) ;;; core-lib.el ends here diff --git a/core/core-ui.el b/core/core-ui.el index 5fda13a4d..3aa3a13d3 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -667,16 +667,17 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original (dolist (fn '(switch-to-buffer display-buffer)) (advice-add fn :around #'doom-run-switch-buffer-hooks-a))) +;; Apply `doom-font' et co +(add-hook 'doom-after-init-modules-hook #'doom-init-fonts-h -100) + ;; Apply `doom-theme' (add-hook (if (daemonp) 'after-make-frame-functions 'doom-after-init-modules-hook) - #'doom-init-theme-h) + #'doom-init-theme-h + -90) -;; Apply `doom-font' et co -(add-hook 'doom-after-init-modules-hook #'doom-init-fonts-h) - -(add-hook 'window-setup-hook #'doom-init-ui-h 'append) +(add-hook 'window-setup-hook #'doom-init-ui-h 100) ;; @@ -702,25 +703,11 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original (fset 'define-fringe-bitmap #'ignore)) (after! whitespace - (defun doom-disable-whitespace-mode-in-childframes-a (orig-fn) + (defun doom-is-childframes-p () "`whitespace-mode' inundates child frames with whitespace markers, so disable it to fix all that visual noise." - (unless (frame-parameter nil 'parent-frame) - (funcall orig-fn))) - (add-function :around whitespace-enable-predicate #'doom-disable-whitespace-mode-in-childframes-a)) - -;; Don't display messages in the minibuffer when using the minibuffer -;; DEPRECATED Remove when Emacs 26.x support is dropped. -(eval-when! (not EMACS27+) - (defmacro doom-silence-motion-key (command key) - (let ((key-command (intern (format "doom/silent-%s" command)))) - `(progn - (defun ,key-command () - (interactive) - (ignore-errors (call-interactively ',command))) - (define-key minibuffer-local-map (kbd ,key) #',key-command)))) - (doom-silence-motion-key backward-delete-char "") - (doom-silence-motion-key delete-char "")) + (frame-parameter nil 'parent-frame)) + (add-function :before-while whitespace-enable-predicate #'doom-is-childframes-p)) (provide 'core-ui) ;;; core-ui.el ends here diff --git a/core/core.el b/core/core.el index 466095cf6..3432b33a8 100644 --- a/core/core.el +++ b/core/core.el @@ -355,7 +355,6 @@ config.el instead." (when (boundp 'libgnutls-version) (concat "SECURE128:+SECURE192:-VERS-ALL" (if (and (not IS-WINDOWS) - (not (version< emacs-version "26.3")) (>= libgnutls-version 30605)) ":+VERS-TLS1.3") ":+VERS-TLS1.2")) diff --git a/core/packages.el b/core/packages.el index 39995500a..82a529d18 100644 --- a/core/packages.el +++ b/core/packages.el @@ -37,8 +37,6 @@ (package! helpful :pin "7e4b1f0d5572a4e2b8ee7a9b084ef863d0315a73") (package! pcre2el :pin "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d") (package! smartparens :pin "911cc896a0f2eb8b5fbdd6fc8331523ad9889a3a") -;; DEPRECATED Built into Emacs 27+; remove when we drop 26 support -(package! so-long :built-in 'prefer :pin "1da43ed63b5f9a8188eb8107bbad842d10831537") (package! ws-butler ;; Use my fork of ws-butler, which has a few choice improvements and ;; optimizations (the original has been abandoned). diff --git a/docs/getting_started.org b/docs/getting_started.org index 1d476212a..84dcef48a 100644 --- a/docs/getting_started.org +++ b/docs/getting_started.org @@ -97,7 +97,7 @@ us know! This is what you'll have installed by the end of this section: - Git 2.23+ -- Emacs 26.3+ *(27.2 is recommended, or [[https://www.emacswiki.org/emacs/GccEmacs][native-comp]])* +- Emacs 27.1+ *(27.2 is recommended, or [[https://www.emacswiki.org/emacs/GccEmacs][native-comp]])* - [[https://github.com/BurntSushi/ripgrep][ripgrep]] 11.0+ - GNU Find - (Optional) [[https://github.com/sharkdp/fd][fd]] 7.3.0+ (known as ~fd-find~ on Debian, Ubuntu & derivatives) -- @@ -107,20 +107,15 @@ These packages ought to be available through the package managers of your operating system; i.e. homebrew & macports on macOS, scoop/chocolatey on Windows, or pacman/aptitude/etc on the various Linux distributions. -#+begin_quote -While Doom does claim to support 26.x, 27.x is recommended because it is faster, -especially for LSP users. The installation guides below will touch on installing -27 if there is a simple way to do so on that particular operating system. -#+end_quote - ** Emacs & dependencies *** On Linux -In the unusual case that Emacs 26.x is unavailable through your package manager, -you'll have to [[https://www.gnu.org/software/emacs/manual/html_node/efaq/Installing-Emacs.html][build it from source]], but here are installation instructions for many popular Linux distributions: +Installation instructions for Emacs 27.1+ are listed below for many popular +Linux distributions. In the unusual case that 27.1 or newer is unavailable on +your system, you'll have to [[https://www.gnu.org/software/emacs/manual/html_node/efaq/Installing-Emacs.html][build it from source]] instead. **** Ubuntu -Emacs 27.x is not available through Ubuntu's package manager out-of-the-box. To -get around this you'll need to install Emacs through a PPA: +Emacs 27.x is not available through Ubuntu's package manager out-of-the-box, but +is available through a PPA: #+BEGIN_SRC bash add-apt-repository ppa:kelleyk/emacs @@ -164,8 +159,9 @@ pacman -S fd The above installs Emacs 27 (at the time of writing). **** NixOS -On NixOS Emacs 26.3 can be installed via ~nix-env -Ai nixos.emacs~, or +On NixOS Emacs 27.2 can be installed via ~nix-env -Ai nixos.emacs~, or permanently with the following added to ~etc/nixos/configuration.nix~: + #+BEGIN_SRC nix environment.systemPackages = with pkgs; [ # required dependencies @@ -191,7 +187,7 @@ environment.systemPackages = [ #+END_SRC **** openSUSE -***** Emacs 26.3 +***** Emacs 27.1 Emacs can be installed from the [[https://software.opensuse.org/download.html?project=editors&package=emacs][package list]], or manually via zypper. For example, to install on openSUSE Leap 15.1 (requires root): @@ -202,7 +198,7 @@ zypper install emacs #+END_SRC If you already have an older version of Emacs installed, you will be prompted to -install the update candidate (Emacs 26.3). +install the update candidate (Emacs 27.1). ***** ripgrep Download ripgrep 11.0.2 from [[https://software.opensuse.org/download/package?package=ripgrep&project=openSUSE%3AFactory][the package list]] or installed manually (requires @@ -305,16 +301,16 @@ Or by replacing ~/usr/local/bin/emacs~ with a shim script containing: There are some suggestions on how to speed it up later in this section. #+end_quote -There are three methods for installing Emacs 26.x on Windows, each with their +There are three methods for installing Emacs 27.x on Windows, each with their pros and cons: + With chocolatey/scoop + With a precompiled binary + Git Bash -+ With WSL + Ubuntu ++ With WSL2 + Ubuntu -If you don't know which to choose, I recommend WSL; it produces the fastest and -most stable environment of the three, but has the most complex installation -process. +If you don't know which to choose, I highly recommend WSL; it produces the +fastest and most stable environment of the three, but has the most complex +installation process. Before moving on to installing Emacs et co, a few steps to prepare Windows for Emacs are necessary: @@ -405,7 +401,7 @@ bin/doom command. #+BEGIN_SRC sh sudo add-apt-repository ppa:kelleyk/emacs sudo apt update - sudo apt install emacs26 + sudo apt install emacs27 #+END_SRC 7. Then Doom's dependencies: #+BEGIN_SRC sh diff --git a/docs/modules.org b/docs/modules.org index aa01b5a3d..fb3b50274 100644 --- a/docs/modules.org +++ b/docs/modules.org @@ -203,7 +203,6 @@ Aesthetic modules that affect the Emacs interface or user experience. + [[file:../modules/ui/doom-dashboard/README.org][doom-dashboard]] - TODO + [[file:../modules/ui/doom-quit/README.org][doom-quit]] - TODO + [[file:../modules/ui/emoji/README.org][emoji]] =+ascii +github +unicode= - Adds emoji support to Emacs -+ [[file:../modules/ui/fill-column/README.org][fill-column]] - TODO + [[file:../modules/ui/hl-todo/README.org][hl-todo]] - TODO + [[file:../modules/ui/hydra/README.org][hydra]] - TODO + indent-guides - TODO diff --git a/init.example.el b/init.example.el index db540a956..3a0fae37e 100644 --- a/init.example.el +++ b/init.example.el @@ -31,7 +31,6 @@ doom-dashboard ; a nifty splash screen for Emacs doom-quit ; DOOM quit-message prompts when you quit Emacs ;;(emoji +unicode) ; 🙂 - ;;fill-column ; a `fill-column' indicator hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW ;;hydra ;;indent-guides ; highlighted indent columns diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index d1be26089..8c43f2d62 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -274,16 +274,7 @@ Also adds support for a `:sync' parameter to override `:async'." ;; TODO Should be fixed upstream (let ((default-directory (org-find-library-dir "org-contribdir"))) (setq org-ditaa-jar-path (expand-file-name "scripts/ditaa.jar") - org-ditaa-eps-jar-path (expand-file-name "scripts/DitaaEps.jar")))) - - ;; NOTE Backported from Emacs 27.1 - ;; DEPRECATED Remove when 26.x support is dropped - (unless EMACS27+ - (defadvice! +org--dont-suppress-window-changes-a (orig-fn &rest args) - :around #'org-babel-execute:emacs-lisp - (letf! ((#'current-window-configuration #'ignore) - (#'set-window-configuration #'ignore)) - (apply orig-fn args))))) + org-ditaa-eps-jar-path (expand-file-name "scripts/DitaaEps.jar"))))) (defun +org-init-babel-lazy-loader-h () diff --git a/modules/os/tty/README.org b/modules/os/tty/README.org index 11d8cce00..b18ce9434 100644 --- a/modules/os/tty/README.org +++ b/modules/os/tty/README.org @@ -56,59 +56,11 @@ need: * Configuration ** True-color and italic support -#+begin_quote -This advice only applies to Emacs 26.x. True color support is [[https://github.com/emacs-mirror/emacs/commit/7f6153d9563cfe7753083996f59eacc9f4c694df][built into 27.1+ -and newer]]. -#+end_quote +Emacs 26.3 users should consult [[https://github.com/syl20bnr/spacemacs/wiki/Terminal][the spacemacs wiki]] for details on achieving true +color support in terminal Emacs. -(credit goes to [[https://github.com/syl20bnr/spacemacs/wiki/Terminal][the spacemacs wiki]] for this information) - -Create a =xterm-24bit.terminfo= file with the following contents: - -#+BEGIN_SRC text -xterm-24bit|xterm with 24-bit direct color mode, - use=xterm-256color, - sitm=\E[3m, - ritm=\E[23m, - setb24=\E[48;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%dm, - setf24=\E[38;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%dm, -#+END_SRC - -#+begin_quote -WARNING: Make sure you have a newline at end of file otherwise you will get -errors! -#+end_quote - -Execute the following command on the command line: -#+BEGIN_SRC sh -tic -x -o ~/.terminfo xterm-24bit.terminfo -#+END_SRC - -Now set your ~$TERM~ variable to ~xterm-24bit~: -#+BEGIN_SRC sh -export TERM=xterm-24bit -#+END_SRC - -SSH might break if your remote machine does not have the same setup, you can -work around this with the following alias. -#+BEGIN_SRC sh -alias ssh="TERM=xterm-256color ssh" -#+END_SRC - -If you use tmux, you need to make sure you installed a version with truecolor -support, then add the following lines to your `.tmux.conf`: -#+BEGIN_SRC conf -set -g default-terminal "xterm-24bit" -set -g terminal-overrides ',xterm-24bit:Tc' -#+END_SRC - -Also, make sure you have utf8 language variables if you want all characters to -display correctly. For example: -#+BEGIN_SRC bash -export LC_ALL=en_US.UTF-8 -export LANG=en_US.UTF-8 -export LANGUAGE=en_US.UTF-8 -#+END_SRC +Emacs 27.x users don't need todo anything, as true color support is [[https://github.com/emacs-mirror/emacs/commit/7f6153d9563cfe7753083996f59eacc9f4c694df][built into +27.1+ and newer]]. * Troubleshooting # Common issues and their solution, or places to look for help. diff --git a/modules/tools/direnv/config.el b/modules/tools/direnv/config.el index e3e4a0753..0579dd606 100644 --- a/modules/tools/direnv/config.el +++ b/modules/tools/direnv/config.el @@ -8,25 +8,20 @@ (set-popup-rule! "^\\*envrc\\*" :quit t :ttl 0) - ;; I'm avoiding `global-envrc-mode' intentionally, because it has the - ;; potential to run too late in the mode startup process (and after, say, - ;; server hooks that may rely on that local direnv environment). - (add-hook! 'change-major-mode-after-body-hook - (defun +direnv-init-h () - (unless (or envrc-mode - (minibufferp) - (file-remote-p default-directory)) - (condition-case _ - (envrc-mode 1) - (quit))))) - - ;; Ensure these local variables survive major mode changes, so envrc-mode is - ;; only "activated" once per buffer. - (put 'envrc-mode 'permanent-local t) - (put 'envrc--status 'permanent-local t) - (put 'process-environment 'permanent-local t) - (put 'exec-path 'permanent-local t) - (put 'eshell-path-env 'permanent-local t) + ;; A globalized minor mode triggers on `after-change-major-mode-hook' + ;; normally, which runs after a major mode's body and hooks. If those hooks do + ;; any initialization work that's sensitive to environmental state set up by + ;; direnv, then you're gonna have a bad time, so I move the trigger to + ;; `change-major-mode-after-body-hook' instead. This runs before said hooks + ;; (but not the body; fingers crossed that no major mode does important env + ;; initialization there). + (add-hook! 'envrc-global-mode-hook + (defun +direnv-init-global-mode-earlier-h () + (let ((fn #'envrc-global-mode-enable-in-buffers)) + (if (not envrc-global-mode) + (remove-hook 'change-major-mode-after-body-hook fn) + (remove-hook 'after-change-major-mode-hook fn) + (add-hook 'change-major-mode-after-body-hook fn 100))))) (defadvice! +direnv--fail-gracefully-a (&rest _) "Don't try to use direnv if the executable isn't present." diff --git a/modules/tools/lsp/+lsp.el b/modules/tools/lsp/+lsp.el index c16b89645..afbb56143 100644 --- a/modules/tools/lsp/+lsp.el +++ b/modules/tools/lsp/+lsp.el @@ -183,9 +183,9 @@ instead is more sensible." ;; and there is a bug preventing Flycheck errors from being shown (the ;; errors flash briefly and then disappear). lsp-ui-sideline-show-hover nil - ;; Some icons don't scale correctly on Emacs 26, so disable them there. - lsp-ui-sideline-actions-icon ; DEPRECATED Remove later - (if EMACS27+ lsp-ui-sideline-actions-icon-default) + ;; Re-enable icon scaling (it's disabled by default upstream for Emacs + ;; 26.x compatibility; see emacs-lsp/lsp-ui#573) + lsp-ui-sideline-actions-icon t ;; REVIEW Temporarily disabled, due to immense slowness on every ;; keypress. See emacs-lsp/lsp-ui#613 lsp-ui-doc-enable nil) diff --git a/modules/tools/pdf/config.el b/modules/tools/pdf/config.el index b61dd7dcf..002aa7256 100644 --- a/modules/tools/pdf/config.el +++ b/modules/tools/pdf/config.el @@ -126,9 +126,7 @@ (defadvice! +pdf-suppress-large-file-prompts-a (orig-fn size op-type filename &optional offer-raw) :around #'abort-if-file-too-large (unless (string-match-p "\\.pdf\\'" filename) - (if offer-raw - (funcall orig-fn size op-type filename offer-raw) - (funcall orig-fn size op-type filename))))) + (funcall orig-fn size op-type filename offer-raw)))) (use-package! saveplace-pdf-view diff --git a/modules/ui/fill-column/README.org b/modules/ui/fill-column/README.org deleted file mode 100644 index f58c8abcc..000000000 --- a/modules/ui/fill-column/README.org +++ /dev/null @@ -1,92 +0,0 @@ -#+TITLE: ui/fill-column -#+DATE: August 23, 2020 -#+SINCE: 2.0.9 -#+STARTUP: inlineimages nofold - -* Table of Contents :TOC_3:noexport: -- [[#description][Description]] - - [[#maintainers][Maintainers]] - - [[#module-flags][Module Flags]] - - [[#plugins][Plugins]] -- [[#prerequisites][Prerequisites]] -- [[#features][Features]] -- [[#configuration][Configuration]] - - [[#setting-fill-column-globally][Setting fill-column globally]] - - [[#setting-fill-column-for-the-current-buffer-or-mode][Setting fill-column for the current buffer or mode]] - - [[#hl-fill-column-only-configuring-the-look-of-the-indicator][(hl-fill-column only) Configuring the look of the indicator]] -- [[#troubleshooting][Troubleshooting]] - -* Description -This module provides a fill column indicator to make it obvious when a line -reaches or surpasses the 80th column. This serves as a reminder to keep lines -short for accessibility and/or convenience. [[https://www.emacswiki.org/emacs/EightyColumnRule][Read more about this on the Emacs -Wiki page]]. - -#+begin_quote -This module is deprecated and will be removed once Doom drops Emacs 26.x -support. This is because the built-in ~display-fill-column-indicator-mode~ (in -27 and newer) replaces it, and enabling it is a trivial one-liner, which doesn't -warrant a module: ~(global-display-fill-column-indicator-mode +1)~ -#+end_quote - -** Maintainers -This module has no dedicated maintainers. - -** Module Flags -This module provides no flags. - -** Plugins -+ [[https://github.com/laishulu/hl-fill-column][hl-fill-column]]* (unless Emacs >=27) - -* Prerequisites -This module has no prerequisites. - -* Features -The behavior of this module varies slightly depending on your version of Emacs: - -+ In Emacs 26.x, text beyond ~fill-column~ will be highlighted. -+ In Emacs 27 and newer, a line is drawn down the right side at column 80. - -* Configuration -** Setting fill-column globally -This column limit is controlled by the ~fill-column~ variable (default: ~80~). - -This variable is buffer-local, therefore, to change this globally, you must use -~setq-default~: - -#+BEGIN_SRC emacs-lisp -(setq-default fill-column 100) -#+END_SRC - -~hl-fill-column-mode~ (or ~display-fill-column-indicator-mode~ on Emacs 27+) -must be restarted to see the change. - -** Setting fill-column for the current buffer or mode -The ~setq-hook!~ convenience macro makes settings ~fill-column~ for a particular -mode (or modes) easy: - -#+BEGIN_SRC emacs-lisp -(setq-hook! 'org-mode-hook fill-column 100) -(setq-hook! 'python-mode-hook fill-column 72) -(setq-hook! js2-mode fill-column 72) -(setq-hook! '(ruby-mode rustic-mode python-mode-hook) fill-column 80) -#+END_SRC - -Any open buffers in these modes must be restarted to see the change. - -** (hl-fill-column only) Configuring the look of the indicator -To change the appears of hl-fill-column's highlight, change the -~hl-fill-column-face~ face. Doom provides the ~custom-set-faces!~ macro to help -you do this: - -#+BEGIN_SRC emacs-lisp -(custom-set-faces! - '(hl-fill-column-face :background "red" - :foreground "blue" - :inverse-video t)) -#+END_SRC - -See =M-x helpful-function RET custom-set-faces\!= for demos and documentation -for this macro. - -* TODO Troubleshooting diff --git a/modules/ui/fill-column/autoload.el b/modules/ui/fill-column/autoload.el deleted file mode 100644 index a5cc28861..000000000 --- a/modules/ui/fill-column/autoload.el +++ /dev/null @@ -1,15 +0,0 @@ -;;; ui/fill-column/autoload.el -*- lexical-binding: t; -*- - -;;;###autoload -(defalias '+fill-column/toggle - (if (fboundp 'display-fill-column-indicator-mode) - #'display-fill-column-indicator-mode ; Emacs 27 only - (autoload 'hl-fill-column-mode "hl-fill-column" nil t) - #'hl-fill-column-mode)) - -;;;###autoload -(defalias '+fill-column-enable-h #'+fill-column/toggle) - -;;;###autoload -(add-hook! '(text-mode-hook prog-mode-hook conf-mode-hook) - #'+fill-column-enable-h) diff --git a/modules/ui/fill-column/packages.el b/modules/ui/fill-column/packages.el deleted file mode 100644 index 12420f96a..000000000 --- a/modules/ui/fill-column/packages.el +++ /dev/null @@ -1,6 +0,0 @@ -;; -*- no-byte-compile: t; -*- -;;; ui/fill-column/packages.el - -;; `hl-fill-column' is only used on Emacs versions before 27 -(unless (fboundp 'display-fill-column-indicator-mode) - (package! hl-fill-column :pin "5782a91ba0182c4e562fa0db6379ff9dd472856b")) From 38bc1ab81af6cdc4c4fb9aa163bb44711969af36 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Jul 2021 02:05:36 -0400 Subject: [PATCH 04/14] Bump :tools pdf vedang/pdf-tools@d262cf9 -> vedang/pdf-tools@5f77dae Fixes #4989: remove local hacks for retina support in favor of upstream fixes. --- modules/tools/pdf/config.el | 50 ----------------------------------- modules/tools/pdf/packages.el | 6 +---- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/modules/tools/pdf/config.el b/modules/tools/pdf/config.el index 002aa7256..429ee818e 100644 --- a/modules/tools/pdf/config.el +++ b/modules/tools/pdf/config.el @@ -72,56 +72,6 @@ (add-hook 'doom-switch-buffer-hook #'+pdf-reload-midnight-minor-mode-h nil 'local)))))) - ;; Add retina support for MacOS users - (eval-when! IS-MAC - (defun +pdf-view-create-page-a (page &optional window) - "Create an image of PAGE for display on WINDOW." - :override #'pdf-view-create-page - (let* ((size (pdf-view-desired-image-size page window)) - (width (if (not (pdf-view-use-scaling-p)) - (car size) - (* 2 (car size)))) - (data (pdf-cache-renderpage - page width width)) - (hotspots (pdf-view-apply-hotspot-functions - window page size))) - (pdf-view-create-image data - :width width - :scale (if (pdf-view-use-scaling-p) 0.5 1) - :map hotspots - :pointer 'arrow))) - - (defvar +pdf--scaled-p nil) - (defadvice! +pdf--scale-up-on-retina-display-a (orig-fn &rest args) - "Scale up the PDF on retina displays." - :around #'pdf-util-frame-scale-factor - (cond ((not pdf-view-use-scaling) 1) - ((and (memq (pdf-view-image-type) '(imagemagick image-io)) - (fboundp 'frame-monitor-attributes)) - (funcall orig-fn)) - ;; Add special support for retina displays on MacOS - ((and (eq (framep-on-display) 'ns) - (not +pdf--scaled-p) - EMACS27+) - (setq-local +pdf--scaled-p t) - 2) - (1))) - - (defadvice! +pdf--use-scaling-on-ns-a () - :before-until #'pdf-view-use-scaling-p - (and (eq (framep-on-display) 'ns) - EMACS27+)) - - (defadvice! +pdf--supply-width-to-create-image-calls-a (orig-fn &rest args) - :around '(pdf-annot-show-annotation - pdf-isearch-hl-matches - pdf-view-display-region) - (letf! (defun create-image (file-or-data &optional type data-p &rest props) - (apply create-image file-or-data type data-p - :width (car (pdf-view-image-size)) - props)) - (apply orig-fn args)))) - ;; Silence "File *.pdf is large (X MiB), really open?" prompts for pdfs (defadvice! +pdf-suppress-large-file-prompts-a (orig-fn size op-type filename &optional offer-raw) :around #'abort-if-file-too-large diff --git a/modules/tools/pdf/packages.el b/modules/tools/pdf/packages.el index f35026492..832e66af9 100644 --- a/modules/tools/pdf/packages.el +++ b/modules/tools/pdf/packages.el @@ -1,9 +1,5 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/pdf/packages.el -(package! pdf-tools - :recipe (:host github - :repo "vedang/pdf-tools") - :pin "d262cf9e19d57c6567e06e51d109150c20753839") - +(package! pdf-tools :pin "5f77dae43eb8f71e52e10ba8cf994883f74c3fb7") (package! saveplace-pdf-view :pin "54ed966b842501c3c092dbf57b372e37b033c578") From 9198b03807b53ee255d52a3a2328f40f84d6cb5a Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Jul 2021 02:13:01 -0400 Subject: [PATCH 05/14] Bump :core bbatsov/projectile@5e6fdab -> bbatsov/projectile@da08a91 domtronn/all-the-icons.el@facbde4 -> domtronn/all-the-icons.el@9d97c07 justbur/emacs-which-key@fc29864 -> justbur/emacs-which-key@27d9fec raxod502/straight.el@915707f -> raxod502/straight.el@b45dd00 --- core/packages.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/packages.el b/core/packages.el index 82a529d18..a3900c0ea 100644 --- a/core/packages.el +++ b/core/packages.el @@ -17,7 +17,7 @@ :branch ,straight-repository-branch :local-repo "straight.el" :files ("straight*.el")) - :pin "915707ff5139cbfaf5f1aecd881ce0abaaddcecc") + :pin "b45dd00408ff8e922f2d7f75441fd5603e5222fa") ;; core-modules.el (package! use-package @@ -25,7 +25,7 @@ :pin "a7422fb8ab1baee19adb2717b5b47b9c3812a84c") ;; core-ui.el -(package! all-the-icons :pin "facbde4a7be292bf9490932cbe403b443273f45d") +(package! all-the-icons :pin "9d97c074b08000eacefc03ebc5dadbdc33888cc2") (package! hide-mode-line :pin "88888825b5b27b300683e662fa3be88d954b1cea") (package! highlight-numbers :pin "8b4744c7f46c72b1d3d599d4fb75ef8183dee307") (package! rainbow-delimiters :pin "d576e6694ad3a3e88b2bb1363305b38fa364c149") @@ -44,9 +44,9 @@ :pin "2bb49d3ee7d2cba133bc7e9cdac416cd1c5e4fe0") ;; core-projects.el -(package! projectile :pin "5e6fdabd59ec5507c1d54f3b11ee16ddc05821d3") +(package! projectile :pin "da08a9103b5ba3b38ef031a9627a19436eb318b5") (package! project :pin "4072f35d85bf0a1c669329d66633e4819f497c1c") ;; core-keybinds.el (package! general :pin "a0b17d207badf462311b2eef7c065b884462cb7c") -(package! which-key :pin "fc29864395fdaf688e2ef5111831663bad89a020") +(package! which-key :pin "27d9fec33abb989b030f7677ccf5f799287d6472") From 19edcb931458e27255301f97279686fecab54abe Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Jul 2021 02:15:19 -0400 Subject: [PATCH 06/14] Change doom-version to 3.0.0-alpha The future is now. --- core/core.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.el b/core/core.el index 3432b33a8..d2f4b7ac0 100644 --- a/core/core.el +++ b/core/core.el @@ -3,7 +3,7 @@ ;; ;;; Initialize internal state -(defconst doom-version "2.0.9" +(defconst doom-version "3.0.0-alpha" "Current version of Doom Emacs.") (defvar doom-init-p nil From 3ccc12c16b9aba4d662ec8234a364571847b26dc Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Jul 2021 02:16:25 -0400 Subject: [PATCH 07/14] Add init.example.el one-liner for :tools lsp --- init.example.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.example.el b/init.example.el index 3a0fae37e..21381a1cd 100644 --- a/init.example.el +++ b/init.example.el @@ -92,7 +92,7 @@ (eval +overlay) ; run code, run (also, repls) ;;gist ; interacting with github gists lookup ; navigate your code and its documentation - ;;lsp + ;;lsp ; M-x vscode magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds From 6a23c6142bc8a3d73d1dd173a303ebd19b34f093 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Jul 2021 02:19:05 -0400 Subject: [PATCH 08/14] tools/direnv: refactor Our advice is no longer needed, now that envrc provides envrc-propagate-environment. We also cache the executable path (benefits TRAMP users, in particular). --- modules/tools/direnv/config.el | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/modules/tools/direnv/config.el b/modules/tools/direnv/config.el index 0579dd606..f434f1b37 100644 --- a/modules/tools/direnv/config.el +++ b/modules/tools/direnv/config.el @@ -2,7 +2,7 @@ (use-package! envrc :when (executable-find "direnv") - :after-call doom-first-file-hook + :hook (doom-first-file . envrc-global-mode) :config (add-to-list 'doom-debug-variables 'envrc-debug) @@ -26,27 +26,12 @@ (defadvice! +direnv--fail-gracefully-a (&rest _) "Don't try to use direnv if the executable isn't present." :before-while #'envrc-mode - (or (executable-find "direnv") + (or (get 'envrc-mode 'direnv-executable) + (put 'envrc-mode 'direnv-executable (executable-find "direnv" t)) (ignore (doom-log "Couldn't find direnv executable")))) - ;; HACK envrc-mode only affects the current buffer's environment, which is - ;; generally what we want, except when we're running babel blocks in - ;; org-mode, because there may be state or envvars those blocks need to - ;; read. In order to perpetuate the org buffer's environment into the - ;; execution of the babel block we need to temporarily change the global - ;; environment. Let's hope it runs quickly enough that its effects aren't - ;; felt in other buffers in the meantime! - (defvar +direnv--old-environment nil) - (defadvice! +direnv-persist-environment-a (orig-fn &rest args) - :around #'org-babel-execute-src-block - (if +direnv--old-environment - (apply orig-fn args) - (setq-default +direnv--old-environment - (cons (default-value 'process-environment) - (default-value 'exec-path)) - exec-path exec-path - process-environment process-environment) - (unwind-protect (apply orig-fn args) - (setq-default process-environment (car +direnv--old-environment) - exec-path (cdr +direnv--old-environment) - +direnv--old-environment nil))))) + ;; Ensure babel's execution environment matches the host buffer's. + (advice-add #'org-babel-execute-src-block :around #'envrc-propagate-environment) + + ;; Make sure any envrc changes are propagated after a `doom/reload' + (add-hook 'doom-after-reload-hook #'envrc-reload-all)) From 2d2246d7ca5ec084f4bee9a5de14256eb6828837 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Jul 2021 02:30:06 -0400 Subject: [PATCH 09/14] term/eshell: alias ff = find-file-other-window The old alias was redundant with "f" --- modules/term/eshell/config.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el index 2748f61c7..c47dea24b 100644 --- a/modules/term/eshell/config.el +++ b/modules/term/eshell/config.el @@ -26,7 +26,7 @@ buffer.") (defvar +eshell-aliases '(("q" "exit") ; built-in ("f" "find-file $1") - ("ff" "find-file $1") + ("ff" "find-file-other-window $1") ("d" "dired $1") ("bd" "eshell-up $1") ("rg" "rg --color=always $*") From 7925759b8ebff43714322017f2595ed538e7eb64 Mon Sep 17 00:00:00 2001 From: Cora Sutton Date: Tue, 6 Jul 2021 13:46:53 -0500 Subject: [PATCH 10/14] Set the lsp-ui-sideline-actions-icon to the default When Emacs 26.x support was in place this was originally: ```elisp lsp-ui-sideline-actions-icon (if EMACS27+ lsp-ui-sideline-actions-icon-default) ``` But when it was removed it became: ```elisp lsp-ui-sideline-actions-icon t ``` The docs for lsp-ui-sideline-actions-icon say: ``` Image file for actions. It must be a png file. ``` Setting this to `t` results in a whole lot of these messages: ``` [lsp-ui-sideline]: Error with actions icon: (error Invalid image specification) ``` So the solution seems to me to be to set it to: ```elisp lsp-ui-sideline-actions-icon lsp-ui-sideline-actions-icon-default ``` I've set it in my emacs and it seems to work. --- modules/tools/lsp/+lsp.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tools/lsp/+lsp.el b/modules/tools/lsp/+lsp.el index afbb56143..40e8f4c55 100644 --- a/modules/tools/lsp/+lsp.el +++ b/modules/tools/lsp/+lsp.el @@ -185,7 +185,7 @@ instead is more sensible." lsp-ui-sideline-show-hover nil ;; Re-enable icon scaling (it's disabled by default upstream for Emacs ;; 26.x compatibility; see emacs-lsp/lsp-ui#573) - lsp-ui-sideline-actions-icon t + lsp-ui-sideline-actions-icon lsp-ui-sideline-actions-icon-default ;; REVIEW Temporarily disabled, due to immense slowness on every ;; keypress. See emacs-lsp/lsp-ui#613 lsp-ui-doc-enable nil) From 74fc7ae6640845d27caaf1ff0251a618d56d2923 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Wed, 7 Jul 2021 03:13:57 +0530 Subject: [PATCH 11/14] Fix command to show git log of current buffer file Currently SPC g L runs `magit-log` which opens a context window for git log with an option selected that limits the log to the file open in buffer. The user then has to press l to actually see the log. The same result can be achieved by calling `magit-log-buffer-file` instead --- modules/config/default/+emacs-bindings.el | 2 +- modules/config/default/+evil-bindings.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index cb9f5ac15..7820f54bf 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -325,7 +325,7 @@ :desc "Magit blame" "B" #'magit-blame-addition :desc "Magit clone" "C" #'magit-clone :desc "Magit fetch" "F" #'magit-fetch - :desc "Magit buffer log" "L" #'magit-log + :desc "Magit buffer log" "L" #'magit-log-buffer-file :desc "Git stage file" "S" #'magit-stage-file :desc "Git unstage file" "U" #'magit-unstage-file (:prefix ("f" . "find") diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 3d1368bd5..ff8728650 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -445,7 +445,7 @@ :desc "Magit blame" "B" #'magit-blame-addition :desc "Magit clone" "C" #'magit-clone :desc "Magit fetch" "F" #'magit-fetch - :desc "Magit buffer log" "L" #'magit-log + :desc "Magit buffer log" "L" #'magit-log-buffer-file :desc "Git stage file" "S" #'magit-stage-file :desc "Git unstage file" "U" #'magit-unstage-file (:prefix ("f" . "find") From 43ddb109703c25a105c4d2e156f6055ffc58181b Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 7 Jul 2021 11:43:50 -0400 Subject: [PATCH 12/14] docs/faq: fix evil-snipe instructions Fixes #5242 --- docs/faq.org | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/faq.org b/docs/faq.org index c38d74ba0..c5abbd996 100644 --- a/docs/faq.org +++ b/docs/faq.org @@ -1174,8 +1174,7 @@ If you still want to restore the old behavior, simply disable evil-snipe-mode: #+BEGIN_SRC emacs-lisp ;; in ~/.doom.d/config.el -(after! evil-snipe - (evil-snipe-mode -1)) +(remove-hook 'doom-first-input-hook #'evil-snipe-mode) #+END_SRC ** Changes to my config aren't taking effect From 400fa0836d830ac409a67a4c4af3012b5e07dc60 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 7 Jul 2021 12:05:15 -0400 Subject: [PATCH 13/14] editor/evil: update disable instructions in readme Fixes #5242 --- modules/editor/evil/README.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/editor/evil/README.org b/modules/editor/evil/README.org index c1417337d..42470287d 100644 --- a/modules/editor/evil/README.org +++ b/modules/editor/evil/README.org @@ -172,8 +172,8 @@ vim-seek/vim-sneak for 2-character versions of f/F/t/T). To disable evil-snipe on s/S, you can either: -1. Disable ~evil-snipe-mode~ by adding ~(after! evil-snipe (evil-snipe-mode - -1))~ to =$DOOMDIR/config.el=, +1. Disable ~evil-snipe-mode~ by adding ~(remove-hook 'doom-first-input-hook + #'evil-snipe-mode)~ to =$DOOMDIR/config.el=, 2. Or disable =evil-snipe= completely with ~(package! evil-snipe :disable t)~ added to =$DOOMDIR/packages.el=, but this will also disable incremental highlighting for the f/F/t/T motions keys. From 04eb44a6104912342641839807230b21f72b76e6 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 8 Jul 2021 00:28:35 -0400 Subject: [PATCH 14/14] tools/pass: remove auth-source-pass recipe A sufficiently up-to-date version of this package is built into Emacs 27.1+. Since we dropped 26.x support in 044a1a5f2 this is no longer needed. Mentioned in https://discourse.doomemacs.org/t/1180 --- modules/tools/pass/packages.el | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/tools/pass/packages.el b/modules/tools/pass/packages.el index 488e5e559..e97d7f042 100644 --- a/modules/tools/pass/packages.el +++ b/modules/tools/pass/packages.el @@ -5,12 +5,6 @@ (package! password-store :pin "4e73cdc4c376ad61d2e4858bc87cf01eab0dd403") (package! password-store-otp :pin "04998c8578a060ab4a4e8f46f2ee0aafad4ab4d5") -;; an older version of `auto-source-pass' is built into Emacs 26+, so we must -;; install the new version directly from the source and with a psuedonym. -(package! auth-source-pass - :recipe (:host github :repo "DamienCassou/auth-password-store") - :pin "fa8b964494c1ef42035fad340ff5f29fcdbed21c") - (when (featurep! :completion ivy) (package! ivy-pass :pin "5b523de1151f2109fdd6a8114d0af12eef83d3c5")) (when (featurep! :completion helm)