Indent properly `generic-flet', `generic-labels', `with-accessors',

`with-condition-restarts'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22e2a836e8cee2f5191f78de9f20007b05f64f52..d55133431b56a869231d73b1f31f25707510ee99 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,16 @@
+2001-11-12  Sam Steingold  <sds@gnu.org>
+
+       * emacs-lisp/cl-indent.el (toplevel): Indent properly
+       `generic-flet', `generic-labels', `with-accessors',
+       `with-condition-restarts'.
+
 2001-11-12  Richard M. Stallman  <rms@gnu.org>
 
        * dired.el: Many trivial doc fixes.
        (dired-get-file-for-visit): New function.
        (dired-find-alternate-file, dired-mouse-find-file-other-window):
-       (dired-view-file, dired-find-file-other-window, dired-display-file): 
-       (dired-find-file): Use dired-get-file-for-visit.        
+       (dired-view-file, dired-find-file-other-window, dired-display-file):
+       (dired-find-file): Use dired-get-file-for-visit.
 
 2001-11-12  Alex Schroeder  <kensanata@yahoo.com>
 
@@ -43,10 +49,10 @@
        * calendar/solar.el (solar-sunrise-and-sunset):
        Exchange the two extreme values of day-length.
 
-       * progmodes/sh-script.el (sh-must-be-shell-mode): 
+       * progmodes/sh-script.el (sh-must-be-shell-mode):
        Allow modes derived from sh-mode.
 
-       * emacs-lisp/checkdoc.el (checkdoc-file-comments-engine): 
+       * emacs-lisp/checkdoc.el (checkdoc-file-comments-engine):
        Turn off error in some re-search-forward calls.
 
        * replace.el (query-replace-skip-read-only): New variable.

diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 69620763414936159fdd1b72ac3fb1a605e21410..fee555d3ed32479230dd0f7c70dc59e35d3d8dcb 100644 (file)
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -355,7 +355,7 @@ by `lisp-body-indent'."
                (&whole nil &rest 1))
              path state indent-point sexp-column normal-indent)))
 
-(defun lisp-indent-defmethod (path state indent-point sexp-column 
+(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))
@@ -419,6 +419,7 @@ by `lisp-body-indent'."
            (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
@@ -455,15 +456,16 @@ by `lisp-body-indent'."
            (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)))))
-  (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))))
+  (dolist (el l)
+    (put (car el) 'common-lisp-indent-function
+         (if (symbolp (cdr el))
+             (get (cdr el) 'common-lisp-indent-function)
+             (car (cdr el))))))
 
 \f
 ;(defun foo (x)