From 15432cf9d2f8ab4cf0b65153fa263aa055d3454f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 17 Jun 2022 21:58:05 +0200 Subject: [PATCH] fix(emacs-lisp): update custom lisp-indent-function To reflect Emacs 28+ changes to the function it is replacing (lisp-indent-function). --- modules/lang/emacs-lisp/autoload.el | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el index dc29cb9b0..d44032425 100644 --- a/modules/lang/emacs-lisp/autoload.el +++ b/modules/lang/emacs-lisp/autoload.el @@ -120,15 +120,17 @@ https://emacs.stackexchange.com/questions/10230/how-to-indent-keywords-aligned" (goto-char (1+ (elt state 1))) (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) (cond ((and (elt state 2) - (or (not (looking-at-p "\\sw\\|\\s_")) - (eq (char-after) ?:))) - (unless (> (save-excursion (forward-line 1) (point)) - calculate-lisp-indent-last-sexp) - (goto-char calculate-lisp-indent-last-sexp) - (beginning-of-line) - (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)) - (backward-prefix-chars) - (current-column)) + (or (eq (char-after) ?:) + (not (looking-at-p "\\sw\\|\\s_")))) + (if (lisp--local-defform-body-p state) + (lisp-indent-defform state indent-point) + (unless (> (save-excursion (forward-line 1) (point)) + calculate-lisp-indent-last-sexp) + (goto-char calculate-lisp-indent-last-sexp) + (beginning-of-line) + (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)) + (backward-prefix-chars) + (current-column))) ((and (save-excursion (goto-char indent-point) (skip-syntax-forward " ")