Mercurial > emacs

annotate lisp/emacs-lisp/cl-indent.el @ 45536:a9761fefe0ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reinstate the following change from 2002-03-22, which was inadvertently lost on 2002-04-13. * etags.c (main): Use `sort -o TAGFILE TAGFILE' instead of `sort TAGFILE -o TAGFILE', as POSIX 1003.1-2001 disallows the latter usage.
author Paul Eggert <eggert@twinsun.com>
date Mon, 27 May 2002 06:51:19 +0000 (2002-05-27)
parents af0b9648d018
children 54fb43cbbd73
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
662
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 257
diff changeset
1 ;;; cl-indent.el --- enhanced lisp-indent mode
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 257
diff changeset
2
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
3 ;; Copyright (C) 1987, 2000, 2001, 2002 Free Software Foundation, Inc.
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 845
diff changeset
4
14040
187735b53d52 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 3591
diff changeset
5 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 845
diff changeset
6 ;; Created: July 1987
845
213978acbc1e entered into RCS
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 811
diff changeset
7 ;; Maintainer: FSF
213978acbc1e entered into RCS
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 811
diff changeset
8 ;; Keywords: lisp, tools
213978acbc1e entered into RCS
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 811
diff changeset
9
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 ;; GNU Emacs is free software; you can redistribute it and/or modify
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 662
diff changeset
14 ;; the Free Software Foundation; either version 2, or (at your option)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 ;; any later version.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20 ;; GNU General Public License for more details.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14040
diff changeset
25 ;; Boston, MA 02111-1307, USA.
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 662
diff changeset
27 ;;; Commentary:
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 662
diff changeset
28
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 845
diff changeset
29 ;; This package supplies a single entry point, common-lisp-indent-function,
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 845
diff changeset
30 ;; which performs indentation in the preferred style for Common Lisp code.
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 845
diff changeset
31 ;; To enable it:
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 845
diff changeset
32 ;;
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 845
diff changeset
33 ;; (setq lisp-indent-function 'common-lisp-indent-function)
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 845
diff changeset
34
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 ;;>> TODO
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
36 ;; :foo
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
37 ;; bar
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
38 ;; :baz
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39 ;; zap
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
40 ;; &key (like &body)??
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
41
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42 ;; &rest 1 in lambda-lists doesn't work
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43 ;; -- really want (foo bar
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44 ;; baz)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45 ;; not (foo bar
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
46 ;; baz)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
47 ;; Need something better than &rest for such cases
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
48
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 662
diff changeset
49 ;;; Code:
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
50
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
51 (defgroup lisp-indent nil
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
52 "Indentation in Lisp"
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
53 :group 'lisp)
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
54
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
55
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
56 (defcustom lisp-indent-maximum-backtracking 3
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
57 "*Maximum depth to backtrack out from a sublist for structured indentation.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58 If this variable is 0, no backtracking will occur and forms such as flet
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
59 may not be correctly indented."
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
60 :type 'integer
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
61 :group 'lisp-indent)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
62
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
63 (defcustom lisp-tag-indentation 1
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
64 "*Indentation of tags relative to containing list.
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
65 This variable is used by the function `lisp-indent-tagbody'."
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
66 :type 'integer
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
67 :group 'lisp-indent)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
68
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
69 (defcustom lisp-tag-body-indentation 3
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
70 "*Indentation of non-tagged lines relative to containing list.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
71 This variable is used by the function `lisp-indent-tagbody' to indent normal
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
72 lines (lines without tags).
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
73 The indentation is relative to the indentation of the parenthesis enclosing
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
74 the special form. If the value is t, the body of tags will be indented
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
75 as a block at the same indentation as the first s-expression following
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
76 the tag. In this case, any forms before the first tag are indented
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
77 by `lisp-body-indent'."
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
78 :type 'integer
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
79 :group 'lisp-indent)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
80
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
81 (defcustom lisp-backquote-indentation t
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
82 "*Whether or not to indent backquoted lists as code.
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
83 If nil, indent backquoted lists as data, i.e., like quoted lists."
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
84 :type 'boolean
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
85 :group 'lisp-indent)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
86
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
87
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
88 (defcustom lisp-loop-keyword-indentation 3
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
89 "*Indentation of loop keywords in extended loop forms."
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
90 :type 'integer
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
91 :group 'lisp-indent)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
92
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
93
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
94 (defcustom lisp-loop-forms-indentation 5
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
95 "*Indentation of forms in extended loop forms."
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
96 :type 'integer
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
97 :group 'lisp-indent)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
98
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
99
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
100 (defcustom lisp-simple-loop-indentation 3
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
101 "*Indentation of forms in simple loop forms."
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
102 :type 'integer
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
103 :group 'lisp-indent)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
104
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
105
22212
b95ba3830bc9 (lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22180
diff changeset
106 (defvar lisp-indent-error-function)
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
107 (defvar lisp-indent-defun-method '(4 &lambda &body))
22212
b95ba3830bc9 (lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22180
diff changeset
108
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
109
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
110 (defun extended-loop-p (loop-start)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
111 "True if an extended loop form starta at LOOP-START."
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
112 (condition-case ()
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
113 (save-excursion
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
114 (goto-char loop-start)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
115 (forward-char 1)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
116 (forward-sexp 2)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
117 (backward-sexp 1)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
118 (looking-at "\\sw"))
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
119 (error t)))
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
120
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
121
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
122 (defun common-lisp-loop-part-indentation (indent-point state)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
123 "Compute the indentation of loop form constituents."
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
124 (let* ((loop-indentation (save-excursion
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
125 (goto-char (elt state 1))
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
126 (current-column))))
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
127 (goto-char indent-point)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
128 (beginning-of-line)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
129 (cond ((not (extended-loop-p (elt state 1)))
43920
af0b9648d018 (common-lisp-loop-part-indentation):
Gerd Moellmann <gerd@gnu.org>
parents: 43859
diff changeset
130 (+ loop-indentation lisp-simple-loop-indentation))
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
131 ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)")
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
132 (+ loop-indentation lisp-loop-keyword-indentation))
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
133 (t
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
134 (+ loop-indentation lisp-loop-forms-indentation)))))
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
135
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
136
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
137 ;;;###autoload
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
138 (defun common-lisp-indent-function (indent-point state)
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
139 (if (save-excursion (goto-char (elt state 1))
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
140 (looking-at "([Ll][Oo][Oo][Pp]"))
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
141 (common-lisp-loop-part-indentation indent-point state)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
142 (common-lisp-indent-function-1 indent-point state)))
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
143
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
144
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
145 (defun common-lisp-indent-function-1 (indent-point state)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
146 (let ((normal-indent (current-column)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
147 ;; Walk up list levels until we see something
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
148 ;; which does special things with subforms.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
149 (let ((depth 0)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
150 ;; Path describes the position of point in terms of
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 2307
diff changeset
151 ;; list-structure with respect to containing lists.
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152 ;; `foo' has a path of (0 4 1) in `((a b c (d foo) f) g)'
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 (path ())
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 ;; set non-nil when somebody works out the indentation to use
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155 calculated
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156 (last-point indent-point)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
157 ;; the position of the open-paren of the innermost containing list
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158 (containing-form-start (elt state 1))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
159 ;; the column of the above
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
160 sexp-column)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
161 ;; Move to start of innermost containing list
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
162 (goto-char containing-form-start)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
163 (setq sexp-column (current-column))
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
164
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
165 ;; Look over successively less-deep containing forms
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
166 (while (and (not calculated)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167 (< depth lisp-indent-maximum-backtracking))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
168 (let ((containing-sexp (point)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
169 (forward-char 1)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
170 (parse-partial-sexp (point) indent-point 1 t)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
171 ;; Move to the car of the relevant containing form
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 (let (tem function method)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
173 (if (not (looking-at "\\sw\\|\\s_"))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
174 ;; This form doesn't seem to start with a symbol
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175 (setq function nil method nil)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
176 (setq tem (point))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
177 (forward-sexp 1)
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
178 (setq function (downcase (buffer-substring-no-properties
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
179 tem (point))))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
180 (goto-char tem)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 (setq tem (intern-soft function)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182 method (get tem 'common-lisp-indent-function))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
183 (cond ((and (null method)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 (string-match ":[^:]+" function))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
185 ;; The pleblisp package feature
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
186 (setq function (substring function
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
187 (1+ (match-beginning 0)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
188 method (get (intern-soft function)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
189 'common-lisp-indent-function)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
190 ((and (null method))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
191 ;; backwards compatibility
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
192 (setq method (get tem 'lisp-indent-function)))))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
193 (let ((n 0))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
194 ;; How far into the containing form is the current form?
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
195 (if (< (point) indent-point)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196 (while (condition-case ()
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197 (progn
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198 (forward-sexp 1)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
199 (if (>= (point) indent-point)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200 nil
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 (parse-partial-sexp (point)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
202 indent-point 1 t)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
203 (setq n (1+ n))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
204 t))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205 (error nil))))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 (setq path (cons n path)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
208 ;; backwards compatibility.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 (cond ((null function))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210 ((null method)
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
211 (when (null (cdr path))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 ;; (package prefix was stripped off above)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213 (setq method (cond ((string-match "\\`def"
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
214 function)
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
215 lisp-indent-defun-method)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216 ((string-match "\\`\\(with\\|do\\)-"
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 function)
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
218 '(&lambda &body))))))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 ;; backwards compatibility. Bletch.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220 ((eq method 'defun)
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
221 (setq method lisp-indent-defun-method)))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
223 (cond ((and (or (eq (char-after (1- containing-sexp)) ?\')
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
224 (and (not lisp-backquote-indentation)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
225 (eq (char-after (1- containing-sexp)) ?\`)))
26047
e6efd0ace0f3 (common-lisp-indent-function): Use `eq' instead of `eql'.
Gerd Moellmann <gerd@gnu.org>
parents: 23725
diff changeset
226 (not (eq (char-after (- containing-sexp 2)) ?\#)))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227 ;; No indentation for "'(...)" elements
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228 (setq calculated (1+ sexp-column)))
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
229 ((or (eq (char-after (1- containing-sexp)) ?\,)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
230 (and (eq (char-after (1- containing-sexp)) ?\@)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
231 (eq (char-after (- containing-sexp 2)) ?\,)))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
232 ;; ",(...)" or ",@(...)"
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
233 (setq calculated normal-indent))
26047
e6efd0ace0f3 (common-lisp-indent-function): Use `eq' instead of `eql'.
Gerd Moellmann <gerd@gnu.org>
parents: 23725
diff changeset
234 ((eq (char-after (1- containing-sexp)) ?\#)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 ;; "#(...)"
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 (setq calculated (1+ sexp-column)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 ((null method))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 ((integerp method)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
239 ;; convenient top-level hack.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
240 ;; (also compatible with lisp-indent-function)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241 ;; The number specifies how many `distinguished'
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 ;; forms there are before the body starts
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243 ;; Equivalent to (4 4 ... &body)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 (setq calculated (cond ((cdr path)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
245 normal-indent)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
246 ((<= (car path) method)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
247 ;; `distinguished' form
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
248 (list (+ sexp-column 4)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
249 containing-form-start))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
250 ((= (car path) (1+ method))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
251 ;; first body form.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
252 (+ sexp-column lisp-body-indent))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
253 (t
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
254 ;; other body form
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
255 normal-indent))))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
256 ((symbolp method)
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
257 (let ((lisp-indent-error-function function))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
258 (setq calculated (funcall method
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
259 path state indent-point
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
260 sexp-column normal-indent))))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
261 (t
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
262 (let ((lisp-indent-error-function function))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
263 (setq calculated (lisp-indent-259
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
264 method path state indent-point
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
265 sexp-column normal-indent))))))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
266 (goto-char containing-sexp)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
267 (setq last-point containing-sexp)
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
268 (unless calculated
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
269 (condition-case ()
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
270 (progn (backward-up-list 1)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
271 (setq depth (1+ depth)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 (error (setq depth lisp-indent-maximum-backtracking))))))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
273 calculated)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
274
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
275
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
276 (defun lisp-indent-report-bad-format (m)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
277 (error "%s has a badly-formed %s property: %s"
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
278 ;; Love those free variable references!!
22212
b95ba3830bc9 (lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22180
diff changeset
279 lisp-indent-error-function 'common-lisp-indent-function m))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
280
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
281 ;; Blame the crufty control structure on dynamic scoping
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
282 ;; -- not on me!
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
283 (defun lisp-indent-259 (method path state indent-point
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
284 sexp-column normal-indent)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
285 (catch 'exit
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
286 (let ((p path)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
287 (containing-form-start (elt state 1))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
288 n tem tail)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
289 ;; Isn't tail-recursion wonderful?
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
290 (while p
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
291 ;; This while loop is for destructuring.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
292 ;; p is set to (cdr p) each iteration.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
293 (if (not (consp method)) (lisp-indent-report-bad-format method))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
294 (setq n (1- (car p))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
295 p (cdr p)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
296 tail nil)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
297 (while n
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
298 ;; This while loop is for advancing along a method
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
299 ;; until the relevant (possibly &rest/&body) pattern
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
300 ;; is reached.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
301 ;; n is set to (1- n) and method to (cdr method)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
302 ;; each iteration.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
303 (setq tem (car method))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
304
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
305 (or (eq tem 'nil) ;default indentation
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
306 (eq tem '&lambda) ;lambda list
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
307 (and (eq tem '&body) (null (cdr method)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
308 (and (eq tem '&rest)
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
309 (consp (cdr method))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
310 (null (cddr method)))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
311 (integerp tem) ;explicit indentation specified
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
312 (and (consp tem) ;destructuring
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
313 (eq (car tem) '&whole)
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
314 (or (symbolp (cadr tem))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
315 (integerp (cadr tem))))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
316 (and (symbolp tem) ;a function to call to do the work.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
317 (null (cdr method)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
318 (lisp-indent-report-bad-format method))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
319
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
320 (cond ((and tail (not (consp tem)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
321 ;; indent tail of &rest in same way as first elt of rest
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
322 (throw 'exit normal-indent))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
323 ((eq tem '&body)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
324 ;; &body means (&rest <lisp-body-indent>)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
325 (throw 'exit
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
326 (if (and (= n 0) ;first body form
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
327 (null p)) ;not in subforms
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
328 (+ sexp-column
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
329 lisp-body-indent)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
330 normal-indent)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
331 ((eq tem '&rest)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
332 ;; this pattern holds for all remaining forms
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
333 (setq tail (> n 0)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
334 n 0
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
335 method (cdr method)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
336 ((> n 0)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
337 ;; try next element of pattern
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
338 (setq n (1- n)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
339 method (cdr method))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
340 (if (< n 0)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
341 ;; Too few elements in pattern.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
342 (throw 'exit normal-indent)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
343 ((eq tem 'nil)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
344 (throw 'exit (list normal-indent containing-form-start)))
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
345 ((eq tem '&lambda)
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
346 (throw 'exit
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
347 (cond ((null p)
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
348 (list (+ sexp-column 4) containing-form-start))
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
349 ((null (cdr p))
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
350 (+ sexp-column 1))
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
351 (t normal-indent))))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
352 ((integerp tem)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
353 (throw 'exit
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354 (if (null p) ;not in subforms
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
355 (list (+ sexp-column tem) containing-form-start)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 normal-indent)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 ((symbolp tem) ;a function to call
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
358 (throw 'exit
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
359 (funcall tem path state indent-point
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
360 sexp-column normal-indent)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
361 (t
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
362 ;; must be a destructing frob
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
363 (if (not (null p))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
364 ;; descend
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
365 (setq method (cddr tem)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
366 n nil)
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
367 (setq tem (cadr tem))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
368 (throw 'exit
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
369 (cond (tail
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
370 normal-indent)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
371 ((eq tem 'nil)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372 (list normal-indent
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
373 containing-form-start))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
374 ((integerp tem)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
375 (list (+ sexp-column tem)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
376 containing-form-start))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
377 (t
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
378 (funcall tem path state indent-point
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
379 sexp-column normal-indent))))))))))))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
380
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
381 (defun lisp-indent-tagbody (path state indent-point sexp-column normal-indent)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
382 (if (not (null (cdr path)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
383 normal-indent
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
384 (save-excursion
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
385 (goto-char indent-point)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
386 (beginning-of-line)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
387 (skip-chars-forward " \t")
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
388 (list (cond ((looking-at "\\sw\\|\\s_")
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
389 ;; a tagbody tag
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
390 (+ sexp-column lisp-tag-indentation))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
391 ((integerp lisp-tag-body-indentation)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
392 (+ sexp-column lisp-tag-body-indentation))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
393 ((eq lisp-tag-body-indentation 't)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
394 (condition-case ()
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
395 (progn (backward-sexp 1) (current-column))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
396 (error (1+ sexp-column))))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
397 (t (+ sexp-column lisp-body-indent)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
398 ; (cond ((integerp lisp-tag-body-indentation)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
399 ; (+ sexp-column lisp-tag-body-indentation))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
400 ; ((eq lisp-tag-body-indentation 't)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
401 ; normal-indent)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
402 ; (t
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
403 ; (+ sexp-column lisp-body-indent)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
404 (elt state 1)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
405 ))))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
406
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
407 (defun lisp-indent-do (path state indent-point sexp-column normal-indent)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
408 (if (>= (car path) 3)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
409 (let ((lisp-tag-body-indentation lisp-body-indent))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
410 (funcall (function lisp-indent-tagbody)
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
411 path state indent-point sexp-column normal-indent))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
412 (funcall (function lisp-indent-259)
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
413 '((&whole nil &rest
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
414 ;; the following causes weird indentation
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
415 ;;(&whole 1 1 2 nil)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
416 )
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
417 (&whole nil &rest 1))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
418 path state indent-point sexp-column normal-indent)))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
419
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
420
40952
2ca1b56f3bb1 Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents: 38826
diff changeset
421 (defun lisp-indent-defmethod (path state indent-point sexp-column
38826
f2ff22369238 (lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37764
diff changeset
422 normal-indent)
f2ff22369238 (lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37764
diff changeset
423 "Indentation function defmethod."
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
424 (lisp-indent-259 (if (and (>= (car path) 3)
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
425 (null (cdr path))
41256
4a78098c3bd7 (lisp-indent-defmethod): At first three elements, act like defun.
Richard M. Stallman <rms@gnu.org>
parents: 40952
diff changeset
426 (save-excursion (goto-char (elt state 1))
4a78098c3bd7 (lisp-indent-defmethod): At first three elements, act like defun.
Richard M. Stallman <rms@gnu.org>
parents: 40952
diff changeset
427 (forward-char 1)
4a78098c3bd7 (lisp-indent-defmethod): At first three elements, act like defun.
Richard M. Stallman <rms@gnu.org>
parents: 40952
diff changeset
428 (forward-sexp 3)
4a78098c3bd7 (lisp-indent-defmethod): At first three elements, act like defun.
Richard M. Stallman <rms@gnu.org>
parents: 40952
diff changeset
429 (backward-sexp)
4a78098c3bd7 (lisp-indent-defmethod): At first three elements, act like defun.
Richard M. Stallman <rms@gnu.org>
parents: 40952
diff changeset
430 (looking-at ":")))
38826
f2ff22369238 (lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37764
diff changeset
431 '(4 4 (&whole 4 &rest 4) &body)
f2ff22369238 (lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37764
diff changeset
432 (get 'defun 'common-lisp-indent-function))
f2ff22369238 (lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37764
diff changeset
433 path state indent-point sexp-column normal-indent))
f2ff22369238 (lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37764
diff changeset
434
f2ff22369238 (lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37764
diff changeset
435
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
436 (defun lisp-indent-function-lambda-hack (path state indent-point
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
437 sexp-column normal-indent)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
438 ;; indent (function (lambda () <newline> <body-forms>)) kludgily.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
439 (if (or (cdr path) ; wtf?
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440 (> (car path) 3))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
441 ;; line up under previous body form
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
442 normal-indent
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
443 ;; line up under function rather than under lambda in order to
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
444 ;; conserve horizontal space. (Which is what #' is for.)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
445 (condition-case ()
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
446 (save-excursion
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
447 (backward-up-list 2)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
448 (forward-char 1)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
449 (if (looking-at "\\(lisp:+\\)?function\\(\\Sw\\|\\S_\\)")
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
450 (+ lisp-body-indent -1 (current-column))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
451 (+ sexp-column lisp-body-indent)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
452 (error (+ sexp-column lisp-body-indent)))))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
453
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
454
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
455
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
456 (let ((l '((block 1)
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
457 (case (4 &rest (&whole 2 &rest 1)))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
458 (ccase . case) (ecase . case)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
459 (typecase . case) (etypecase . case) (ctypecase . case)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
460 (catch 1)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
461 (cond (&rest (&whole 2 &rest 1)))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
462 (defvar (4 2 2))
30651
61c2f9fcb8f6 * emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents: 29797
diff changeset
463 (defclass (6 4 (&whole 2 &rest 1) (&whole 2 &rest 1)))
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
464 (defconstant . defvar)
27231
e9725bb98b6e Add defclass, define-condition, defmethod, symbol-macrolet.
Dave Love <fx@gnu.org>
parents: 26047
diff changeset
465 (defcustom (4 2 2 2))
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
466 (defparameter . defvar)
30651
61c2f9fcb8f6 * emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents: 29797
diff changeset
467 (defconst . defcustom)
61c2f9fcb8f6 * emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents: 29797
diff changeset
468 (define-condition . defclass)
42252
63b6d0453539 (define-modify-macro): Better indent spec.
Richard M. Stallman <rms@gnu.org>
parents: 41256
diff changeset
469 (define-modify-macro (4 &lambda &body))
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
470 (defsetf (4 &lambda 4 &body))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
471 (defun (4 &lambda &body))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
472 (define-setf-method . defun)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
473 (define-setf-expander . defun)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
474 (defmacro . defun) (defsubst . defun) (deftype . defun)
38826
f2ff22369238 (lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37764
diff changeset
475 (defmethod lisp-indent-defmethod)
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
476 (defpackage (4 2))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
477 (defstruct ((&whole 4 &rest (&whole 2 &rest 1))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
478 &rest (&whole 2 &rest 1)))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
479 (destructuring-bind
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
480 ((&whole 6 &rest 1) 4 &body))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
481 (do lisp-indent-do)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
482 (do* . do)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
483 (dolist ((&whole 4 2 1) &body))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
484 (dotimes . dolist)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
485 (eval-when 1)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
486 (flet ((&whole 4 &rest (&whole 1 &lambda &body)) &body))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
487 (labels . flet)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
488 (macrolet . flet)
40952
2ca1b56f3bb1 Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents: 38826
diff changeset
489 (generic-flet . flet) (generic-labels . flet)
22858
77090a500417 (lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22756
diff changeset
490 (handler-case (4 &rest (&whole 2 &lambda &body)))
22756
6103b46f200a Indent `restart-case', `handler-bind' and `restart-bind' correctly.
Richard M. Stallman <rms@gnu.org>
parents: 22731
diff changeset
491 (restart-case . handler-case)
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
492 ;; `else-body' style
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
493 (if (nil nil &body))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
494 ;; single-else style (then and else equally indented)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
495 (if (&rest nil))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
496 (lambda (&lambda &rest lisp-indent-function-lambda-hack))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
497 (let ((&whole 4 &rest (&whole 1 1 2)) &body))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
498 (let* . let)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
499 (compiler-let . let) ;barf
22756
6103b46f200a Indent `restart-case', `handler-bind' and `restart-bind' correctly.
Richard M. Stallman <rms@gnu.org>
parents: 22731
diff changeset
500 (handler-bind . let) (restart-bind . let)
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
501 (locally 1)
43859
e8da4031d520 (lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents: 42252
diff changeset
502 ;(loop lisp-indent-loop)
37764
b1fec0dc2aa1 (toplevel): indent the :method sub-form of `defgeneric' correctly.
Sam Steingold <sds@gnu.org>
parents: 37389
diff changeset
503 (:method (&lambda &body)) ; in `defgeneric'
30651
61c2f9fcb8f6 * emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents: 29797
diff changeset
504 (multiple-value-bind ((&whole 6 &rest 1) 4 &body))
61c2f9fcb8f6 * emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents: 29797
diff changeset
505 (multiple-value-call (4 &body))
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
506 (multiple-value-prog1 1)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
507 (multiple-value-setq (4 2))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
508 (multiple-value-setf . multiple-value-setq)
27872
277f4365f2fa Indent `pprint-logical-block' properly.
Gerd Moellmann <gerd@gnu.org>
parents: 27802
diff changeset
509 (pprint-logical-block (4 2))
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
510 (print-unreadable-object ((&whole 4 1 &rest 1) &body))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
511 ;; Combines the worst features of BLOCK, LET and TAGBODY
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
512 (prog (&lambda &rest lisp-indent-tagbody))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
513 (prog* . prog)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
514 (prog1 1)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
515 (prog2 2)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
516 (progn 0)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
517 (progv (4 4 &body))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
518 (return 0)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
519 (return-from (nil &body))
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
520 (symbol-macrolet . multiple-value-bind)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
521 (tagbody lisp-indent-tagbody)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
522 (throw 1)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
523 (unless 1)
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
524 (unwind-protect (5 &body))
22180
485917486caf Indent `with-standard-io-syntax' correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21750
diff changeset
525 (when 1)
40952
2ca1b56f3bb1 Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents: 38826
diff changeset
526 (with-accessors . multiple-value-bind)
2ca1b56f3bb1 Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents: 38826
diff changeset
527 (with-condition-restarts . multiple-value-bind)
23725
222d58586999 indent `with-output-to-string' as a CL
Karl Heuer <kwzh@gnu.org>
parents: 22913
diff changeset
528 (with-output-to-string (4 2))
30651
61c2f9fcb8f6 * emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents: 29797
diff changeset
529 (with-slots . multiple-value-bind)
22180
485917486caf Indent `with-standard-io-syntax' correctly.
Richard M. Stallman <rms@gnu.org>
parents: 21750
diff changeset
530 (with-standard-io-syntax (2)))))
40952
2ca1b56f3bb1 Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents: 38826
diff changeset
531 (dolist (el l)
2ca1b56f3bb1 Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents: 38826
diff changeset
532 (put (car el) 'common-lisp-indent-function
2ca1b56f3bb1 Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents: 38826
diff changeset
533 (if (symbolp (cdr el))
2ca1b56f3bb1 Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents: 38826
diff changeset
534 (get (cdr el) 'common-lisp-indent-function)
2ca1b56f3bb1 Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents: 38826
diff changeset
535 (car (cdr el))))))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
536
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
537
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
538 ;(defun foo (x)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
539 ; (tagbody
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
540 ; foo
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
541 ; (bar)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
542 ; baz
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
543 ; (when (losing)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
544 ; (with-big-loser
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
545 ; (yow)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
546 ; ((lambda ()
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
547 ; foo)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
548 ; big)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
549 ; (flet ((foo (bar baz zap)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
550 ; (zip))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
551 ; (zot ()
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
552 ; quux))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
553 ; (do ()
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
554 ; ((lose)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
555 ; (foo 1))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
556 ; (quux)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
557 ; foo
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
558 ; (lose))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
559 ; (cond ((x)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
560 ; (win 1 2
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
561 ; (foo)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
562 ; (t
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
563 ; (lose
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
564 ; 3))))))
29797
3bf98b923af0 handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents: 27872
diff changeset
565
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
566
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
567 ;(put 'while 'common-lisp-indent-function 1)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
568 ;(put 'defwrapper'common-lisp-indent-function ...)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
569 ;(put 'def 'common-lisp-indent-function ...)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
570 ;(put 'defflavor 'common-lisp-indent-function ...)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
571 ;(put 'defsubst 'common-lisp-indent-function ...)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
572
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
573 ;(put 'with-restart 'common-lisp-indent-function '((1 4 ((* 1))) (2 &body)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
574 ;(put 'restart-case 'common-lisp-indent-function '((1 4) (* 2 ((0 1) (* 1)))))
34187
e2fb02d21aee Remove erroneous spec for condition-case.
Dave Love <fx@gnu.org>
parents: 30651
diff changeset
575 ;(put 'define-condition 'common-lisp-indent-function '((1 6) (2 6 ((&whole 1))) (3 4 ((&whole 1))) (4 &body)))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
576 ;(put 'with-condition-handler 'common-lisp-indent-function '((1 4 ((* 1))) (2 &body)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
577 ;(put 'condition-case 'common-lisp-indent-function '((1 4) (* 2 ((0 1) (1 3) (2 &body)))))
34187
e2fb02d21aee Remove erroneous spec for condition-case.
Dave Love <fx@gnu.org>
parents: 30651
diff changeset
578 ;(put 'defclass 'common-lisp-indent-function '((&whole 2 &rest (&whole 2 &rest 1) &rest (&whole 2 &rest 1)))
e2fb02d21aee Remove erroneous spec for condition-case.
Dave Love <fx@gnu.org>
parents: 30651
diff changeset
579 ;(put 'defgeneric 'common-lisp-indent-function 'defun)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
580
662
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 257
diff changeset
581 ;;; cl-indent.el ends here