Indent `restart-case', `handler-bind' and `restart-bind' correctly.

diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index dd5586dbd21d5154552de0af478dcdd6860f6639..04f89c2b0ce41eb379ad882170a42e4232b40f02 100644 (file)
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -402,9 +402,10 @@ by `lisp-body-indent'."
           (eval-when   1)
           (flet        ((&whole 4 &rest (&whole 1 (&whole 4 &rest 1) &body))
                         &body))
-           (handler-case (4 &rest (&whole 2 (&whole 4 &rest 1) &body)))
           (labels . flet)
           (macrolet . flet)
+           (handler-case (4 &rest (&whole 2 (&whole 4 &rest 1) &body)))
+           (restart-case . handler-case)
           ;; `else-body' style
           (if          (nil nil &body))
           ;; single-else style (then and else equally indented)
@@ -415,6 +416,7 @@ by `lisp-body-indent'."
           (let         ((&whole 4 &rest (&whole 1 1 2)) &body))
           (let* . let)
           (compiler-let . let) ;barf
+           (handler-bind . let) (restart-bind . let)
           (locally 1)
           ;(loop ...)
           (multiple-value-bind