comparison lisp/emacs-lisp/cl-indent.el @ 40952:2ca1b56f3bb1

Indent properly `generic-flet', `generic-labels', `with-accessors', `with-condition-restarts'.

40951:7375c885a612

                ;;(&whole 1 1 2 nil)
                )
               (&whole nil &rest 1))
             path state indent-point sexp-column normal-indent)))

(defun lisp-indent-defmethod (path state indent-point sexp-column 
				   normal-indent)
  "Indentation function defmethod."
  (lisp-indent-259 (if (save-excursion (goto-char (elt state 1))
				       (forward-char 1)
				       (forward-sexp 2)

           (dotimes . dolist)
           (eval-when   1)
           (flet        ((&whole 4 &rest (&whole 1 &lambda &body)) &body))
           (labels . flet)
           (macrolet . flet)
           (handler-case (4 &rest (&whole 2 &lambda &body)))
           (restart-case . handler-case)
           ;; `else-body' style
           (if          (nil nil &body))
           ;; single-else style (then and else equally indented)

           (tagbody     lisp-indent-tagbody)
           (throw 1)
           (unless 1)
           (unwind-protect (5 &body))
           (when 1)
           (with-output-to-string (4 2))
           (with-slots . multiple-value-bind)
           (with-standard-io-syntax (2)))))
  (while l
    (put (caar l) 'common-lisp-indent-function
         (if (symbolp (cdar l))
             (get (cdar l) 'common-lisp-indent-function)
             (car (cdar l))))
    (setq l (cdr l))))


;(defun foo (x)
;  (tagbody
;   foo

40952:2ca1b56f3bb1

                ;;(&whole 1 1 2 nil)
                )
               (&whole nil &rest 1))
             path state indent-point sexp-column normal-indent)))

(defun lisp-indent-defmethod (path state indent-point sexp-column
				   normal-indent)
  "Indentation function defmethod."
  (lisp-indent-259 (if (save-excursion (goto-char (elt state 1))
				       (forward-char 1)
				       (forward-sexp 2)

           (dotimes . dolist)
           (eval-when   1)
           (flet        ((&whole 4 &rest (&whole 1 &lambda &body)) &body))
           (labels . flet)
           (macrolet . flet)
           (generic-flet . flet) (generic-labels . flet)
           (handler-case (4 &rest (&whole 2 &lambda &body)))
           (restart-case . handler-case)
           ;; `else-body' style
           (if          (nil nil &body))
           ;; single-else style (then and else equally indented)

           (tagbody     lisp-indent-tagbody)
           (throw 1)
           (unless 1)
           (unwind-protect (5 &body))
           (when 1)
           (with-accessors . multiple-value-bind)
           (with-condition-restarts . multiple-value-bind)
           (with-output-to-string (4 2))
           (with-slots . multiple-value-bind)
           (with-standard-io-syntax (2)))))
  (dolist (el l)
    (put (car el) 'common-lisp-indent-function
         (if (symbolp (cdr el))
             (get (cdr el) 'common-lisp-indent-function)
             (car (cdr el))))))


;(defun foo (x)
;  (tagbody
;   foo