Mercurial > emacs
changeset 40952:2ca1b56f3bb1
Indent properly `generic-flet', `generic-labels', `with-accessors',
`with-condition-restarts'.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Mon, 12 Nov 2001 19:58:33 +0000 |
| parents | 7375c885a612 |
| children | 4eb75a1eacfa |
| files | lisp/ChangeLog lisp/emacs-lisp/cl-indent.el |
| diffstat | 2 files changed, 19 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Nov 12 17:05:13 2001 +0000 +++ b/lisp/ChangeLog Mon Nov 12 19:58:33 2001 +0000 @@ -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.
--- a/lisp/emacs-lisp/cl-indent.el Mon Nov 12 17:05:13 2001 +0000 +++ b/lisp/emacs-lisp/cl-indent.el Mon Nov 12 19:58:33 2001 +0000 @@ -355,7 +355,7 @@ (&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 @@ (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 @@ (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)))))) ;(defun foo (x)