Mercurial > emacs
annotate lisp/emacs-lisp/cl-indent.el @ 101456:133f2b03479e
* abbrevs.texi (Abbrev Table Properties): Fix typo.
Reported by Seweryn Kokot <sewkokot@gmail.com>. (Bug#2039)
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 25 Jan 2009 12:10:52 +0000 |
parents | a9dc0e7c3f2b |
children | 4470991d3249 |
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 |
64751
5b1a238fcbb4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64085
diff
changeset
|
3 ;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004, |
100908 | 4 ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
5 |
14040 | 6 ;; 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
|
7 ;; Created: July 1987 |
845 | 8 ;; Maintainer: FSF |
9 ;; Keywords: lisp, tools | |
10 | |
257 | 11 ;; This file is part of GNU Emacs. |
12 | |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; GNU Emacs is free software: you can redistribute it and/or modify |
257 | 14 ;; it under the terms of the GNU General Public License as published by |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
15 ;; the Free Software Foundation, either version 3 of the License, or |
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
16 ;; (at your option) any later version. |
257 | 17 |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
257 | 25 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
26 ;;; Commentary: |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
27 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
28 ;; 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
|
29 ;; 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
|
30 ;; To enable it: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
31 ;; |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
32 ;; (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
|
33 |
257 | 34 ;;>> TODO |
35 ;; :foo | |
36 ;; bar | |
37 ;; :baz | |
38 ;; zap | |
39 ;; &key (like &body)?? | |
40 | |
41 ;; &rest 1 in lambda-lists doesn't work | |
42 ;; -- really want (foo bar | |
43 ;; baz) | |
44 ;; not (foo bar | |
45 ;; baz) | |
46 ;; Need something better than &rest for such cases | |
47 | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
48 ;;; Code: |
257 | 49 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
50 (defgroup lisp-indent nil |
63972
d07b7088d847
(lisp-indent-maximum-backtracking): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
56736
diff
changeset
|
51 "Indentation in Lisp." |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
52 :group 'lisp) |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
53 |
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 (defcustom lisp-indent-maximum-backtracking 3 |
257 | 56 "*Maximum depth to backtrack out from a sublist for structured indentation. |
63972
d07b7088d847
(lisp-indent-maximum-backtracking): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
56736
diff
changeset
|
57 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
|
58 may not be correctly indented." |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
59 :type 'integer |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
60 :group 'lisp-indent) |
257 | 61 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
62 (defcustom lisp-tag-indentation 1 |
257 | 63 "*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
|
64 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
|
65 :type 'integer |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
66 :group 'lisp-indent) |
257 | 67 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
68 (defcustom lisp-tag-body-indentation 3 |
257 | 69 "*Indentation of non-tagged lines relative to containing list. |
70 This variable is used by the function `lisp-indent-tagbody' to indent normal | |
71 lines (lines without tags). | |
72 The indentation is relative to the indentation of the parenthesis enclosing | |
73 the special form. If the value is t, the body of tags will be indented | |
74 as a block at the same indentation as the first s-expression following | |
75 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
|
76 by `lisp-body-indent'." |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
77 :type 'integer |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
78 :group 'lisp-indent) |
257 | 79 |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
80 (defcustom lisp-backquote-indentation t |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
81 "*Whether or not to indent backquoted lists as code. |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
82 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
|
83 :type 'boolean |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
84 :group 'lisp-indent) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
85 |
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 (defcustom lisp-loop-keyword-indentation 3 |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
88 "*Indentation of loop keywords in extended loop forms." |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
89 :type 'integer |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
90 :group 'lisp-indent) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
91 |
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 (defcustom lisp-loop-forms-indentation 5 |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
94 "*Indentation of forms in extended loop forms." |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
95 :type 'integer |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
96 :group 'lisp-indent) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
97 |
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 (defcustom lisp-simple-loop-indentation 3 |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
100 "*Indentation of forms in simple loop forms." |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
101 :type 'integer |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
102 :group 'lisp-indent) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
103 |
257 | 104 |
22212
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
105 (defvar lisp-indent-error-function) |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
106 (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
|
107 |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
108 |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
109 (defun extended-loop-p (loop-start) |
47298
c6dddb2746ee
* emacs-lisp/cl-indent.el (extended-loop-p): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents:
45573
diff
changeset
|
110 "True if an extended loop form starts at LOOP-START." |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
111 (condition-case () |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
112 (save-excursion |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
113 (goto-char loop-start) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
114 (forward-char 1) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
115 (forward-sexp 2) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
116 (backward-sexp 1) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
117 (looking-at "\\sw")) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
118 (error t))) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
119 |
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 (defun common-lisp-loop-part-indentation (indent-point state) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
122 "Compute the indentation of loop form constituents." |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
123 (let* ((loop-indentation (save-excursion |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
124 (goto-char (elt state 1)) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
125 (current-column)))) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
126 (goto-char indent-point) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
127 (beginning-of-line) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
128 (cond ((not (extended-loop-p (elt state 1))) |
43920
af0b9648d018
(common-lisp-loop-part-indentation):
Gerd Moellmann <gerd@gnu.org>
parents:
43859
diff
changeset
|
129 (+ loop-indentation lisp-simple-loop-indentation)) |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
130 ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)") |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
131 (+ loop-indentation lisp-loop-keyword-indentation)) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
132 (t |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
133 (+ loop-indentation lisp-loop-forms-indentation))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47298
diff
changeset
|
134 |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
135 |
257 | 136 ;;;###autoload |
137 (defun common-lisp-indent-function (indent-point state) | |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
138 (if (save-excursion (goto-char (elt state 1)) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
139 (looking-at "([Ll][Oo][Oo][Pp]")) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
140 (common-lisp-loop-part-indentation indent-point state) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
141 (common-lisp-indent-function-1 indent-point state))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47298
diff
changeset
|
142 |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47298
diff
changeset
|
143 |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
144 (defun common-lisp-indent-function-1 (indent-point state) |
257 | 145 (let ((normal-indent (current-column))) |
146 ;; Walk up list levels until we see something | |
147 ;; which does special things with subforms. | |
148 (let ((depth 0) | |
149 ;; 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
|
150 ;; list-structure with respect to containing lists. |
257 | 151 ;; `foo' has a path of (0 4 1) in `((a b c (d foo) f) g)' |
152 (path ()) | |
153 ;; set non-nil when somebody works out the indentation to use | |
154 calculated | |
45573
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
155 ;; If non-nil, this is an indentation to use |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
156 ;; if nothing else specifies it more firmly. |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
157 tentative-calculated |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
158 (last-point indent-point) |
257 | 159 ;; the position of the open-paren of the innermost containing list |
160 (containing-form-start (elt state 1)) | |
161 ;; the column of the above | |
162 sexp-column) | |
163 ;; Move to start of innermost containing list | |
164 (goto-char containing-form-start) | |
165 (setq sexp-column (current-column)) | |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
166 |
257 | 167 ;; Look over successively less-deep containing forms |
168 (while (and (not calculated) | |
169 (< depth lisp-indent-maximum-backtracking)) | |
170 (let ((containing-sexp (point))) | |
171 (forward-char 1) | |
172 (parse-partial-sexp (point) indent-point 1 t) | |
173 ;; Move to the car of the relevant containing form | |
45573
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
174 (let (tem function method tentative-defun) |
257 | 175 (if (not (looking-at "\\sw\\|\\s_")) |
176 ;; This form doesn't seem to start with a symbol | |
177 (setq function nil method nil) | |
178 (setq tem (point)) | |
179 (forward-sexp 1) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
180 (setq function (downcase (buffer-substring-no-properties |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
181 tem (point)))) |
257 | 182 (goto-char tem) |
183 (setq tem (intern-soft function) | |
184 method (get tem 'common-lisp-indent-function)) | |
185 (cond ((and (null method) | |
186 (string-match ":[^:]+" function)) | |
187 ;; The pleblisp package feature | |
188 (setq function (substring function | |
189 (1+ (match-beginning 0))) | |
190 method (get (intern-soft function) | |
191 'common-lisp-indent-function))) | |
192 ((and (null method)) | |
193 ;; backwards compatibility | |
194 (setq method (get tem 'lisp-indent-function))))) | |
195 (let ((n 0)) | |
196 ;; How far into the containing form is the current form? | |
197 (if (< (point) indent-point) | |
198 (while (condition-case () | |
199 (progn | |
200 (forward-sexp 1) | |
201 (if (>= (point) indent-point) | |
202 nil | |
203 (parse-partial-sexp (point) | |
204 indent-point 1 t) | |
205 (setq n (1+ n)) | |
206 t)) | |
207 (error nil)))) | |
208 (setq path (cons n path))) | |
209 | |
210 ;; backwards compatibility. | |
211 (cond ((null function)) | |
212 ((null method) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
213 (when (null (cdr path)) |
45573
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
214 ;; (package prefix was stripped off above) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
215 (cond ((string-match "\\`def" |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
216 function) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
217 (setq tentative-defun t)) |
55636
c2f8040b4ece
(common-lisp-indent-function-1): Indent "without-" forms just
Sam Steingold <sds@gnu.org>
parents:
52401
diff
changeset
|
218 ((string-match |
c2f8040b4ece
(common-lisp-indent-function-1): Indent "without-" forms just
Sam Steingold <sds@gnu.org>
parents:
52401
diff
changeset
|
219 (eval-when-compile |
c2f8040b4ece
(common-lisp-indent-function-1): Indent "without-" forms just
Sam Steingold <sds@gnu.org>
parents:
52401
diff
changeset
|
220 (concat "\\`\\(" |
c2f8040b4ece
(common-lisp-indent-function-1): Indent "without-" forms just
Sam Steingold <sds@gnu.org>
parents:
52401
diff
changeset
|
221 (regexp-opt '("with" "without" "do")) |
c2f8040b4ece
(common-lisp-indent-function-1): Indent "without-" forms just
Sam Steingold <sds@gnu.org>
parents:
52401
diff
changeset
|
222 "\\)-")) |
c2f8040b4ece
(common-lisp-indent-function-1): Indent "without-" forms just
Sam Steingold <sds@gnu.org>
parents:
52401
diff
changeset
|
223 function) |
45573
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
224 (setq method '(&lambda &body)))))) |
257 | 225 ;; backwards compatibility. Bletch. |
226 ((eq method 'defun) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
227 (setq method lisp-indent-defun-method))) |
257 | 228 |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
229 (cond ((and (or (eq (char-after (1- containing-sexp)) ?\') |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
230 (and (not lisp-backquote-indentation) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
231 (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
|
232 (not (eq (char-after (- containing-sexp 2)) ?\#))) |
257 | 233 ;; No indentation for "'(...)" elements |
234 (setq calculated (1+ sexp-column))) | |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
235 ((or (eq (char-after (1- containing-sexp)) ?\,) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
236 (and (eq (char-after (1- containing-sexp)) ?\@) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
237 (eq (char-after (- containing-sexp 2)) ?\,))) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
238 ;; ",(...)" or ",@(...)" |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
239 (setq calculated normal-indent)) |
26047
e6efd0ace0f3
(common-lisp-indent-function): Use `eq' instead of `eql'.
Gerd Moellmann <gerd@gnu.org>
parents:
23725
diff
changeset
|
240 ((eq (char-after (1- containing-sexp)) ?\#) |
257 | 241 ;; "#(...)" |
242 (setq calculated (1+ sexp-column))) | |
45573
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
243 ((null method) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
244 ;; If this looks like a call to a `def...' form, |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
245 ;; think about indenting it as one, but do it |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
246 ;; tentatively for cases like |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
247 ;; (flet ((defunp () |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
248 ;; nil))) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
249 ;; Set both normal-indent and tentative-calculated. |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
250 ;; The latter ensures this value gets used |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
251 ;; if there are no relevant containing constructs. |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
252 ;; The former ensures this value gets used |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
253 ;; if there is a relevant containing construct |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
254 ;; but we are nested within the structure levels |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
255 ;; that it specifies indentation for. |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
256 (if tentative-defun |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
257 (setq tentative-calculated |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
258 (common-lisp-indent-call-method |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
259 function lisp-indent-defun-method |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
260 path state indent-point |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
261 sexp-column normal-indent) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
262 normal-indent tentative-calculated))) |
257 | 263 ((integerp method) |
264 ;; convenient top-level hack. | |
265 ;; (also compatible with lisp-indent-function) | |
266 ;; The number specifies how many `distinguished' | |
267 ;; forms there are before the body starts | |
268 ;; Equivalent to (4 4 ... &body) | |
269 (setq calculated (cond ((cdr path) | |
270 normal-indent) | |
271 ((<= (car path) method) | |
272 ;; `distinguished' form | |
273 (list (+ sexp-column 4) | |
274 containing-form-start)) | |
275 ((= (car path) (1+ method)) | |
276 ;; first body form. | |
277 (+ sexp-column lisp-body-indent)) | |
278 (t | |
279 ;; other body form | |
280 normal-indent)))) | |
45573
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
281 (t |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
282 (setq calculated |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
283 (common-lisp-indent-call-method |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
284 function method path state indent-point |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
285 sexp-column normal-indent))))) |
257 | 286 (goto-char containing-sexp) |
287 (setq last-point containing-sexp) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
288 (unless calculated |
45573
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
289 (condition-case () |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
290 (progn (backward-up-list 1) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
291 (setq depth (1+ depth))) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
292 (error (setq depth lisp-indent-maximum-backtracking)))))) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
293 (or calculated tentative-calculated)))) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
294 |
257 | 295 |
45573
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
296 (defun common-lisp-indent-call-method (function method path state indent-point |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
297 sexp-column normal-indent) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
298 (let ((lisp-indent-error-function function)) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
299 (if (symbolp method) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
300 (funcall method |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
301 path state indent-point |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
302 sexp-column normal-indent) |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
303 (lisp-indent-259 method path state indent-point |
54fb43cbbd73
(common-lisp-indent-function-1):
Richard M. Stallman <rms@gnu.org>
parents:
43920
diff
changeset
|
304 sexp-column normal-indent)))) |
257 | 305 |
306 (defun lisp-indent-report-bad-format (m) | |
307 (error "%s has a badly-formed %s property: %s" | |
308 ;; Love those free variable references!! | |
22212
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
309 lisp-indent-error-function 'common-lisp-indent-function m)) |
257 | 310 |
311 ;; Blame the crufty control structure on dynamic scoping | |
312 ;; -- not on me! | |
313 (defun lisp-indent-259 (method path state indent-point | |
314 sexp-column normal-indent) | |
315 (catch 'exit | |
316 (let ((p path) | |
317 (containing-form-start (elt state 1)) | |
318 n tem tail) | |
319 ;; Isn't tail-recursion wonderful? | |
320 (while p | |
321 ;; This while loop is for destructuring. | |
322 ;; p is set to (cdr p) each iteration. | |
323 (if (not (consp method)) (lisp-indent-report-bad-format method)) | |
324 (setq n (1- (car p)) | |
325 p (cdr p) | |
326 tail nil) | |
327 (while n | |
328 ;; This while loop is for advancing along a method | |
329 ;; until the relevant (possibly &rest/&body) pattern | |
330 ;; is reached. | |
331 ;; n is set to (1- n) and method to (cdr method) | |
332 ;; each iteration. | |
333 (setq tem (car method)) | |
334 | |
335 (or (eq tem 'nil) ;default indentation | |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
336 (eq tem '&lambda) ;lambda list |
257 | 337 (and (eq tem '&body) (null (cdr method))) |
338 (and (eq tem '&rest) | |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
339 (consp (cdr method)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
340 (null (cddr method))) |
257 | 341 (integerp tem) ;explicit indentation specified |
342 (and (consp tem) ;destructuring | |
343 (eq (car tem) '&whole) | |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
344 (or (symbolp (cadr tem)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
345 (integerp (cadr tem)))) |
257 | 346 (and (symbolp tem) ;a function to call to do the work. |
347 (null (cdr method))) | |
348 (lisp-indent-report-bad-format method)) | |
349 | |
350 (cond ((and tail (not (consp tem))) | |
351 ;; indent tail of &rest in same way as first elt of rest | |
352 (throw 'exit normal-indent)) | |
353 ((eq tem '&body) | |
354 ;; &body means (&rest <lisp-body-indent>) | |
355 (throw 'exit | |
356 (if (and (= n 0) ;first body form | |
357 (null p)) ;not in subforms | |
358 (+ sexp-column | |
359 lisp-body-indent) | |
360 normal-indent))) | |
361 ((eq tem '&rest) | |
362 ;; this pattern holds for all remaining forms | |
363 (setq tail (> n 0) | |
364 n 0 | |
365 method (cdr method))) | |
366 ((> n 0) | |
367 ;; try next element of pattern | |
368 (setq n (1- n) | |
369 method (cdr method)) | |
370 (if (< n 0) | |
371 ;; Too few elements in pattern. | |
372 (throw 'exit normal-indent))) | |
373 ((eq tem 'nil) | |
73497
c1427878fdcf
* emacs-lisp/cl-indent.el (lisp-indent-259): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
73496
diff
changeset
|
374 (throw 'exit (if (consp normal-indent) |
c1427878fdcf
* emacs-lisp/cl-indent.el (lisp-indent-259): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
73496
diff
changeset
|
375 normal-indent |
c1427878fdcf
* emacs-lisp/cl-indent.el (lisp-indent-259): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
73496
diff
changeset
|
376 (list normal-indent containing-form-start)))) |
73496
f93751296dc3
* emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the
Chong Yidong <cyd@stupidchicken.com>
parents:
68648
diff
changeset
|
377 ((eq tem '&lambda) |
f93751296dc3
* emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the
Chong Yidong <cyd@stupidchicken.com>
parents:
68648
diff
changeset
|
378 (throw 'exit |
f93751296dc3
* emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the
Chong Yidong <cyd@stupidchicken.com>
parents:
68648
diff
changeset
|
379 (cond ((null p) |
f93751296dc3
* emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the
Chong Yidong <cyd@stupidchicken.com>
parents:
68648
diff
changeset
|
380 (list (+ sexp-column 4) containing-form-start)) |
f93751296dc3
* emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the
Chong Yidong <cyd@stupidchicken.com>
parents:
68648
diff
changeset
|
381 ((null (cdr p)) |
f93751296dc3
* emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the
Chong Yidong <cyd@stupidchicken.com>
parents:
68648
diff
changeset
|
382 (+ sexp-column 1)) |
f93751296dc3
* emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the
Chong Yidong <cyd@stupidchicken.com>
parents:
68648
diff
changeset
|
383 (t normal-indent)))) |
257 | 384 ((integerp tem) |
385 (throw 'exit | |
386 (if (null p) ;not in subforms | |
387 (list (+ sexp-column tem) containing-form-start) | |
388 normal-indent))) | |
389 ((symbolp tem) ;a function to call | |
390 (throw 'exit | |
391 (funcall tem path state indent-point | |
392 sexp-column normal-indent))) | |
393 (t | |
394 ;; must be a destructing frob | |
395 (if (not (null p)) | |
396 ;; descend | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
397 (setq method (cddr tem) |
257 | 398 n nil) |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
399 (setq tem (cadr tem)) |
257 | 400 (throw 'exit |
401 (cond (tail | |
402 normal-indent) | |
403 ((eq tem 'nil) | |
404 (list normal-indent | |
405 containing-form-start)) | |
406 ((integerp tem) | |
407 (list (+ sexp-column tem) | |
408 containing-form-start)) | |
409 (t | |
410 (funcall tem path state indent-point | |
411 sexp-column normal-indent)))))))))))) | |
412 | |
413 (defun lisp-indent-tagbody (path state indent-point sexp-column normal-indent) | |
414 (if (not (null (cdr path))) | |
415 normal-indent | |
416 (save-excursion | |
417 (goto-char indent-point) | |
418 (beginning-of-line) | |
419 (skip-chars-forward " \t") | |
420 (list (cond ((looking-at "\\sw\\|\\s_") | |
421 ;; a tagbody tag | |
422 (+ sexp-column lisp-tag-indentation)) | |
423 ((integerp lisp-tag-body-indentation) | |
424 (+ sexp-column lisp-tag-body-indentation)) | |
425 ((eq lisp-tag-body-indentation 't) | |
426 (condition-case () | |
427 (progn (backward-sexp 1) (current-column)) | |
428 (error (1+ sexp-column)))) | |
429 (t (+ sexp-column lisp-body-indent))) | |
430 ; (cond ((integerp lisp-tag-body-indentation) | |
431 ; (+ sexp-column lisp-tag-body-indentation)) | |
432 ; ((eq lisp-tag-body-indentation 't) | |
433 ; normal-indent) | |
434 ; (t | |
435 ; (+ sexp-column lisp-body-indent))) | |
436 (elt state 1) | |
437 )))) | |
438 | |
439 (defun lisp-indent-do (path state indent-point sexp-column normal-indent) | |
440 (if (>= (car path) 3) | |
441 (let ((lisp-tag-body-indentation lisp-body-indent)) | |
442 (funcall (function lisp-indent-tagbody) | |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
443 path state indent-point sexp-column normal-indent)) |
257 | 444 (funcall (function lisp-indent-259) |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
445 '((&whole nil &rest |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
446 ;; the following causes weird indentation |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
447 ;;(&whole 1 1 2 nil) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
448 ) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
449 (&whole nil &rest 1)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
450 path state indent-point sexp-column normal-indent))) |
257 | 451 |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
452 |
40952
2ca1b56f3bb1
Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents:
38826
diff
changeset
|
453 (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
|
454 normal-indent) |
f2ff22369238
(lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37764
diff
changeset
|
455 "Indentation function defmethod." |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
456 (lisp-indent-259 (if (and (>= (car path) 3) |
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
457 (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
|
458 (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
|
459 (forward-char 1) |
4a78098c3bd7
(lisp-indent-defmethod): At first three elements, act like defun.
Richard M. Stallman <rms@gnu.org>
parents:
40952
diff
changeset
|
460 (forward-sexp 3) |
4a78098c3bd7
(lisp-indent-defmethod): At first three elements, act like defun.
Richard M. Stallman <rms@gnu.org>
parents:
40952
diff
changeset
|
461 (backward-sexp) |
56736
3b66605ad268
(lisp-indent-defmethod): Correct
Eli Zaretskii <eliz@gnu.org>
parents:
55636
diff
changeset
|
462 (looking-at ":\\|\\sw+"))) |
38826
f2ff22369238
(lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37764
diff
changeset
|
463 '(4 4 (&whole 4 &rest 4) &body) |
f2ff22369238
(lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37764
diff
changeset
|
464 (get 'defun 'common-lisp-indent-function)) |
f2ff22369238
(lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37764
diff
changeset
|
465 path state indent-point sexp-column normal-indent)) |
f2ff22369238
(lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37764
diff
changeset
|
466 |
f2ff22369238
(lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37764
diff
changeset
|
467 |
257 | 468 (defun lisp-indent-function-lambda-hack (path state indent-point |
469 sexp-column normal-indent) | |
470 ;; indent (function (lambda () <newline> <body-forms>)) kludgily. | |
471 (if (or (cdr path) ; wtf? | |
472 (> (car path) 3)) | |
473 ;; line up under previous body form | |
474 normal-indent | |
475 ;; line up under function rather than under lambda in order to | |
476 ;; conserve horizontal space. (Which is what #' is for.) | |
477 (condition-case () | |
478 (save-excursion | |
479 (backward-up-list 2) | |
480 (forward-char 1) | |
481 (if (looking-at "\\(lisp:+\\)?function\\(\\Sw\\|\\S_\\)") | |
482 (+ lisp-body-indent -1 (current-column)) | |
483 (+ sexp-column lisp-body-indent))) | |
484 (error (+ sexp-column lisp-body-indent))))) | |
485 | |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
486 |
257 | 487 |
488 (let ((l '((block 1) | |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
489 (case (4 &rest (&whole 2 &rest 1))) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
490 (ccase . case) (ecase . case) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
491 (typecase . case) (etypecase . case) (ctypecase . case) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
492 (catch 1) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
493 (cond (&rest (&whole 2 &rest 1))) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
494 (defvar (4 2 2)) |
30651
61c2f9fcb8f6
* emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents:
29797
diff
changeset
|
495 (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
|
496 (defconstant . defvar) |
27231
e9725bb98b6e
Add defclass, define-condition, defmethod, symbol-macrolet.
Dave Love <fx@gnu.org>
parents:
26047
diff
changeset
|
497 (defcustom (4 2 2 2)) |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
498 (defparameter . defvar) |
30651
61c2f9fcb8f6
* emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents:
29797
diff
changeset
|
499 (defconst . defcustom) |
61c2f9fcb8f6
* emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents:
29797
diff
changeset
|
500 (define-condition . defclass) |
42252
63b6d0453539
(define-modify-macro): Better indent spec.
Richard M. Stallman <rms@gnu.org>
parents:
41256
diff
changeset
|
501 (define-modify-macro (4 &lambda &body)) |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
502 (defsetf (4 &lambda 4 &body)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
503 (defun (4 &lambda &body)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
504 (define-setf-method . defun) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
505 (define-setf-expander . defun) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
506 (defmacro . defun) (defsubst . defun) (deftype . defun) |
38826
f2ff22369238
(lisp-indent-defmethod): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37764
diff
changeset
|
507 (defmethod lisp-indent-defmethod) |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
508 (defpackage (4 2)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
509 (defstruct ((&whole 4 &rest (&whole 2 &rest 1)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
510 &rest (&whole 2 &rest 1))) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
511 (destructuring-bind |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
512 ((&whole 6 &rest 1) 4 &body)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
513 (do lisp-indent-do) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
514 (do* . do) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
515 (dolist ((&whole 4 2 1) &body)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
516 (dotimes . dolist) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
517 (eval-when 1) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
518 (flet ((&whole 4 &rest (&whole 1 &lambda &body)) &body)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
519 (labels . flet) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
520 (macrolet . flet) |
40952
2ca1b56f3bb1
Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents:
38826
diff
changeset
|
521 (generic-flet . flet) (generic-labels . flet) |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
522 (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
|
523 (restart-case . handler-case) |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
524 ;; `else-body' style |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
525 (if (nil nil &body)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
526 ;; single-else style (then and else equally indented) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
527 (if (&rest nil)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
528 (lambda (&lambda &rest lisp-indent-function-lambda-hack)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
529 (let ((&whole 4 &rest (&whole 1 1 2)) &body)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
530 (let* . let) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
531 (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
|
532 (handler-bind . let) (restart-bind . let) |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
533 (locally 1) |
43859
e8da4031d520
(lisp-loop-keyword-indentation)
Gerd Moellmann <gerd@gnu.org>
parents:
42252
diff
changeset
|
534 ;(loop lisp-indent-loop) |
37764
b1fec0dc2aa1
(toplevel): indent the :method sub-form of `defgeneric' correctly.
Sam Steingold <sds@gnu.org>
parents:
37389
diff
changeset
|
535 (:method (&lambda &body)) ; in `defgeneric' |
30651
61c2f9fcb8f6
* emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents:
29797
diff
changeset
|
536 (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
|
537 (multiple-value-call (4 &body)) |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
538 (multiple-value-prog1 1) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
539 (multiple-value-setq (4 2)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
540 (multiple-value-setf . multiple-value-setq) |
27872
277f4365f2fa
Indent `pprint-logical-block' properly.
Gerd Moellmann <gerd@gnu.org>
parents:
27802
diff
changeset
|
541 (pprint-logical-block (4 2)) |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
542 (print-unreadable-object ((&whole 4 1 &rest 1) &body)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
543 ;; Combines the worst features of BLOCK, LET and TAGBODY |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
544 (prog (&lambda &rest lisp-indent-tagbody)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
545 (prog* . prog) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
546 (prog1 1) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
547 (prog2 2) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
548 (progn 0) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
549 (progv (4 4 &body)) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
550 (return 0) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
551 (return-from (nil &body)) |
50700
ad311d8949c4
`symbol-macrolet' is similar to `let', not `multiple-value-bind'.
Sam Steingold <sds@gnu.org>
parents:
49598
diff
changeset
|
552 (symbol-macrolet . let) |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
553 (tagbody lisp-indent-tagbody) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
554 (throw 1) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
555 (unless 1) |
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
556 (unwind-protect (5 &body)) |
22180
485917486caf
Indent `with-standard-io-syntax' correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21750
diff
changeset
|
557 (when 1) |
40952
2ca1b56f3bb1
Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents:
38826
diff
changeset
|
558 (with-accessors . multiple-value-bind) |
2ca1b56f3bb1
Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents:
38826
diff
changeset
|
559 (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
|
560 (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
|
561 (with-slots . multiple-value-bind) |
22180
485917486caf
Indent `with-standard-io-syntax' correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21750
diff
changeset
|
562 (with-standard-io-syntax (2))))) |
40952
2ca1b56f3bb1
Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents:
38826
diff
changeset
|
563 (dolist (el l) |
2ca1b56f3bb1
Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents:
38826
diff
changeset
|
564 (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
|
565 (if (symbolp (cdr el)) |
2ca1b56f3bb1
Indent properly `generic-flet', `generic-labels', `with-accessors',
Sam Steingold <sds@gnu.org>
parents:
38826
diff
changeset
|
566 (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
|
567 (car (cdr el)))))) |
257 | 568 |
569 | |
570 ;(defun foo (x) | |
571 ; (tagbody | |
572 ; foo | |
573 ; (bar) | |
574 ; baz | |
575 ; (when (losing) | |
576 ; (with-big-loser | |
577 ; (yow) | |
578 ; ((lambda () | |
579 ; foo) | |
580 ; big))) | |
581 ; (flet ((foo (bar baz zap) | |
582 ; (zip)) | |
583 ; (zot () | |
584 ; quux)) | |
585 ; (do () | |
586 ; ((lose) | |
587 ; (foo 1)) | |
588 ; (quux) | |
589 ; foo | |
590 ; (lose)) | |
591 ; (cond ((x) | |
592 ; (win 1 2 | |
593 ; (foo))) | |
594 ; (t | |
595 ; (lose | |
596 ; 3)))))) | |
29797
3bf98b923af0
handle print-unreadable-object
Sam Steingold <sds@gnu.org>
parents:
27872
diff
changeset
|
597 |
257 | 598 |
599 ;(put 'while 'common-lisp-indent-function 1) | |
600 ;(put 'defwrapper'common-lisp-indent-function ...) | |
601 ;(put 'def 'common-lisp-indent-function ...) | |
602 ;(put 'defflavor 'common-lisp-indent-function ...) | |
603 ;(put 'defsubst 'common-lisp-indent-function ...) | |
604 | |
605 ;(put 'with-restart 'common-lisp-indent-function '((1 4 ((* 1))) (2 &body))) | |
606 ;(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
|
607 ;(put 'define-condition 'common-lisp-indent-function '((1 6) (2 6 ((&whole 1))) (3 4 ((&whole 1))) (4 &body))) |
257 | 608 ;(put 'with-condition-handler 'common-lisp-indent-function '((1 4 ((* 1))) (2 &body))) |
609 ;(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
|
610 ;(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
|
611 ;(put 'defgeneric 'common-lisp-indent-function 'defun) |
257 | 612 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79704
diff
changeset
|
613 ;; arch-tag: 7914d50f-92ec-4476-93fc-0f043a380e03 |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
257
diff
changeset
|
614 ;;; cl-indent.el ends here |