diff --git a/README.md b/README.md index f2fb96166..acc99d427 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ Includes: [Install](#install) • [Documentation] • [FAQ] • [Screenshots] • [Contribute](#contribute) ![Made with Doom Emacs](https://img.shields.io/github/tag/doomemacs/doomemacs.svg?style=flat-square&label=release&color=58839b) -![Supports Emacs 27.1–29.3](https://img.shields.io/badge/Supports-Emacs_27.1–29.3-blueviolet.svg?style=flat-square&logo=GNU%20Emacs&logoColor=white) -![Latest commit](https://img.shields.io/github/last-commit/doomemacs/doomemacs/master?style=flat-square) -![Build status: master](https://img.shields.io/github/workflow/status/doomemacs/doomemacs/CI/master?style=flat-square) +![Supports Emacs 27.1–29.4](https://img.shields.io/badge/Supports-Emacs_27.1–29.4-blueviolet.svg?style=flat-square&logo=GNU%20Emacs&logoColor=white) +![Latest commit](https://img.shields.io/github/last-commit/doomemacs/doomemacs?style=flat-square) + [![Discord Server](https://img.shields.io/discord/406534637242810369?color=738adb&label=Discord&logo=discord&logoColor=white&style=flat-square)][Discord] [![Discourse server](https://img.shields.io/discourse/users?server=https%3A%2F%2Fdiscourse.doomemacs.org&logo=discourse&label=Discourse&style=flat-square&color=9cf)][Discourse] @@ -107,7 +107,7 @@ Check out [the FAQ][FAQ] for answers to common questions about the project. # Prerequisites - Git 2.23+ -- Emacs 27.1–29.3 (**Recommended: 29.3 + +- Emacs 27.1–29.4 (**Recommended: 29.4 + [native-comp](https://www.emacswiki.org/emacs/GccEmacs)**) - [ripgrep] 11.0+ - GNU `find` diff --git a/lisp/cli/packages.el b/lisp/cli/packages.el index bc9ef51fa..d6ab5572e 100644 --- a/lisp/cli/packages.el +++ b/lisp/cli/packages.el @@ -723,6 +723,11 @@ original state.") (let (autoload-compute-prefixes) (apply fn args))) +(defadvice! doom-cli--straight-suppress-confirm-a (&rest _) + :before-until #'straight-are-you-sure + (and (bound-and-true-p doom-cli--context) + (doom-cli-context-suppress-prompts-p doom-cli--context))) + (defadvice! doom-cli--straight-fallback-to-tty-prompt-a (fn prompt actions) "Modifies straight to prompt on the terminal when in noninteractive sessions." :around #'straight--popup-raw diff --git a/lisp/doom-start.el b/lisp/doom-start.el index 239a6f1d1..20eec39b5 100644 --- a/lisp/doom-start.el +++ b/lisp/doom-start.el @@ -143,9 +143,9 @@ ;; ...but `set-language-environment' also sets `default-input-method', which is ;; a step too opinionated. (setq default-input-method nil) -;; ...And the clipboard on Windows could be in a wider encoding (UTF-16), so -;; leave Emacs to its own devices there. -(eval-when! (not doom--system-windows-p) +;; ...And the clipboard on Windows is often a wider encoding (UTF-16), so leave +;; Emacs to its own devices there. +(unless doom--system-windows-p (setq selection-coding-system 'utf-8)) diff --git a/lisp/doom.el b/lisp/doom.el index eb6f3a215..4b5f1f19c 100644 --- a/lisp/doom.el +++ b/lisp/doom.el @@ -79,7 +79,7 @@ (when (< emacs-major-version 27) (user-error (concat - "Detected Emacs " emacs-version ", but Doom requires 27.1 or newer (29.3 is\n\n" + "Detected Emacs " emacs-version ", but Doom requires 27.1 or newer (29.4 is\n\n" "recommended). The current Emacs executable in use is:\n\n " (car command-line-args) "\n\nA guide for installing a newer version of Emacs can be found at:\n\n " (format "https://docs.doomemacs.org/-/install/%s" diff --git a/modules/lang/org/autoload/org-link.el b/modules/lang/org/autoload/org-link.el index aea9d0084..ff29cac19 100644 --- a/modules/lang/org/autoload/org-link.el +++ b/modules/lang/org/autoload/org-link.el @@ -316,16 +316,14 @@ exist, and `org-link' otherwise." (defun +org-image-file-data-fn (protocol link _description) "Intepret LINK as an image file path and return its data." (setq - link (expand-file-name - link (pcase protocol - ("download" - (or (if (require 'org-download nil t) org-download-image-dir) - (if (require 'org-attach) org-attach-id-dir) - default-directory)) - ("attachment" - (require 'org-attach) - org-attach-id-dir) - (_ default-directory)))) + link (pcase protocol + ("download" + (expand-file-name link (or (if (require 'org-download nil t) org-download-image-dir) + default-directory))) + ("attachment" + (require 'org-attach) + (org-attach-expand link)) + (_ (expand-file-name link default-directory)))) (when (and (file-exists-p link) (image-type-from-file-name link)) (with-temp-buffer diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 0d34604da..fb297e1c4 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -494,7 +494,7 @@ relative to `org-directory', unless it is an absolute path." (add-to-list 'projectile-globally-ignored-directories org-attach-id-dir))) ;; Add inline image previews for attachment links - (org-link-set-parameters "attachment" :image-data-fun #'+org-inline-image-data-fn)) + (org-link-set-parameters "attachment" :image-data-fun #'+org-image-file-data-fn)) (defun +org-init-custom-links-h () diff --git a/modules/tools/lsp/+eglot.el b/modules/tools/lsp/+eglot.el index a020a00c1..a163bfc5a 100644 --- a/modules/tools/lsp/+eglot.el +++ b/modules/tools/lsp/+eglot.el @@ -64,8 +64,7 @@ server an expensive restart when its buffer is reverted." (use-package! consult-eglot :defer t :when (modulep! :completion vertico) - :init - (map! :map eglot-mode-map [remap xref-find-apropos] #'consult-eglot-symbols)) + :init (define-key eglot-mode-map [remap xref-find-apropos] #'consult-eglot-symbols)) (use-package! flycheck-eglot diff --git a/modules/ui/tabs/config.el b/modules/ui/tabs/config.el index 4e79ae500..8f4bf68f8 100644 --- a/modules/ui/tabs/config.el +++ b/modules/ui/tabs/config.el @@ -33,13 +33,7 @@ (defun +tabs-disable-centaur-tabs-mode-maybe-h () "Disable `centaur-tabs-mode' in current buffer." (when (centaur-tabs-mode-on-p) - (centaur-tabs-local-mode)))) - - (add-hook! 'doom-load-theme-hook - (defun +tabs-reload-centaur-tabs-h () - (when (bound-and-true-p centaur-tabs-mode) - (centaur-tabs-mode -1) - (centaur-tabs-mode +1))))) + (centaur-tabs-local-mode))))) ;; TODO tab-bar-mode (emacs 27) ;; TODO tab-line-mode (emacs 27) diff --git a/modules/ui/tabs/packages.el b/modules/ui/tabs/packages.el index a38f3c351..c5c95f5f3 100644 --- a/modules/ui/tabs/packages.el +++ b/modules/ui/tabs/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; ui/tabs/packages.el -(package! centaur-tabs :pin "4a121a175e663295fcd295512642dae4d2ff9db3") +(package! centaur-tabs :pin "d6009c295a4363930247ae9a4d1125aea4d3fd74")