Mercurial > emacs
annotate lisp/emacs-lisp/lisp-mode.el @ 19851:092b99255bcd
(lisp-imenu-generic-expression): Recognize`defcustom' and `defgroup".
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 09 Sep 1997 19:54:18 +0000 |
parents | 6cb3ebfb6bc8 |
children | cc417f06a333 |
rev | line source |
---|---|
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
1 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands. |
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
2 |
14734 | 3 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
811
diff
changeset
|
4 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
727
diff
changeset
|
5 ;; Maintainer: FSF |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
6 ;; Keywords: lisp, languages |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
727
diff
changeset
|
7 |
213 | 8 ;; This file is part of GNU Emacs. |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; 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:
727
diff
changeset
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
213 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
23 ;; Boston, MA 02111-1307, USA. | |
213 | 24 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
25 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
26 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
27 ;; The base major mode for editing Lisp code (used also for Emacs Lisp). |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
28 ;; This mode is documented in the Emacs manual |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
29 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
30 ;;; Code: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
31 |
213 | 32 (defvar lisp-mode-syntax-table nil "") |
33 (defvar emacs-lisp-mode-syntax-table nil "") | |
34 (defvar lisp-mode-abbrev-table nil "") | |
35 | |
36 (if (not emacs-lisp-mode-syntax-table) | |
37 (let ((i 0)) | |
38 (setq emacs-lisp-mode-syntax-table (make-syntax-table)) | |
39 (while (< i ?0) | |
40 (modify-syntax-entry i "_ " emacs-lisp-mode-syntax-table) | |
41 (setq i (1+ i))) | |
42 (setq i (1+ ?9)) | |
43 (while (< i ?A) | |
44 (modify-syntax-entry i "_ " emacs-lisp-mode-syntax-table) | |
45 (setq i (1+ i))) | |
46 (setq i (1+ ?Z)) | |
47 (while (< i ?a) | |
48 (modify-syntax-entry i "_ " emacs-lisp-mode-syntax-table) | |
49 (setq i (1+ i))) | |
50 (setq i (1+ ?z)) | |
51 (while (< i 128) | |
52 (modify-syntax-entry i "_ " emacs-lisp-mode-syntax-table) | |
53 (setq i (1+ i))) | |
54 (modify-syntax-entry ? " " emacs-lisp-mode-syntax-table) | |
55 (modify-syntax-entry ?\t " " emacs-lisp-mode-syntax-table) | |
19559
6cb3ebfb6bc8
(emacs-lisp-mode-syntax-table): Give formfeed whitespace syntax.
Richard M. Stallman <rms@gnu.org>
parents:
19057
diff
changeset
|
56 (modify-syntax-entry ?\f " " emacs-lisp-mode-syntax-table) |
213 | 57 (modify-syntax-entry ?\n "> " emacs-lisp-mode-syntax-table) |
8325
2c8b3c988b10
(emacs-lisp-mode-syntax-table): Give RET the same syntax as newline.
Richard M. Stallman <rms@gnu.org>
parents:
7301
diff
changeset
|
58 ;; Give CR the same syntax as newline, for selective-display. |
2c8b3c988b10
(emacs-lisp-mode-syntax-table): Give RET the same syntax as newline.
Richard M. Stallman <rms@gnu.org>
parents:
7301
diff
changeset
|
59 (modify-syntax-entry ?\^m "> " emacs-lisp-mode-syntax-table) |
213 | 60 (modify-syntax-entry ?\; "< " emacs-lisp-mode-syntax-table) |
61 (modify-syntax-entry ?` "' " emacs-lisp-mode-syntax-table) | |
62 (modify-syntax-entry ?' "' " emacs-lisp-mode-syntax-table) | |
63 (modify-syntax-entry ?, "' " emacs-lisp-mode-syntax-table) | |
64 ;; Used to be singlequote; changed for flonums. | |
65 (modify-syntax-entry ?. "_ " emacs-lisp-mode-syntax-table) | |
66 (modify-syntax-entry ?# "' " emacs-lisp-mode-syntax-table) | |
67 (modify-syntax-entry ?\" "\" " emacs-lisp-mode-syntax-table) | |
68 (modify-syntax-entry ?\\ "\\ " emacs-lisp-mode-syntax-table) | |
69 (modify-syntax-entry ?\( "() " emacs-lisp-mode-syntax-table) | |
70 (modify-syntax-entry ?\) ")( " emacs-lisp-mode-syntax-table) | |
71 (modify-syntax-entry ?\[ "(] " emacs-lisp-mode-syntax-table) | |
72 (modify-syntax-entry ?\] ")[ " emacs-lisp-mode-syntax-table))) | |
73 | |
285 | 74 (if (not lisp-mode-syntax-table) |
75 (progn (setq lisp-mode-syntax-table | |
76 (copy-syntax-table emacs-lisp-mode-syntax-table)) | |
77 (modify-syntax-entry ?\| "\" " lisp-mode-syntax-table) | |
78 (modify-syntax-entry ?\[ "_ " lisp-mode-syntax-table) | |
79 (modify-syntax-entry ?\] "_ " lisp-mode-syntax-table))) | |
80 | |
213 | 81 (define-abbrev-table 'lisp-mode-abbrev-table ()) |
82 | |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
83 (defvar lisp-imenu-generic-expression |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
84 '( |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
85 (nil |
17144
1b3723c744f5
(lisp-imenu-generic-expression): Accept `*', `|',
Karl Heuer <kwzh@gnu.org>
parents:
17066
diff
changeset
|
86 "^\\s-*(def\\(un\\|subst\\|macro\\|advice\\)\\s-+\\([-A-Za-z0-9+*|:]+\\)" 2) |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
87 ("Variables" |
19851
092b99255bcd
(lisp-imenu-generic-expression): Recognize`defcustom' and `defgroup".
Richard M. Stallman <rms@gnu.org>
parents:
19559
diff
changeset
|
88 "^\\s-*(def\\(var\\|const\\|custom\\)\\s-+\\([-A-Za-z0-9+*|:]+\\)" 2) |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
89 ("Types" |
19851
092b99255bcd
(lisp-imenu-generic-expression): Recognize`defcustom' and `defgroup".
Richard M. Stallman <rms@gnu.org>
parents:
19559
diff
changeset
|
90 "^\\s-*(def\\(group\\|type\\|struct\\|class\\|ine-condition\\)\\s-+\\([-A-Za-z0-9+*|:]+\\)" |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
91 2)) |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
92 |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
93 "Imenu generic expression for Lisp mode. See `imenu-generic-expression'.") |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
94 |
213 | 95 (defun lisp-mode-variables (lisp-syntax) |
96 (cond (lisp-syntax | |
97 (set-syntax-table lisp-mode-syntax-table))) | |
98 (setq local-abbrev-table lisp-mode-abbrev-table) | |
99 (make-local-variable 'paragraph-start) | |
13504
1319330ca7ff
(lisp-mode-variables, lisp-fill-paragraph): Remove
Richard M. Stallman <rms@gnu.org>
parents:
12701
diff
changeset
|
100 (setq paragraph-start (concat page-delimiter "\\|$" )) |
213 | 101 (make-local-variable 'paragraph-separate) |
102 (setq paragraph-separate paragraph-start) | |
103 (make-local-variable 'paragraph-ignore-fill-prefix) | |
104 (setq paragraph-ignore-fill-prefix t) | |
10628
04591bafb562
(shared-lisp-mode-map): Don't bind M-q.
Richard M. Stallman <rms@gnu.org>
parents:
10594
diff
changeset
|
105 (make-local-variable 'fill-paragraph-function) |
04591bafb562
(shared-lisp-mode-map): Don't bind M-q.
Richard M. Stallman <rms@gnu.org>
parents:
10594
diff
changeset
|
106 (setq fill-paragraph-function 'lisp-fill-paragraph) |
14495
fc4be3d538e0
(lisp-mode-variables): Locally clear adaptive-fill-mode.
Richard M. Stallman <rms@gnu.org>
parents:
14379
diff
changeset
|
107 ;; Adaptive fill mode gets in the way of auto-fill, |
fc4be3d538e0
(lisp-mode-variables): Locally clear adaptive-fill-mode.
Richard M. Stallman <rms@gnu.org>
parents:
14379
diff
changeset
|
108 ;; and should make no difference for explicit fill |
fc4be3d538e0
(lisp-mode-variables): Locally clear adaptive-fill-mode.
Richard M. Stallman <rms@gnu.org>
parents:
14379
diff
changeset
|
109 ;; because lisp-fill-paragraph should do the job. |
fc4be3d538e0
(lisp-mode-variables): Locally clear adaptive-fill-mode.
Richard M. Stallman <rms@gnu.org>
parents:
14379
diff
changeset
|
110 (make-local-variable 'adaptive-fill-mode) |
fc4be3d538e0
(lisp-mode-variables): Locally clear adaptive-fill-mode.
Richard M. Stallman <rms@gnu.org>
parents:
14379
diff
changeset
|
111 (setq adaptive-fill-mode nil) |
213 | 112 (make-local-variable 'indent-line-function) |
113 (setq indent-line-function 'lisp-indent-line) | |
114 (make-local-variable 'indent-region-function) | |
115 (setq indent-region-function 'lisp-indent-region) | |
116 (make-local-variable 'parse-sexp-ignore-comments) | |
117 (setq parse-sexp-ignore-comments t) | |
6076
4f76564fc2cd
(lisp-mode-variables): Set outline-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
5103
diff
changeset
|
118 (make-local-variable 'outline-regexp) |
7301
edad1db699ab
(lisp-mode-variables): Added missing backslash to outline-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
7170
diff
changeset
|
119 (setq outline-regexp ";;; \\|(....") |
213 | 120 (make-local-variable 'comment-start) |
121 (setq comment-start ";") | |
122 (make-local-variable 'comment-start-skip) | |
15597
ca84d7021f4e
(lisp-mode-variables): Set comment-start-skip to ignore backslash-quoted
Miles Bader <miles@gnu.org>
parents:
14817
diff
changeset
|
123 ;; Look within the line for a ; following an even number of backslashes |
ca84d7021f4e
(lisp-mode-variables): Set comment-start-skip to ignore backslash-quoted
Miles Bader <miles@gnu.org>
parents:
14817
diff
changeset
|
124 ;; after either a non-backslash or the line beginning. |
ca84d7021f4e
(lisp-mode-variables): Set comment-start-skip to ignore backslash-quoted
Miles Bader <miles@gnu.org>
parents:
14817
diff
changeset
|
125 (setq comment-start-skip "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *") |
213 | 126 (make-local-variable 'comment-column) |
127 (setq comment-column 40) | |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
128 (make-local-variable 'comment-indent-function) |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
129 (setq comment-indent-function 'lisp-comment-indent) |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
130 (make-local-variable 'imenu-generic-expression) |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
131 (setq imenu-generic-expression lisp-imenu-generic-expression)) |
213 | 132 |
133 (defvar shared-lisp-mode-map () | |
134 "Keymap for commands shared by all sorts of Lisp modes.") | |
135 | |
136 (if shared-lisp-mode-map | |
137 () | |
138 (setq shared-lisp-mode-map (make-sparse-keymap)) | |
139 (define-key shared-lisp-mode-map "\e\C-q" 'indent-sexp) | |
12682
66b3d052d4fe
(shared-lisp-mode-map): Don't bind TAB, just set indent-line-function.
Richard M. Stallman <rms@gnu.org>
parents:
12352
diff
changeset
|
140 (define-key shared-lisp-mode-map "\177" 'backward-delete-char-untabify)) |
213 | 141 |
142 (defvar emacs-lisp-mode-map () | |
143 "Keymap for Emacs Lisp mode. | |
12682
66b3d052d4fe
(shared-lisp-mode-map): Don't bind TAB, just set indent-line-function.
Richard M. Stallman <rms@gnu.org>
parents:
12352
diff
changeset
|
144 All commands in `shared-lisp-mode-map' are inherited by this map.") |
213 | 145 |
146 (if emacs-lisp-mode-map | |
147 () | |
12035
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
148 (let ((map (make-sparse-keymap "Emacs-Lisp"))) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
149 (setq emacs-lisp-mode-map |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
150 (nconc (make-sparse-keymap) shared-lisp-mode-map)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
151 (define-key emacs-lisp-mode-map "\e\t" 'lisp-complete-symbol) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
152 (define-key emacs-lisp-mode-map "\e\C-x" 'eval-defun) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
153 (define-key emacs-lisp-mode-map [menu-bar] (make-sparse-keymap)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
154 (define-key emacs-lisp-mode-map [menu-bar emacs-lisp] |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
155 (cons "Emacs-Lisp" map)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
156 (define-key map [edebug-defun] |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
157 '("Instrument Function for Debugging" . edebug-defun)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
158 (define-key map [byte-recompile] |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
159 '("Byte-recompile Directory..." . byte-recompile-directory)) |
14290
fc9c72889fec
(emacs-lisp-mode-map): Avoid duplicate in menu bindings.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
160 (define-key map [emacs-byte-compile-and-load] |
14719
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
161 '("Byte-compile And Load" . emacs-lisp-byte-compile-and-load)) |
14116
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
162 (define-key map [byte-compile] |
12035
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
163 '("Byte-compile This File" . emacs-lisp-byte-compile)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
164 (define-key map [separator-eval] '("--")) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
165 (define-key map [eval-buffer] '("Evaluate Buffer" . eval-current-buffer)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
166 (define-key map [eval-region] '("Evaluate Region" . eval-region)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
167 (define-key map [eval-sexp] '("Evaluate Last S-expression" . eval-last-sexp)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
168 (define-key map [separator-format] '("--")) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
169 (define-key map [comment-region] '("Comment Out Region" . comment-region)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
170 (define-key map [indent-region] '("Indent Region" . indent-region)) |
12218
a4f383dd5adb
Put mark-active for menu-enable property on eval-region, comment-region, and indent-region symbols.
Simon Marshall <simon@gnu.org>
parents:
12035
diff
changeset
|
171 (define-key map [indent-line] '("Indent Line" . lisp-indent-line)) |
a4f383dd5adb
Put mark-active for menu-enable property on eval-region, comment-region, and indent-region symbols.
Simon Marshall <simon@gnu.org>
parents:
12035
diff
changeset
|
172 (put 'eval-region 'menu-enable 'mark-active) |
a4f383dd5adb
Put mark-active for menu-enable property on eval-region, comment-region, and indent-region symbols.
Simon Marshall <simon@gnu.org>
parents:
12035
diff
changeset
|
173 (put 'comment-region 'menu-enable 'mark-active) |
a4f383dd5adb
Put mark-active for menu-enable property on eval-region, comment-region, and indent-region symbols.
Simon Marshall <simon@gnu.org>
parents:
12035
diff
changeset
|
174 (put 'indent-region 'menu-enable 'mark-active))) |
12035
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
175 |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
176 (defun emacs-lisp-byte-compile () |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
177 "Byte compile the file containing the current buffer." |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
178 (interactive) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
179 (if buffer-file-name |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
180 (byte-compile-file buffer-file-name) |
14116
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
181 (error "The buffer must be saved in a file first"))) |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
182 |
14719
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
183 (defun emacs-lisp-byte-compile-and-load () |
14116
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
184 "Byte-compile the current file (if it has changed), then load compiled code." |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
185 (interactive) |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
186 (or buffer-file-name |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
187 (error "The buffer must be saved in a file first")) |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
188 (require 'bytecomp) |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
189 ;; Recompile if file or buffer has changed since last compilation. |
14719
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
190 (if (and (buffer-modified-p) |
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
191 (y-or-n-p (format "save buffer %s first? " (buffer-name)))) |
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
192 (save-buffer)) |
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
193 (let ((compiled-file-name (byte-compile-dest-file buffer-file-name))) |
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
194 (if (file-newer-than-file-p compiled-file-name buffer-file-name) |
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
195 (load-file compiled-file-name) |
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
196 (byte-compile-file buffer-file-name t)))) |
213 | 197 |
198 (defun emacs-lisp-mode () | |
199 "Major mode for editing Lisp code to run in Emacs. | |
200 Commands: | |
201 Delete converts tabs to spaces as it moves back. | |
202 Blank lines separate paragraphs. Semicolons start comments. | |
203 \\{emacs-lisp-mode-map} | |
204 Entry to this mode calls the value of `emacs-lisp-mode-hook' | |
205 if that value is non-nil." | |
206 (interactive) | |
207 (kill-all-local-variables) | |
208 (use-local-map emacs-lisp-mode-map) | |
209 (set-syntax-table emacs-lisp-mode-syntax-table) | |
210 (setq major-mode 'emacs-lisp-mode) | |
211 (setq mode-name "Emacs-Lisp") | |
212 (lisp-mode-variables nil) | |
213 (run-hooks 'emacs-lisp-mode-hook)) | |
214 | |
215 (defvar lisp-mode-map () | |
216 "Keymap for ordinary Lisp mode. | |
217 All commands in `shared-lisp-mode-map' are inherited by this map.") | |
218 | |
219 (if lisp-mode-map | |
220 () | |
221 (setq lisp-mode-map | |
222 (nconc (make-sparse-keymap) shared-lisp-mode-map)) | |
5103
40b068fb4c37
(lisp-eval-defun): Renamed from lisp-send-defun.
Richard M. Stallman <rms@gnu.org>
parents:
3638
diff
changeset
|
223 (define-key lisp-mode-map "\e\C-x" 'lisp-eval-defun) |
40b068fb4c37
(lisp-eval-defun): Renamed from lisp-send-defun.
Richard M. Stallman <rms@gnu.org>
parents:
3638
diff
changeset
|
224 (define-key lisp-mode-map "\C-c\C-z" 'run-lisp)) |
213 | 225 |
226 (defun lisp-mode () | |
227 "Major mode for editing Lisp code for Lisps other than GNU Emacs Lisp. | |
228 Commands: | |
229 Delete converts tabs to spaces as it moves back. | |
230 Blank lines separate paragraphs. Semicolons start comments. | |
231 \\{lisp-mode-map} | |
232 Note that `run-lisp' may be used either to start an inferior Lisp job | |
233 or to switch back to an existing one. | |
234 | |
235 Entry to this mode calls the value of `lisp-mode-hook' | |
236 if that value is non-nil." | |
237 (interactive) | |
238 (kill-all-local-variables) | |
239 (use-local-map lisp-mode-map) | |
240 (setq major-mode 'lisp-mode) | |
241 (setq mode-name "Lisp") | |
242 (lisp-mode-variables t) | |
243 (set-syntax-table lisp-mode-syntax-table) | |
244 (run-hooks 'lisp-mode-hook)) | |
245 | |
246 ;; This will do unless shell.el is loaded. | |
5103
40b068fb4c37
(lisp-eval-defun): Renamed from lisp-send-defun.
Richard M. Stallman <rms@gnu.org>
parents:
3638
diff
changeset
|
247 (defun lisp-eval-defun nil |
213 | 248 "Send the current defun to the Lisp process made by \\[run-lisp]." |
249 (interactive) | |
250 (error "Process lisp does not exist")) | |
251 | |
252 (defvar lisp-interaction-mode-map () | |
253 "Keymap for Lisp Interaction moe. | |
254 All commands in `shared-lisp-mode-map' are inherited by this map.") | |
255 | |
256 (if lisp-interaction-mode-map | |
257 () | |
258 (setq lisp-interaction-mode-map | |
259 (nconc (make-sparse-keymap) shared-lisp-mode-map)) | |
260 (define-key lisp-interaction-mode-map "\e\C-x" 'eval-defun) | |
878
5b1c5b4286e7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
261 (define-key lisp-interaction-mode-map "\e\t" 'lisp-complete-symbol) |
213 | 262 (define-key lisp-interaction-mode-map "\n" 'eval-print-last-sexp)) |
263 | |
264 (defun lisp-interaction-mode () | |
265 "Major mode for typing and evaluating Lisp forms. | |
266 Like Lisp mode except that \\[eval-print-last-sexp] evals the Lisp expression | |
267 before point, and prints its value into the buffer, advancing point. | |
268 | |
269 Commands: | |
270 Delete converts tabs to spaces as it moves back. | |
271 Paragraphs are separated only by blank lines. | |
272 Semicolons start comments. | |
273 \\{lisp-interaction-mode-map} | |
274 Entry to this mode calls the value of `lisp-interaction-mode-hook' | |
275 if that value is non-nil." | |
276 (interactive) | |
277 (kill-all-local-variables) | |
278 (use-local-map lisp-interaction-mode-map) | |
279 (setq major-mode 'lisp-interaction-mode) | |
280 (setq mode-name "Lisp Interaction") | |
281 (set-syntax-table emacs-lisp-mode-syntax-table) | |
282 (lisp-mode-variables nil) | |
283 (run-hooks 'lisp-interaction-mode-hook)) | |
284 | |
248 | 285 (defun eval-print-last-sexp () |
213 | 286 "Evaluate sexp before point; print value into current buffer." |
248 | 287 (interactive) |
422 | 288 (let ((standard-output (current-buffer))) |
289 (terpri) | |
290 (eval-last-sexp t) | |
291 (terpri))) | |
213 | 292 |
2450
17d258d8e8e4
(eval-defun): Rename argument to avoid collision.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
293 (defun eval-last-sexp (eval-last-sexp-arg-internal) |
213 | 294 "Evaluate sexp before point; print value in minibuffer. |
295 With argument, print output into current buffer." | |
296 (interactive "P") | |
17066
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
297 (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t))) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
298 (prin1 (eval (let ((stab (syntax-table)) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
299 (opoint (point)) |
19057
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
300 ignore-quotes |
17066
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
301 expr) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
302 (unwind-protect |
249 | 303 (save-excursion |
304 (set-syntax-table emacs-lisp-mode-syntax-table) | |
19057
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
305 ;; If this sexp appears to be enclosed in `...' |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
306 ;; then ignore the surrounding quotes. |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
307 (setq ignore-quotes |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
308 (or (eq (following-char) ?\') |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
309 (eq (preceding-char) ?\'))) |
249 | 310 (forward-sexp -1) |
1163 | 311 (save-restriction |
19057
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
312 ;; vladimir@cs.ualberta.ca 30-Jul-1997: skip ` in |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
313 ;; `variable' so that the value is returned, not the |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
314 ;; name |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
315 (if (and ignore-quotes |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
316 (eq (following-char) ?`)) |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
317 (forward-char)) |
1163 | 318 (narrow-to-region (point-min) opoint) |
17066
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
319 (setq expr (read (current-buffer))) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
320 ;; If it's an (interactive ...) form, it's more |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
321 ;; useful to show how an interactive call would |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
322 ;; use it. |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
323 (and (consp expr) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
324 (eq (car expr) 'interactive) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
325 (setq expr |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
326 (list 'call-interactively |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
327 (list 'quote |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
328 (list 'lambda |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
329 '(&rest args) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
330 expr |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
331 'args))))) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
332 expr)) |
249 | 333 (set-syntax-table stab))))))) |
213 | 334 |
2450
17d258d8e8e4
(eval-defun): Rename argument to avoid collision.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
335 (defun eval-defun (eval-defun-arg-internal) |
248 | 336 "Evaluate defun that point is in or before. |
337 Print value in minibuffer. | |
338 With argument, insert value in current buffer after the defun." | |
213 | 339 (interactive "P") |
10968
bea3ee51b843
(eval-defun): Convert defvar to defconst.
Richard M. Stallman <rms@gnu.org>
parents:
10629
diff
changeset
|
340 (let ((standard-output (if eval-defun-arg-internal (current-buffer) t)) |
bea3ee51b843
(eval-defun): Convert defvar to defconst.
Richard M. Stallman <rms@gnu.org>
parents:
10629
diff
changeset
|
341 (form (save-excursion |
bea3ee51b843
(eval-defun): Convert defvar to defconst.
Richard M. Stallman <rms@gnu.org>
parents:
10629
diff
changeset
|
342 (end-of-defun) |
bea3ee51b843
(eval-defun): Convert defvar to defconst.
Richard M. Stallman <rms@gnu.org>
parents:
10629
diff
changeset
|
343 (beginning-of-defun) |
bea3ee51b843
(eval-defun): Convert defvar to defconst.
Richard M. Stallman <rms@gnu.org>
parents:
10629
diff
changeset
|
344 (read (current-buffer))))) |
17353
71db8e3ee12f
(eval-defun): For defcustom, always set the value.
Richard M. Stallman <rms@gnu.org>
parents:
17308
diff
changeset
|
345 (cond ((and (eq (car form) 'defvar) |
71db8e3ee12f
(eval-defun): For defcustom, always set the value.
Richard M. Stallman <rms@gnu.org>
parents:
17308
diff
changeset
|
346 (cdr-safe (cdr-safe form))) |
71db8e3ee12f
(eval-defun): For defcustom, always set the value.
Richard M. Stallman <rms@gnu.org>
parents:
17308
diff
changeset
|
347 ;; Force variable to be bound. |
71db8e3ee12f
(eval-defun): For defcustom, always set the value.
Richard M. Stallman <rms@gnu.org>
parents:
17308
diff
changeset
|
348 (setq form (cons 'defconst (cdr form)))) |
71db8e3ee12f
(eval-defun): For defcustom, always set the value.
Richard M. Stallman <rms@gnu.org>
parents:
17308
diff
changeset
|
349 ((and (eq (car form) 'defcustom) |
71db8e3ee12f
(eval-defun): For defcustom, always set the value.
Richard M. Stallman <rms@gnu.org>
parents:
17308
diff
changeset
|
350 (default-boundp (nth 1 form))) |
71db8e3ee12f
(eval-defun): For defcustom, always set the value.
Richard M. Stallman <rms@gnu.org>
parents:
17308
diff
changeset
|
351 ;; Force variable to be bound. |
71db8e3ee12f
(eval-defun): For defcustom, always set the value.
Richard M. Stallman <rms@gnu.org>
parents:
17308
diff
changeset
|
352 (set-default (nth 1 form) (eval (nth 2 form))))) |
10968
bea3ee51b843
(eval-defun): Convert defvar to defconst.
Richard M. Stallman <rms@gnu.org>
parents:
10629
diff
changeset
|
353 (prin1 (eval form)))) |
213 | 354 |
355 (defun lisp-comment-indent () | |
356 (if (looking-at "\\s<\\s<\\s<") | |
357 (current-column) | |
358 (if (looking-at "\\s<\\s<") | |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
359 (let ((tem (or (calculate-lisp-indent) (current-column)))) |
213 | 360 (if (listp tem) (car tem) tem)) |
361 (skip-chars-backward " \t") | |
362 (max (if (bolp) 0 (1+ (current-column))) | |
363 comment-column)))) | |
364 | |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16563
diff
changeset
|
365 (defvar lisp-indent-offset nil "") |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16563
diff
changeset
|
366 (defvar lisp-indent-function 'lisp-indent-function "") |
213 | 367 |
368 (defun lisp-indent-line (&optional whole-exp) | |
369 "Indent current line as Lisp code. | |
370 With argument, indent any additional lines of the same expression | |
371 rigidly along with this one." | |
372 (interactive "P") | |
373 (let ((indent (calculate-lisp-indent)) shift-amt beg end | |
374 (pos (- (point-max) (point)))) | |
375 (beginning-of-line) | |
376 (setq beg (point)) | |
377 (skip-chars-forward " \t") | |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
378 (if (or (null indent) (looking-at "\\s<\\s<\\s<")) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
379 ;; Don't alter indentation of a ;;; comment line |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
380 ;; or a line that starts in a string. |
677
7a9b4ea68565
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
659
diff
changeset
|
381 (goto-char (- (point-max) pos)) |
213 | 382 (if (and (looking-at "\\s<") (not (looking-at "\\s<\\s<"))) |
383 ;; Single-semicolon comment lines should be indented | |
384 ;; as comment lines, not as code. | |
385 (progn (indent-for-comment) (forward-char -1)) | |
386 (if (listp indent) (setq indent (car indent))) | |
387 (setq shift-amt (- indent (current-column))) | |
388 (if (zerop shift-amt) | |
389 nil | |
390 (delete-region beg (point)) | |
391 (indent-to indent))) | |
392 ;; If initial point was within line's indentation, | |
393 ;; position after the indentation. Else stay at same point in text. | |
394 (if (> (- (point-max) pos) (point)) | |
395 (goto-char (- (point-max) pos))) | |
396 ;; If desired, shift remaining lines of expression the same amount. | |
397 (and whole-exp (not (zerop shift-amt)) | |
398 (save-excursion | |
399 (goto-char beg) | |
400 (forward-sexp 1) | |
401 (setq end (point)) | |
402 (goto-char beg) | |
403 (forward-line 1) | |
404 (setq beg (point)) | |
405 (> end beg)) | |
406 (indent-code-rigidly beg end shift-amt))))) | |
407 | |
9424
738999b0296f
Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9423
diff
changeset
|
408 (defvar calculate-lisp-indent-last-sexp) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
409 |
213 | 410 (defun calculate-lisp-indent (&optional parse-start) |
411 "Return appropriate indentation for current line as Lisp code. | |
412 In usual case returns an integer: the column to indent to. | |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
413 If the value is nil, that means don't change the indentation |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
414 because the line starts inside a string. |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
415 |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
416 The value can also be a list of the form (COLUMN CONTAINING-SEXP-START). |
213 | 417 This means that following lines at the same level of indentation |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
418 should not necessarily be indented the same as this line. |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
419 Then COLUMN is the column to indent to, and CONTAINING-SEXP-START |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
420 is the buffer position of the start of the containing expression." |
213 | 421 (save-excursion |
422 (beginning-of-line) | |
423 (let ((indent-point (point)) | |
424 state paren-depth | |
425 ;; setting this to a number inhibits calling hook | |
426 (desired-indent nil) | |
427 (retry t) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
428 calculate-lisp-indent-last-sexp containing-sexp) |
213 | 429 (if parse-start |
430 (goto-char parse-start) | |
431 (beginning-of-defun)) | |
432 ;; Find outermost containing sexp | |
433 (while (< (point) indent-point) | |
434 (setq state (parse-partial-sexp (point) indent-point 0))) | |
435 ;; Find innermost containing sexp | |
436 (while (and retry | |
437 state | |
438 (> (setq paren-depth (elt state 0)) 0)) | |
439 (setq retry nil) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
440 (setq calculate-lisp-indent-last-sexp (elt state 2)) |
213 | 441 (setq containing-sexp (elt state 1)) |
442 ;; Position following last unclosed open. | |
443 (goto-char (1+ containing-sexp)) | |
444 ;; Is there a complete sexp since then? | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
445 (if (and calculate-lisp-indent-last-sexp |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
446 (> calculate-lisp-indent-last-sexp (point))) |
213 | 447 ;; Yes, but is there a containing sexp after that? |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
448 (let ((peek (parse-partial-sexp calculate-lisp-indent-last-sexp |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
449 indent-point 0))) |
213 | 450 (if (setq retry (car (cdr peek))) (setq state peek))))) |
451 (if retry | |
452 nil | |
453 ;; Innermost containing sexp found | |
454 (goto-char (1+ containing-sexp)) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
455 (if (not calculate-lisp-indent-last-sexp) |
213 | 456 ;; indent-point immediately follows open paren. |
457 ;; Don't call hook. | |
458 (setq desired-indent (current-column)) | |
459 ;; Find the start of first element of containing sexp. | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
460 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) |
213 | 461 (cond ((looking-at "\\s(") |
462 ;; First element of containing sexp is a list. | |
463 ;; Indent under that list. | |
464 ) | |
465 ((> (save-excursion (forward-line 1) (point)) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
466 calculate-lisp-indent-last-sexp) |
213 | 467 ;; This is the first line to start within the containing sexp. |
468 ;; It's almost certainly a function call. | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
469 (if (= (point) calculate-lisp-indent-last-sexp) |
213 | 470 ;; Containing sexp has nothing before this line |
471 ;; except the first element. Indent under that element. | |
472 nil | |
473 ;; Skip the first element, find start of second (the first | |
474 ;; argument of the function call) and indent under. | |
475 (progn (forward-sexp 1) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
476 (parse-partial-sexp (point) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
477 calculate-lisp-indent-last-sexp |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
478 0 t))) |
213 | 479 (backward-prefix-chars)) |
480 (t | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
481 ;; Indent beneath first sexp on same line as |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
482 ;; calculate-lisp-indent-last-sexp. Again, it's |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
483 ;; almost certainly a function call. |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
484 (goto-char calculate-lisp-indent-last-sexp) |
213 | 485 (beginning-of-line) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
486 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
487 0 t) |
213 | 488 (backward-prefix-chars))))) |
489 ;; Point is at the point to indent under unless we are inside a string. | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3241
diff
changeset
|
490 ;; Call indentation hook except when overridden by lisp-indent-offset |
213 | 491 ;; or if the desired indentation has already been computed. |
492 (let ((normal-indent (current-column))) | |
493 (cond ((elt state 3) | |
494 ;; Inside a string, don't change indentation. | |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
495 nil) |
213 | 496 ((and (integerp lisp-indent-offset) containing-sexp) |
497 ;; Indent by constant offset | |
498 (goto-char containing-sexp) | |
499 (+ (current-column) lisp-indent-offset)) | |
500 (desired-indent) | |
501 ((and (boundp 'lisp-indent-function) | |
502 lisp-indent-function | |
503 (not retry)) | |
504 (or (funcall lisp-indent-function indent-point state) | |
505 normal-indent)) | |
506 (t | |
214 | 507 normal-indent)))))) |
213 | 508 |
509 (defun lisp-indent-function (indent-point state) | |
510 (let ((normal-indent (current-column))) | |
511 (goto-char (1+ (elt state 1))) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
512 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) |
213 | 513 (if (and (elt state 2) |
514 (not (looking-at "\\sw\\|\\s_"))) | |
515 ;; car of form doesn't seem to be a a symbol | |
516 (progn | |
517 (if (not (> (save-excursion (forward-line 1) (point)) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
518 calculate-lisp-indent-last-sexp)) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
519 (progn (goto-char calculate-lisp-indent-last-sexp) |
213 | 520 (beginning-of-line) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
521 (parse-partial-sexp (point) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
522 calculate-lisp-indent-last-sexp 0 t))) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
523 ;; Indent under the list or under the first sexp on the same |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
524 ;; line as calculate-lisp-indent-last-sexp. Note that first |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
525 ;; thing on that line has to be complete sexp since we are |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
526 ;; inside the innermost containing sexp. |
213 | 527 (backward-prefix-chars) |
528 (current-column)) | |
529 (let ((function (buffer-substring (point) | |
530 (progn (forward-sexp 1) (point)))) | |
531 method) | |
3638
45169f86d3a4
(lisp-indent-function): Look for either
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
532 (setq method (or (get (intern-soft function) 'lisp-indent-function) |
45169f86d3a4
(lisp-indent-function): Look for either
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
533 (get (intern-soft function) 'lisp-indent-hook))) |
213 | 534 (cond ((or (eq method 'defun) |
535 (and (null method) | |
536 (> (length function) 3) | |
537 (string-match "\\`def" function))) | |
538 (lisp-indent-defform state indent-point)) | |
539 ((integerp method) | |
540 (lisp-indent-specform method state | |
541 indent-point normal-indent)) | |
542 (method | |
543 (funcall method state indent-point))))))) | |
544 | |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16563
diff
changeset
|
545 (defvar lisp-body-indent 2 |
2933
420dfaaacfc5
(lisp-body-indent): Add doc.
Richard M. Stallman <rms@gnu.org>
parents:
2450
diff
changeset
|
546 "Number of columns to indent the second line of a `(def...)' form.") |
213 | 547 |
548 (defun lisp-indent-specform (count state indent-point normal-indent) | |
549 (let ((containing-form-start (elt state 1)) | |
550 (i count) | |
551 body-indent containing-form-column) | |
552 ;; Move to the start of containing form, calculate indentation | |
553 ;; to use for non-distinguished forms (> count), and move past the | |
554 ;; function symbol. lisp-indent-function guarantees that there is at | |
555 ;; least one word or symbol character following open paren of containing | |
556 ;; form. | |
557 (goto-char containing-form-start) | |
558 (setq containing-form-column (current-column)) | |
559 (setq body-indent (+ lisp-body-indent containing-form-column)) | |
560 (forward-char 1) | |
561 (forward-sexp 1) | |
562 ;; Now find the start of the last form. | |
563 (parse-partial-sexp (point) indent-point 1 t) | |
564 (while (and (< (point) indent-point) | |
565 (condition-case () | |
566 (progn | |
567 (setq count (1- count)) | |
568 (forward-sexp 1) | |
569 (parse-partial-sexp (point) indent-point 1 t)) | |
570 (error nil)))) | |
571 ;; Point is sitting on first character of last (or count) sexp. | |
572 (if (> count 0) | |
573 ;; A distinguished form. If it is the first or second form use double | |
574 ;; lisp-body-indent, else normal indent. With lisp-body-indent bound | |
575 ;; to 2 (the default), this just happens to work the same with if as | |
576 ;; the older code, but it makes unwind-protect, condition-case, | |
577 ;; with-output-to-temp-buffer, et. al. much more tasteful. The older, | |
578 ;; less hacked, behavior can be obtained by replacing below with | |
579 ;; (list normal-indent containing-form-start). | |
580 (if (<= (- i count) 1) | |
581 (list (+ containing-form-column (* 2 lisp-body-indent)) | |
582 containing-form-start) | |
583 (list normal-indent containing-form-start)) | |
584 ;; A non-distinguished form. Use body-indent if there are no | |
585 ;; distinguished forms and this is the first undistinguished form, | |
586 ;; or if this is the first undistinguished form and the preceding | |
587 ;; distinguished form has indentation at least as great as body-indent. | |
588 (if (or (and (= i 0) (= count 0)) | |
589 (and (= count 0) (<= body-indent normal-indent))) | |
590 body-indent | |
591 normal-indent)))) | |
592 | |
593 (defun lisp-indent-defform (state indent-point) | |
594 (goto-char (car (cdr state))) | |
595 (forward-line 1) | |
596 (if (> (point) (car (cdr (cdr state)))) | |
597 (progn | |
598 (goto-char (car (cdr state))) | |
599 (+ lisp-body-indent (current-column))))) | |
600 | |
601 | |
602 ;; (put 'progn 'lisp-indent-function 0), say, causes progn to be indented | |
603 ;; like defun if the first form is placed on the next line, otherwise | |
604 ;; it is indented like any other form (i.e. forms line up under first). | |
605 | |
606 (put 'lambda 'lisp-indent-function 'defun) | |
607 (put 'autoload 'lisp-indent-function 'defun) | |
608 (put 'progn 'lisp-indent-function 0) | |
609 (put 'prog1 'lisp-indent-function 1) | |
610 (put 'prog2 'lisp-indent-function 2) | |
611 (put 'save-excursion 'lisp-indent-function 0) | |
612 (put 'save-window-excursion 'lisp-indent-function 0) | |
12218
a4f383dd5adb
Put mark-active for menu-enable property on eval-region, comment-region, and indent-region symbols.
Simon Marshall <simon@gnu.org>
parents:
12035
diff
changeset
|
613 (put 'save-selected-window 'lisp-indent-function 0) |
213 | 614 (put 'save-restriction 'lisp-indent-function 0) |
1163 | 615 (put 'save-match-data 'lisp-indent-function 0) |
16354
b8f9fd9e47fa
(save-current-buffer, with-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
15597
diff
changeset
|
616 (put 'save-current-buffer 'lisp-indent-function 0) |
16406
da03658014e3
(with-current-buffer): Correct indentation property.
Erik Naggum <erik@naggum.no>
parents:
16381
diff
changeset
|
617 (put 'with-current-buffer 'lisp-indent-function 1) |
16563
41bbec0cc4c6
(combine-after-change-calls): The first form is not special.
Erik Naggum <erik@naggum.no>
parents:
16551
diff
changeset
|
618 (put 'combine-after-change-calls 'lisp-indent-function 0) |
16354
b8f9fd9e47fa
(save-current-buffer, with-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
15597
diff
changeset
|
619 (put 'with-output-to-string 'lisp-indent-function 0) |
16360
25f58ad01b11
(with-temp-file): Add lisp-indent-function property.
Richard M. Stallman <rms@gnu.org>
parents:
16354
diff
changeset
|
620 (put 'with-temp-file 'lisp-indent-function 1) |
16380
aee74c21dfee
(with-temp-buffer): Add indentation property.
Erik Naggum <erik@naggum.no>
parents:
16360
diff
changeset
|
621 (put 'with-temp-buffer 'lisp-indent-function 0) |
213 | 622 (put 'let 'lisp-indent-function 1) |
623 (put 'let* 'lisp-indent-function 1) | |
624 (put 'while 'lisp-indent-function 1) | |
625 (put 'if 'lisp-indent-function 2) | |
626 (put 'catch 'lisp-indent-function 1) | |
627 (put 'condition-case 'lisp-indent-function 2) | |
628 (put 'unwind-protect 'lisp-indent-function 1) | |
629 (put 'with-output-to-temp-buffer 'lisp-indent-function 1) | |
16381
badca394f979
(eval-after-load): Add lisp-indent-function for it.
Richard M. Stallman <rms@gnu.org>
parents:
16380
diff
changeset
|
630 (put 'eval-after-load 'lisp-indent-function 1) |
213 | 631 |
632 (defun indent-sexp (&optional endpos) | |
633 "Indent each line of the list starting just after point. | |
634 If optional arg ENDPOS is given, indent each line, stopping when | |
635 ENDPOS is encountered." | |
636 (interactive) | |
727 | 637 (let ((indent-stack (list nil)) |
638 (next-depth 0) | |
10594
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
639 ;; If ENDPOS is non-nil, use nil as STARTING-POINT |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
640 ;; so that calculate-lisp-indent will find the beginning of |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
641 ;; the defun we are in. |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
642 ;; If ENDPOS is nil, it is safe not to scan before point |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
643 ;; since every line we indent is more deeply nested than point is. |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
644 (starting-point (if endpos nil (point))) |
727 | 645 (last-point (point)) |
646 last-depth bol outer-loop-done inner-loop-done state this-indent) | |
10594
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
647 (or endpos |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
648 ;; Get error now if we don't have a complete sexp after point. |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
649 (save-excursion (forward-sexp 1))) |
213 | 650 (save-excursion |
651 (setq outer-loop-done nil) | |
652 (while (if endpos (< (point) endpos) | |
653 (not outer-loop-done)) | |
654 (setq last-depth next-depth | |
655 inner-loop-done nil) | |
656 ;; Parse this line so we can learn the state | |
657 ;; to indent the next line. | |
658 ;; This inner loop goes through only once | |
659 ;; unless a line ends inside a string. | |
660 (while (and (not inner-loop-done) | |
661 (not (setq outer-loop-done (eobp)))) | |
662 (setq state (parse-partial-sexp (point) (progn (end-of-line) (point)) | |
663 nil nil state)) | |
664 (setq next-depth (car state)) | |
665 ;; If the line contains a comment other than the sort | |
666 ;; that is indented like code, | |
667 ;; indent it now with indent-for-comment. | |
668 ;; Comments indented like code are right already. | |
669 ;; In any case clear the in-comment flag in the state | |
670 ;; because parse-partial-sexp never sees the newlines. | |
671 (if (car (nthcdr 4 state)) | |
672 (progn (indent-for-comment) | |
673 (end-of-line) | |
674 (setcar (nthcdr 4 state) nil))) | |
675 ;; If this line ends inside a string, | |
676 ;; go straight to next line, remaining within the inner loop, | |
677 ;; and turn off the \-flag. | |
678 (if (car (nthcdr 3 state)) | |
679 (progn | |
680 (forward-line 1) | |
681 (setcar (nthcdr 5 state) nil)) | |
682 (setq inner-loop-done t))) | |
683 (and endpos | |
727 | 684 (<= next-depth 0) |
685 (progn | |
686 (setq indent-stack (append indent-stack | |
687 (make-list (- next-depth) nil)) | |
688 last-depth (- last-depth next-depth) | |
689 next-depth 0))) | |
10594
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
690 (or outer-loop-done endpos |
213 | 691 (setq outer-loop-done (<= next-depth 0))) |
692 (if outer-loop-done | |
3241
6c9b5f6dca70
(indent-sexp): Even if outer-loop-done is t, still move down one line.
Richard M. Stallman <rms@gnu.org>
parents:
2933
diff
changeset
|
693 (forward-line 1) |
213 | 694 (while (> last-depth next-depth) |
695 (setq indent-stack (cdr indent-stack) | |
696 last-depth (1- last-depth))) | |
697 (while (< last-depth next-depth) | |
698 (setq indent-stack (cons nil indent-stack) | |
699 last-depth (1+ last-depth))) | |
700 ;; Now go to the next line and indent it according | |
701 ;; to what we learned from parsing the previous one. | |
702 (forward-line 1) | |
703 (setq bol (point)) | |
704 (skip-chars-forward " \t") | |
705 ;; But not if the line is blank, or just a comment | |
706 ;; (except for double-semi comments; indent them as usual). | |
707 (if (or (eobp) (looking-at "\\s<\\|\n")) | |
708 nil | |
709 (if (and (car indent-stack) | |
710 (>= (car indent-stack) 0)) | |
711 (setq this-indent (car indent-stack)) | |
712 (let ((val (calculate-lisp-indent | |
713 (if (car indent-stack) (- (car indent-stack)) | |
727 | 714 starting-point)))) |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
715 (if (null val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
716 (setq this-indent val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
717 (if (integerp val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
718 (setcar indent-stack |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
719 (setq this-indent val)) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
720 (setcar indent-stack (- (car (cdr val)))) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
721 (setq this-indent (car val)))))) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
722 (if (and this-indent (/= (current-column) this-indent)) |
213 | 723 (progn (delete-region bol (point)) |
724 (indent-to this-indent))))) | |
725 (or outer-loop-done | |
726 (setq outer-loop-done (= (point) last-point)) | |
727 (setq last-point (point))))))) | |
728 | |
729 ;; Indent every line whose first char is between START and END inclusive. | |
730 (defun lisp-indent-region (start end) | |
731 (save-excursion | |
732 (let ((endmark (copy-marker end))) | |
10594
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
733 (goto-char start) |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
734 (and (bolp) (not (eolp)) |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
735 (lisp-indent-line)) |
213 | 736 (indent-sexp endmark) |
737 (set-marker endmark nil)))) | |
738 | |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
739 ;;;; Lisp paragraph filling commands. |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
740 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
741 (defun lisp-fill-paragraph (&optional justify) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
742 "Like \\[fill-paragraph], but handle Emacs Lisp comments. |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
743 If any of the current line is a comment, fill the comment or the |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
744 paragraph of it that point is in, preserving the comment's indentation |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
745 and initial semicolons." |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
746 (interactive "P") |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
747 (let ( |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
748 ;; Non-nil if the current line contains a comment. |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
749 has-comment |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
750 |
14817
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
751 ;; Non-nil if the current line contains code and a comment. |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
752 has-code-and-comment |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
753 |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
754 ;; If has-comment, the appropriate fill-prefix for the comment. |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
755 comment-fill-prefix |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
756 ) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
757 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
758 ;; Figure out what kind of comment we are looking at. |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
759 (save-excursion |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
760 (beginning-of-line) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
761 (cond |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
762 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
763 ;; A line with nothing but a comment on it? |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
764 ((looking-at "[ \t]*;[; \t]*") |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
765 (setq has-comment t |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
766 comment-fill-prefix (buffer-substring (match-beginning 0) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
767 (match-end 0)))) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
768 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
769 ;; A line with some code, followed by a comment? Remember that the |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
770 ;; semi which starts the comment shouldn't be part of a string or |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
771 ;; character. |
13802
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
772 ((condition-case nil |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
773 (save-restriction |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
774 (narrow-to-region (point-min) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
775 (save-excursion (end-of-line) (point))) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
776 (while (not (looking-at ";\\|$")) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
777 (skip-chars-forward "^;\n\"\\\\?") |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
778 (cond |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
779 ((eq (char-after (point)) ?\\) (forward-char 2)) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
780 ((memq (char-after (point)) '(?\" ??)) (forward-sexp 1)))) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
781 (looking-at ";+[\t ]*")) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
782 (error nil)) |
14817
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
783 (setq has-comment t has-code-and-comment t) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
784 (setq comment-fill-prefix |
13802
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
785 (concat (make-string (/ (current-column) 8) ?\t) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
786 (make-string (% (current-column) 8) ?\ ) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
787 (buffer-substring (match-beginning 0) (match-end 0))))))) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
788 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
789 (if (not has-comment) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
790 (fill-paragraph justify) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
791 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
792 ;; Narrow to include only the comment, and then fill the region. |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
793 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
794 (save-restriction |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
795 (beginning-of-line) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
796 (narrow-to-region |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
797 ;; Find the first line we should include in the region to fill. |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
798 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
799 (while (and (zerop (forward-line -1)) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
800 (looking-at "^[ \t]*;"))) |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
801 ;; We may have gone too far. Go forward again. |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
802 (or (looking-at ".*;") |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
803 (forward-line 1)) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
804 (point)) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
805 ;; Find the beginning of the first line past the region to fill. |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
806 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
807 (while (progn (forward-line 1) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
808 (looking-at "^[ \t]*;"))) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
809 (point))) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
810 |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
811 ;; Lines with only semicolons on them can be paragraph boundaries. |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
812 (let* ((paragraph-start (concat paragraph-start "\\|[ \t;]*$")) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
813 (paragraph-separate (concat paragraph-start "\\|[ \t;]*$")) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
814 (paragraph-ignore-fill-prefix nil) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
815 (fill-prefix comment-fill-prefix) |
14817
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
816 (after-line (if has-code-and-comment |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
817 (save-excursion |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
818 (forward-line 1) (point)))) |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
819 (end (progn |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
820 (forward-paragraph) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
821 (or (bolp) (newline 1)) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
822 (point))) |
14817
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
823 ;; If this comment starts on a line with code, |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
824 ;; include that like in the filling. |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
825 (beg (progn (backward-paragraph) |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
826 (if (eq (point) after-line) |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
827 (forward-line -1)) |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
828 (point)))) |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
829 (fill-region-as-paragraph beg end |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
830 justify nil |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
831 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
832 (goto-char beg) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
833 (if (looking-at fill-prefix) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
834 nil |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
835 (re-search-forward comment-start-skip) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
836 (point)))))))) |
10629
2c9bdcab7052
(lisp-fill-paragraph): Return t.
Richard M. Stallman <rms@gnu.org>
parents:
10628
diff
changeset
|
837 t)) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
838 |
213 | 839 (defun indent-code-rigidly (start end arg &optional nochange-regexp) |
840 "Indent all lines of code, starting in the region, sideways by ARG columns. | |
841 Does not affect lines starting inside comments or strings, assuming that | |
842 the start of the region is not inside them. | |
843 | |
844 Called from a program, takes args START, END, COLUMNS and NOCHANGE-REGEXP. | |
845 The last is a regexp which, if matched at the beginning of a line, | |
846 means don't indent that line." | |
847 (interactive "r\np") | |
848 (let (state) | |
849 (save-excursion | |
850 (goto-char end) | |
851 (setq end (point-marker)) | |
852 (goto-char start) | |
853 (or (bolp) | |
854 (setq state (parse-partial-sexp (point) | |
855 (progn | |
856 (forward-line 1) (point)) | |
857 nil nil state))) | |
858 (while (< (point) end) | |
859 (or (car (nthcdr 3 state)) | |
860 (and nochange-regexp | |
861 (looking-at nochange-regexp)) | |
862 ;; If line does not start in string, indent it | |
863 (let ((indent (current-indentation))) | |
864 (delete-region (point) (progn (skip-chars-forward " \t") (point))) | |
865 (or (eolp) | |
866 (indent-to (max 0 (+ indent arg)) 0)))) | |
867 (setq state (parse-partial-sexp (point) | |
868 (progn | |
869 (forward-line 1) (point)) | |
870 nil nil state)))))) | |
584 | 871 |
872 (provide 'lisp-mode) | |
873 | |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
874 ;;; lisp-mode.el ends here |