mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

Revert "Fix regressions in cl-flet indentation"

Browse source 
This reverts commit c42af5aee7.
This commit is contained in:
Mattias Engdegård 2021-09-30 15:13:52 +02:00
parent a1789fd67b
commit be493ea67a
2 changed files with 10 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
etc/NEWS
View file

@ -3302,9 +3302,6 @@ These forms now indent like this:
(* x x))) (* x x)))
(bla 42)) (bla 42))
This change also affects 'cl-macrolet', 'cl-flet*' and
'cl-symbol-macrolet'.
* Incompatible Lisp Changes in Emacs 28.1 * Incompatible Lisp Changes in Emacs 28.1

53
lisp/emacs-lisp/lisp-mode.el
View file

@ -1106,8 +1106,8 @@ is the buffer position of the start of the containing expression."
(t (t
normal-indent)))))) normal-indent))))))
(defun lisp--local-defform-body-p (state) (defun lisp--local-defform-body (state)
"Return non-nil when at local definition body according to STATE. "Return non-nil if at local definition body according to STATE.
STATE is the `parse-partial-sexp' state for current position." STATE is the `parse-partial-sexp' state for current position."
(when-let ((start-of-innermost-containing-list (nth 1 state))) (when-let ((start-of-innermost-containing-list (nth 1 state)))
(let* ((parents (nth 9 state)) (let* ((parents (nth 9 state))
@ -1121,42 +1121,11 @@ STATE is the `parse-partial-sexp' state for current position."
second-cons-after nil)) second-cons-after nil))
(pop second-cons-after) (pop second-cons-after)
(pop parents)) (pop parents))
(when second-order-parent (and second-order-parent
(save-excursion (save-excursion
(goto-char (1+ second-order-parent)) (goto-char (1+ second-order-parent))
(and (memq (read (current-buffer)) (memq (read (current-buffer))
'( cl-flet cl-labels cl-macrolet cl-flet* '(cl-flet cl-labels)))))))
cl-symbol-macrolet))
;; Now we must check that we are
;; in the second element of the flet-like form.
;; It would be easier if `parse-partial-sexp' also recorded
;; relative positions of subsexps in supersexps
;; but it doesn't so we check manually.
;;
;; First, we must be looking at list now.
(ignore-errors (when (= (scan-lists (point) 1 0)
(scan-sexps (point) 1))
;; Looking at list; descend into it:
(down-list 1)
t))
;; In Wishful Lisp, the following form would be
;; (cl-member start-of-innermost-containing-list
;; (points-at-beginning-of-lists-at-this-level)
;; :test #'=)
(cl-loop
with pos = (ignore-errors
;; The first local definition may be indented
;; with whitespace following open paren.
(goto-char (scan-lists (point) 1 0))
(goto-char (scan-lists (point) -1 0))
(point))
while pos
do (if (= start-of-innermost-containing-list pos)
(cl-return t)
(setq pos (ignore-errors
(goto-char (scan-lists (point) 2 0))
(goto-char (scan-lists (point) -1 0))
(point)))))))))))
(defun lisp-indent-function (indent-point state) (defun lisp-indent-function (indent-point state)
"This function is the normal value of the variable `lisp-indent-function'. "This function is the normal value of the variable `lisp-indent-function'.
@ -1191,9 +1160,7 @@ Lisp function does not specify a special indentation."
(if (and (elt state 2) (if (and (elt state 2)
(not (looking-at "\\sw\\|\\s_"))) (not (looking-at "\\sw\\|\\s_")))
;; car of form doesn't seem to be a symbol ;; car of form doesn't seem to be a symbol
(if (lisp--local-defform-body-p state) (if (lisp--local-defform-body state)
;; We nevertheless check whether we are in flet-like form
;; as we presume local function names could be non-symbols.
(lisp-indent-defform state indent-point) (lisp-indent-defform state indent-point)
(if (not (> (save-excursion (forward-line 1) (point)) (if (not (> (save-excursion (forward-line 1) (point))
calculate-lisp-indent-last-sexp)) calculate-lisp-indent-last-sexp))
@ -1217,8 +1184,8 @@ Lisp function does not specify a special indentation."
(and (null method) (and (null method)
(> (length function) 3) (> (length function) 3)
(string-match "\\`def" function)) (string-match "\\`def" function))
;; Check whether we are in flet-like form. ;; Check whether we are in flet or labels.
(lisp--local-defform-body-p state)) (lisp--local-defform-body state))
(lisp-indent-defform state indent-point)) (lisp-indent-defform state indent-point))
((integerp method) ((integerp method)
(lisp-indent-specform method state (lisp-indent-specform method state