dev: merge branch 'master' of github.com:doomemacs

This commit is contained in:
Matt Nish-Lapidus 2024-07-19 11:45:16 -04:00
commit a924e32652
12 changed files with 42 additions and 29 deletions

View file

@ -270,9 +270,9 @@
(advice-add #'delete-backward-char :override #'+default--delete-backward-char-a)
;; HACK Makes `newline-and-indent' continue comments (and more reliably).
;; Consults `doom-point-in-comment-functions' to detect a commented region
;; and uses that mode's `comment-line-break-function' to continue comments.
;; If neither exists, it will fall back to the normal behavior of
;; Consults `doom-point-in-comment-p' to detect a commented region and uses
;; that mode's `comment-line-break-function' to continue comments. If
;; neither exists, it will fall back to the normal behavior of
;; `newline-and-indent'.
;;
;; We use an advice here instead of a remapping because many modes define
@ -281,9 +281,7 @@
;; on a case by case basis.
(defadvice! +default--newline-indent-and-continue-comments-a (&rest _)
"A replacement for `newline-and-indent'.
Continues comments if executed from a commented line. Consults
`doom-point-in-comment-functions' to determine if in a comment."
Continues comments if executed from a commented line."
:before-until #'newline-and-indent
(interactive "*")
(when (and +default-want-RET-continue-comments