dev: merge branch 'master' into emenel

This commit is contained in:
Matt Nish-Lapidus 2024-06-28 17:50:46 -04:00
commit f58082cb0c
9 changed files with 25 additions and 29 deletions

View file

@ -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

View file

@ -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))

View file

@ -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"