diff options
| author | Miles Bader <miles@gnu.org> | 2006-10-30 08:54:41 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-10-30 08:54:41 +0000 |
| commit | 503be82149af57edcba384554e0f268b9a9551e1 (patch) | |
| tree | d4a7bbe12b22462bbf427fffeb889ebcf5da6782 /lisp/emacs-lisp/cl-indent.el | |
| parent | 4b89b5e297a9fc832d51f47f02c264308dd6da13 (diff) | |
| parent | ab785936c82ac81edb8b20ac27c0558bc04797e5 (diff) | |
| download | emacs-503be82149af57edcba384554e0f268b9a9551e1.tar.gz emacs-503be82149af57edcba384554e0f268b9a9551e1.tar.bz2 emacs-503be82149af57edcba384554e0f268b9a9551e1.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 476-489)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 153-160)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127
Diffstat (limited to 'lisp/emacs-lisp/cl-indent.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-indent.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el index c3ceb4c2f3a..f09b72f396f 100644 --- a/lisp/emacs-lisp/cl-indent.el +++ b/lisp/emacs-lisp/cl-indent.el @@ -373,14 +373,16 @@ If nil, indent backquoted lists as data, i.e., like quoted lists." ;; Too few elements in pattern. (throw 'exit normal-indent))) ((eq tem 'nil) - (throw 'exit (list normal-indent containing-form-start))) - ((eq tem '&lambda) - (throw 'exit - (cond ((null p) - (list (+ sexp-column 4) containing-form-start)) - ((null (cdr p)) - (+ sexp-column 1)) - (t normal-indent)))) + (throw 'exit (if (consp normal-indent) + normal-indent + (list normal-indent containing-form-start)))) + ((eq tem '&lambda) + (throw 'exit + (cond ((null p) + (list (+ sexp-column 4) containing-form-start)) + ((null (cdr p)) + (+ sexp-column 1)) + (t normal-indent)))) ((integerp tem) (throw 'exit (if (null p) ;not in subforms |