Mercurial > emacs
annotate lisp/emacs-lisp/lisp-mode.el @ 25630:4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
(emacs-lisp-mode-hook, lisp-mode-hook, lisp-interaction-mode-hook):
Customize.
author | Dave Love <fx@gnu.org> |
---|---|
date | Fri, 10 Sep 1999 18:08:06 +0000 |
parents | 9a7891b32d1a |
children | 556711217681 |
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 |
25107 | 3 ;; Copyright (C) 1985, 1986, 1999 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) | |
23723
b706421adbd5
Set syntaxes all non-word multibyte
Kenichi Handa <handa@m17n.org>
parents:
23388
diff
changeset
|
72 (modify-syntax-entry ?\] ")[ " emacs-lisp-mode-syntax-table) |
b706421adbd5
Set syntaxes all non-word multibyte
Kenichi Handa <handa@m17n.org>
parents:
23388
diff
changeset
|
73 ;; All non-word multibyte characters should be `symbol'. |
b706421adbd5
Set syntaxes all non-word multibyte
Kenichi Handa <handa@m17n.org>
parents:
23388
diff
changeset
|
74 (map-char-table |
b706421adbd5
Set syntaxes all non-word multibyte
Kenichi Handa <handa@m17n.org>
parents:
23388
diff
changeset
|
75 (function (lambda (key val) |
b706421adbd5
Set syntaxes all non-word multibyte
Kenichi Handa <handa@m17n.org>
parents:
23388
diff
changeset
|
76 (and (>= key 256) |
b706421adbd5
Set syntaxes all non-word multibyte
Kenichi Handa <handa@m17n.org>
parents:
23388
diff
changeset
|
77 (/= (char-syntax key) ?w) |
b706421adbd5
Set syntaxes all non-word multibyte
Kenichi Handa <handa@m17n.org>
parents:
23388
diff
changeset
|
78 (modify-syntax-entry key "_ " |
b706421adbd5
Set syntaxes all non-word multibyte
Kenichi Handa <handa@m17n.org>
parents:
23388
diff
changeset
|
79 emacs-lisp-mode-syntax-table)))) |
b706421adbd5
Set syntaxes all non-word multibyte
Kenichi Handa <handa@m17n.org>
parents:
23388
diff
changeset
|
80 (standard-syntax-table)))) |
213 | 81 |
285 | 82 (if (not lisp-mode-syntax-table) |
83 (progn (setq lisp-mode-syntax-table | |
84 (copy-syntax-table emacs-lisp-mode-syntax-table)) | |
85 (modify-syntax-entry ?\| "\" " lisp-mode-syntax-table) | |
86 (modify-syntax-entry ?\[ "_ " lisp-mode-syntax-table) | |
87 (modify-syntax-entry ?\] "_ " lisp-mode-syntax-table))) | |
88 | |
213 | 89 (define-abbrev-table 'lisp-mode-abbrev-table ()) |
90 | |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
91 (defvar lisp-imenu-generic-expression |
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 (nil |
25630
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
94 "^\\s-*(def\\(un\\|subst\\|macro\\|advice\\|ine-skeleton\\)\ |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
95 \\s-+\\([-A-Za-z0-9+*|:/]+\\)" 2) |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
96 ("Variables" |
20013
cc417f06a333
(lisp-imenu-generic-expression): Allow `/' in names.
Richard M. Stallman <rms@gnu.org>
parents:
19851
diff
changeset
|
97 "^\\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
|
98 ("Types" |
25630
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
99 "^\\s-*(def\\(group\\|type\\|struct\\|class\\|ine-condition\ |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
100 \\|ine-widget\\)\\s-+'?\\([-A-Za-z0-9+*|:/]+\\)" |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
101 2)) |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
102 |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
103 "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
|
104 |
213 | 105 (defun lisp-mode-variables (lisp-syntax) |
106 (cond (lisp-syntax | |
107 (set-syntax-table lisp-mode-syntax-table))) | |
108 (setq local-abbrev-table lisp-mode-abbrev-table) | |
109 (make-local-variable 'paragraph-start) | |
13504
1319330ca7ff
(lisp-mode-variables, lisp-fill-paragraph): Remove
Richard M. Stallman <rms@gnu.org>
parents:
12701
diff
changeset
|
110 (setq paragraph-start (concat page-delimiter "\\|$" )) |
213 | 111 (make-local-variable 'paragraph-separate) |
112 (setq paragraph-separate paragraph-start) | |
113 (make-local-variable 'paragraph-ignore-fill-prefix) | |
114 (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
|
115 (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
|
116 (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
|
117 ;; 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
|
118 ;; 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
|
119 ;; 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
|
120 (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
|
121 (setq adaptive-fill-mode nil) |
20333
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
122 (make-local-variable 'normal-auto-fill-function) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
123 (setq normal-auto-fill-function 'lisp-mode-auto-fill) |
213 | 124 (make-local-variable 'indent-line-function) |
125 (setq indent-line-function 'lisp-indent-line) | |
126 (make-local-variable 'indent-region-function) | |
127 (setq indent-region-function 'lisp-indent-region) | |
128 (make-local-variable 'parse-sexp-ignore-comments) | |
129 (setq parse-sexp-ignore-comments t) | |
6076
4f76564fc2cd
(lisp-mode-variables): Set outline-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
5103
diff
changeset
|
130 (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
|
131 (setq outline-regexp ";;; \\|(....") |
213 | 132 (make-local-variable 'comment-start) |
133 (setq comment-start ";") | |
134 (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
|
135 ;; 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
|
136 ;; 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
|
137 (setq comment-start-skip "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *") |
213 | 138 (make-local-variable 'comment-column) |
139 (setq comment-column 40) | |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
140 (make-local-variable 'comment-indent-function) |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
141 (setq comment-indent-function 'lisp-comment-indent) |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
142 (make-local-variable 'imenu-generic-expression) |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
143 (setq imenu-generic-expression lisp-imenu-generic-expression)) |
213 | 144 |
145 (defvar shared-lisp-mode-map () | |
146 "Keymap for commands shared by all sorts of Lisp modes.") | |
147 | |
148 (if shared-lisp-mode-map | |
149 () | |
150 (setq shared-lisp-mode-map (make-sparse-keymap)) | |
151 (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
|
152 (define-key shared-lisp-mode-map "\177" 'backward-delete-char-untabify)) |
213 | 153 |
154 (defvar emacs-lisp-mode-map () | |
155 "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
|
156 All commands in `shared-lisp-mode-map' are inherited by this map.") |
213 | 157 |
158 (if emacs-lisp-mode-map | |
159 () | |
12035
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
160 (let ((map (make-sparse-keymap "Emacs-Lisp"))) |
21116
ccf251830c66
(lisp-interaction-mode-map)
Richard M. Stallman <rms@gnu.org>
parents:
20459
diff
changeset
|
161 (setq emacs-lisp-mode-map (make-sparse-keymap)) |
ccf251830c66
(lisp-interaction-mode-map)
Richard M. Stallman <rms@gnu.org>
parents:
20459
diff
changeset
|
162 (set-keymap-parent emacs-lisp-mode-map shared-lisp-mode-map) |
12035
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
163 (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
|
164 (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
|
165 (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
|
166 (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
|
167 (cons "Emacs-Lisp" map)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
168 (define-key map [edebug-defun] |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
169 '("Instrument Function for Debugging" . edebug-defun)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
170 (define-key map [byte-recompile] |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
171 '("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
|
172 (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
|
173 '("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
|
174 (define-key map [byte-compile] |
12035
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
175 '("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
|
176 (define-key map [separator-eval] '("--")) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
177 (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
|
178 (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
|
179 (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
|
180 (define-key map [separator-format] '("--")) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
181 (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
|
182 (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
|
183 (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
|
184 (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
|
185 (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
|
186 (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
|
187 |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
188 (defun emacs-lisp-byte-compile () |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
189 "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
|
190 (interactive) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
191 (if buffer-file-name |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
192 (byte-compile-file buffer-file-name) |
14116
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
193 (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
|
194 |
14719
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
195 (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
|
196 "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
|
197 (interactive) |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
198 (or buffer-file-name |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
199 (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
|
200 (require 'bytecomp) |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
201 ;; 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
|
202 (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
|
203 (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
|
204 (save-buffer)) |
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
205 (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
|
206 (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
|
207 (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
|
208 (byte-compile-file buffer-file-name t)))) |
213 | 209 |
25630
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
210 (defcustom emacs-lisp-mode-hook nil |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
211 "Hook run when entering Emacs Lisp mode." |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
212 :options '(turn-on-eldoc-mode imenu-add-menubar-index) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
213 :type 'hook |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
214 :group 'lisp) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
215 |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
216 (defcustom lisp-mode-hook nil |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
217 "Hook run when entering Lisp mode." |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
218 :options '(imenu-add-menubar-index) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
219 :type 'hook |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
220 :group 'lisp) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
221 |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
222 (defcustom lisp-interaction-mode-hook nil |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
223 "Hook run when entering Lisp Interaction mode." |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
224 :options '(turn-on-eldoc-mode) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
225 :type 'hook |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
226 :group 'lisp) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
227 |
213 | 228 (defun emacs-lisp-mode () |
229 "Major mode for editing Lisp code to run in Emacs. | |
230 Commands: | |
231 Delete converts tabs to spaces as it moves back. | |
232 Blank lines separate paragraphs. Semicolons start comments. | |
233 \\{emacs-lisp-mode-map} | |
234 Entry to this mode calls the value of `emacs-lisp-mode-hook' | |
235 if that value is non-nil." | |
236 (interactive) | |
237 (kill-all-local-variables) | |
238 (use-local-map emacs-lisp-mode-map) | |
239 (set-syntax-table emacs-lisp-mode-syntax-table) | |
240 (setq major-mode 'emacs-lisp-mode) | |
241 (setq mode-name "Emacs-Lisp") | |
242 (lisp-mode-variables nil) | |
20459 | 243 (setq imenu-case-fold-search nil) |
213 | 244 (run-hooks 'emacs-lisp-mode-hook)) |
245 | |
246 (defvar lisp-mode-map () | |
247 "Keymap for ordinary Lisp mode. | |
248 All commands in `shared-lisp-mode-map' are inherited by this map.") | |
249 | |
250 (if lisp-mode-map | |
251 () | |
21116
ccf251830c66
(lisp-interaction-mode-map)
Richard M. Stallman <rms@gnu.org>
parents:
20459
diff
changeset
|
252 (setq lisp-mode-map (make-sparse-keymap)) |
ccf251830c66
(lisp-interaction-mode-map)
Richard M. Stallman <rms@gnu.org>
parents:
20459
diff
changeset
|
253 (set-keymap-parent lisp-mode-map shared-lisp-mode-map) |
5103
40b068fb4c37
(lisp-eval-defun): Renamed from lisp-send-defun.
Richard M. Stallman <rms@gnu.org>
parents:
3638
diff
changeset
|
254 (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
|
255 (define-key lisp-mode-map "\C-c\C-z" 'run-lisp)) |
213 | 256 |
257 (defun lisp-mode () | |
258 "Major mode for editing Lisp code for Lisps other than GNU Emacs Lisp. | |
259 Commands: | |
260 Delete converts tabs to spaces as it moves back. | |
261 Blank lines separate paragraphs. Semicolons start comments. | |
262 \\{lisp-mode-map} | |
263 Note that `run-lisp' may be used either to start an inferior Lisp job | |
264 or to switch back to an existing one. | |
265 | |
266 Entry to this mode calls the value of `lisp-mode-hook' | |
267 if that value is non-nil." | |
268 (interactive) | |
269 (kill-all-local-variables) | |
270 (use-local-map lisp-mode-map) | |
271 (setq major-mode 'lisp-mode) | |
272 (setq mode-name "Lisp") | |
273 (lisp-mode-variables t) | |
20459 | 274 (setq imenu-case-fold-search t) |
213 | 275 (set-syntax-table lisp-mode-syntax-table) |
276 (run-hooks 'lisp-mode-hook)) | |
277 | |
278 ;; 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
|
279 (defun lisp-eval-defun nil |
213 | 280 "Send the current defun to the Lisp process made by \\[run-lisp]." |
281 (interactive) | |
282 (error "Process lisp does not exist")) | |
283 | |
284 (defvar lisp-interaction-mode-map () | |
23738
2ef2813414b6
(lisp-interaction-mode-map): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23723
diff
changeset
|
285 "Keymap for Lisp Interaction mode. |
213 | 286 All commands in `shared-lisp-mode-map' are inherited by this map.") |
287 | |
288 (if lisp-interaction-mode-map | |
289 () | |
21116
ccf251830c66
(lisp-interaction-mode-map)
Richard M. Stallman <rms@gnu.org>
parents:
20459
diff
changeset
|
290 (setq lisp-interaction-mode-map (make-sparse-keymap)) |
ccf251830c66
(lisp-interaction-mode-map)
Richard M. Stallman <rms@gnu.org>
parents:
20459
diff
changeset
|
291 (set-keymap-parent lisp-interaction-mode-map shared-lisp-mode-map) |
213 | 292 (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
|
293 (define-key lisp-interaction-mode-map "\e\t" 'lisp-complete-symbol) |
213 | 294 (define-key lisp-interaction-mode-map "\n" 'eval-print-last-sexp)) |
295 | |
296 (defun lisp-interaction-mode () | |
297 "Major mode for typing and evaluating Lisp forms. | |
298 Like Lisp mode except that \\[eval-print-last-sexp] evals the Lisp expression | |
299 before point, and prints its value into the buffer, advancing point. | |
300 | |
301 Commands: | |
302 Delete converts tabs to spaces as it moves back. | |
303 Paragraphs are separated only by blank lines. | |
304 Semicolons start comments. | |
305 \\{lisp-interaction-mode-map} | |
306 Entry to this mode calls the value of `lisp-interaction-mode-hook' | |
307 if that value is non-nil." | |
308 (interactive) | |
309 (kill-all-local-variables) | |
310 (use-local-map lisp-interaction-mode-map) | |
311 (setq major-mode 'lisp-interaction-mode) | |
312 (setq mode-name "Lisp Interaction") | |
313 (set-syntax-table emacs-lisp-mode-syntax-table) | |
314 (lisp-mode-variables nil) | |
315 (run-hooks 'lisp-interaction-mode-hook)) | |
316 | |
248 | 317 (defun eval-print-last-sexp () |
213 | 318 "Evaluate sexp before point; print value into current buffer." |
248 | 319 (interactive) |
422 | 320 (let ((standard-output (current-buffer))) |
321 (terpri) | |
322 (eval-last-sexp t) | |
323 (terpri))) | |
213 | 324 |
2450
17d258d8e8e4
(eval-defun): Rename argument to avoid collision.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
325 (defun eval-last-sexp (eval-last-sexp-arg-internal) |
213 | 326 "Evaluate sexp before point; print value in minibuffer. |
327 With argument, print output into current buffer." | |
328 (interactive "P") | |
17066
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
329 (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
|
330 (prin1 (eval (let ((stab (syntax-table)) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
331 (opoint (point)) |
19057
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
332 ignore-quotes |
17066
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
333 expr) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
334 (unwind-protect |
249 | 335 (save-excursion |
336 (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
|
337 ;; 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
|
338 ;; then ignore the surrounding quotes. |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
339 (setq ignore-quotes |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
340 (or (eq (following-char) ?\') |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
341 (eq (preceding-char) ?\'))) |
249 | 342 (forward-sexp -1) |
1163 | 343 (save-restriction |
19057
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
344 ;; 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
|
345 ;; `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
|
346 ;; name |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
347 (if (and ignore-quotes |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
348 (eq (following-char) ?`)) |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
349 (forward-char)) |
1163 | 350 (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
|
351 (setq expr (read (current-buffer))) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
352 ;; 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
|
353 ;; 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
|
354 ;; use it. |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
355 (and (consp expr) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
356 (eq (car expr) 'interactive) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
357 (setq expr |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
358 (list 'call-interactively |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
359 (list 'quote |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
360 (list 'lambda |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
361 '(&rest args) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
362 expr |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
363 'args))))) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
364 expr)) |
249 | 365 (set-syntax-table stab))))))) |
213 | 366 |
25434
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
367 ;; Change defvar into defconst within FORM, |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
368 ;; and likewise for other constructs as necessary. |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
369 (defun eval-defun-1 (form) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
370 (cond ((and (eq (car form) 'defvar) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
371 (cdr-safe (cdr-safe form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
372 ;; Force variable to be bound. |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
373 (cons 'defconst (cdr form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
374 ((and (eq (car form) 'defcustom) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
375 (default-boundp (nth 1 form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
376 ;; Force variable to be bound. |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
377 (set-default (nth 1 form) (eval (nth 2 form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
378 form) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
379 ((eq (car form) 'progn) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
380 (cons 'progn (mapcar 'eval-defun-1 (cdr form)))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
381 (t form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
382 |
2450
17d258d8e8e4
(eval-defun): Rename argument to avoid collision.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
383 (defun eval-defun (eval-defun-arg-internal) |
248 | 384 "Evaluate defun that point is in or before. |
24895 | 385 The value is displayed in the minibuffer. |
386 If the current defun is actually a call to `defvar', | |
387 then reset the variable using the initial value expression | |
388 even if the variable already has some other value. | |
389 \(Normally `defvar' does not change the variable's value | |
390 if it already has a value.\) | |
391 | |
23388
8aa1f99efb66
(eval-defun): Return the evaluation result.
Karl Heuer <kwzh@gnu.org>
parents:
23191
diff
changeset
|
392 With argument, insert value in current buffer after the defun. |
8aa1f99efb66
(eval-defun): Return the evaluation result.
Karl Heuer <kwzh@gnu.org>
parents:
23191
diff
changeset
|
393 Return the result of evaluation." |
213 | 394 (interactive "P") |
25107 | 395 (save-excursion |
396 ;; Arrange for eval-region to "read" the (possibly) altered form. | |
397 ;; eval-region handles recording which file defines a function or | |
398 ;; variable. Re-written using `apply' to avoid capturing | |
399 ;; variables like `end'. | |
400 (apply | |
401 #'eval-region | |
402 (let ((standard-output (if eval-defun-arg-internal (current-buffer) t)) | |
403 beg end form) | |
404 ;; Read the form from the buffer, and record where it ends. | |
405 (save-excursion | |
406 (end-of-defun) | |
407 (beginning-of-defun) | |
408 (setq beg (point)) | |
409 (setq form (read (current-buffer))) | |
410 (setq end (point))) | |
25434
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
411 ;; Alter the form if necessary, changing defvar into defconst, etc. |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
412 (setq form (eval-defun-1 (macroexpand form))) |
25107 | 413 (list beg end standard-output |
414 `(lambda (ignore) | |
415 ;; Skipping to the end of the specified region | |
416 ;; will make eval-region return. | |
417 (goto-char ,end) | |
25109 | 418 ',form))))) |
25107 | 419 ;; The result of evaluation has been put onto VALUES. So return it. |
420 (car values)) | |
213 | 421 |
422 (defun lisp-comment-indent () | |
423 (if (looking-at "\\s<\\s<\\s<") | |
424 (current-column) | |
425 (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
|
426 (let ((tem (or (calculate-lisp-indent) (current-column)))) |
213 | 427 (if (listp tem) (car tem) tem)) |
428 (skip-chars-backward " \t") | |
429 (max (if (bolp) 0 (1+ (current-column))) | |
430 comment-column)))) | |
431 | |
20333
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
432 (defun lisp-mode-auto-fill () |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
433 (if (> (current-column) (current-fill-column)) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
434 (if (save-excursion |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
435 (nth 4 (parse-partial-sexp (save-excursion |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
436 (beginning-of-defun) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
437 (point)) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
438 (point)))) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
439 (do-auto-fill) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
440 (let ((comment-start nil) (comment-start-skip nil)) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
441 (do-auto-fill))))) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
442 |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16563
diff
changeset
|
443 (defvar lisp-indent-offset nil "") |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16563
diff
changeset
|
444 (defvar lisp-indent-function 'lisp-indent-function "") |
213 | 445 |
446 (defun lisp-indent-line (&optional whole-exp) | |
447 "Indent current line as Lisp code. | |
448 With argument, indent any additional lines of the same expression | |
449 rigidly along with this one." | |
450 (interactive "P") | |
451 (let ((indent (calculate-lisp-indent)) shift-amt beg end | |
452 (pos (- (point-max) (point)))) | |
453 (beginning-of-line) | |
454 (setq beg (point)) | |
455 (skip-chars-forward " \t") | |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
456 (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
|
457 ;; 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
|
458 ;; or a line that starts in a string. |
677
7a9b4ea68565
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
659
diff
changeset
|
459 (goto-char (- (point-max) pos)) |
213 | 460 (if (and (looking-at "\\s<") (not (looking-at "\\s<\\s<"))) |
461 ;; Single-semicolon comment lines should be indented | |
462 ;; as comment lines, not as code. | |
463 (progn (indent-for-comment) (forward-char -1)) | |
464 (if (listp indent) (setq indent (car indent))) | |
465 (setq shift-amt (- indent (current-column))) | |
466 (if (zerop shift-amt) | |
467 nil | |
468 (delete-region beg (point)) | |
469 (indent-to indent))) | |
470 ;; If initial point was within line's indentation, | |
471 ;; position after the indentation. Else stay at same point in text. | |
472 (if (> (- (point-max) pos) (point)) | |
473 (goto-char (- (point-max) pos))) | |
474 ;; If desired, shift remaining lines of expression the same amount. | |
475 (and whole-exp (not (zerop shift-amt)) | |
476 (save-excursion | |
477 (goto-char beg) | |
478 (forward-sexp 1) | |
479 (setq end (point)) | |
480 (goto-char beg) | |
481 (forward-line 1) | |
482 (setq beg (point)) | |
483 (> end beg)) | |
484 (indent-code-rigidly beg end shift-amt))))) | |
485 | |
9424
738999b0296f
Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9423
diff
changeset
|
486 (defvar calculate-lisp-indent-last-sexp) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
487 |
213 | 488 (defun calculate-lisp-indent (&optional parse-start) |
489 "Return appropriate indentation for current line as Lisp code. | |
490 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
|
491 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
|
492 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
|
493 |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
494 The value can also be a list of the form (COLUMN CONTAINING-SEXP-START). |
213 | 495 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
|
496 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
|
497 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
|
498 is the buffer position of the start of the containing expression." |
213 | 499 (save-excursion |
500 (beginning-of-line) | |
501 (let ((indent-point (point)) | |
502 state paren-depth | |
503 ;; setting this to a number inhibits calling hook | |
504 (desired-indent nil) | |
505 (retry t) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
506 calculate-lisp-indent-last-sexp containing-sexp) |
213 | 507 (if parse-start |
508 (goto-char parse-start) | |
509 (beginning-of-defun)) | |
510 ;; Find outermost containing sexp | |
511 (while (< (point) indent-point) | |
512 (setq state (parse-partial-sexp (point) indent-point 0))) | |
513 ;; Find innermost containing sexp | |
514 (while (and retry | |
515 state | |
516 (> (setq paren-depth (elt state 0)) 0)) | |
517 (setq retry nil) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
518 (setq calculate-lisp-indent-last-sexp (elt state 2)) |
213 | 519 (setq containing-sexp (elt state 1)) |
520 ;; Position following last unclosed open. | |
521 (goto-char (1+ containing-sexp)) | |
522 ;; Is there a complete sexp since then? | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
523 (if (and calculate-lisp-indent-last-sexp |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
524 (> calculate-lisp-indent-last-sexp (point))) |
213 | 525 ;; 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
|
526 (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
|
527 indent-point 0))) |
213 | 528 (if (setq retry (car (cdr peek))) (setq state peek))))) |
529 (if retry | |
530 nil | |
531 ;; Innermost containing sexp found | |
532 (goto-char (1+ containing-sexp)) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
533 (if (not calculate-lisp-indent-last-sexp) |
213 | 534 ;; indent-point immediately follows open paren. |
535 ;; Don't call hook. | |
536 (setq desired-indent (current-column)) | |
537 ;; 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
|
538 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) |
213 | 539 (cond ((looking-at "\\s(") |
540 ;; First element of containing sexp is a list. | |
541 ;; Indent under that list. | |
542 ) | |
543 ((> (save-excursion (forward-line 1) (point)) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
544 calculate-lisp-indent-last-sexp) |
213 | 545 ;; This is the first line to start within the containing sexp. |
546 ;; It's almost certainly a function call. | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
547 (if (= (point) calculate-lisp-indent-last-sexp) |
213 | 548 ;; Containing sexp has nothing before this line |
549 ;; except the first element. Indent under that element. | |
550 nil | |
551 ;; Skip the first element, find start of second (the first | |
552 ;; argument of the function call) and indent under. | |
553 (progn (forward-sexp 1) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
554 (parse-partial-sexp (point) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
555 calculate-lisp-indent-last-sexp |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
556 0 t))) |
213 | 557 (backward-prefix-chars)) |
558 (t | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
559 ;; Indent beneath first sexp on same line as |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
560 ;; calculate-lisp-indent-last-sexp. Again, it's |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
561 ;; almost certainly a function call. |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
562 (goto-char calculate-lisp-indent-last-sexp) |
213 | 563 (beginning-of-line) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
564 (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
|
565 0 t) |
213 | 566 (backward-prefix-chars))))) |
567 ;; 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
|
568 ;; Call indentation hook except when overridden by lisp-indent-offset |
213 | 569 ;; or if the desired indentation has already been computed. |
570 (let ((normal-indent (current-column))) | |
571 (cond ((elt state 3) | |
572 ;; 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
|
573 nil) |
213 | 574 ((and (integerp lisp-indent-offset) containing-sexp) |
575 ;; Indent by constant offset | |
576 (goto-char containing-sexp) | |
577 (+ (current-column) lisp-indent-offset)) | |
578 (desired-indent) | |
579 ((and (boundp 'lisp-indent-function) | |
580 lisp-indent-function | |
581 (not retry)) | |
582 (or (funcall lisp-indent-function indent-point state) | |
583 normal-indent)) | |
584 (t | |
214 | 585 normal-indent)))))) |
213 | 586 |
587 (defun lisp-indent-function (indent-point state) | |
588 (let ((normal-indent (current-column))) | |
589 (goto-char (1+ (elt state 1))) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
590 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) |
213 | 591 (if (and (elt state 2) |
592 (not (looking-at "\\sw\\|\\s_"))) | |
593 ;; car of form doesn't seem to be a a symbol | |
594 (progn | |
595 (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
|
596 calculate-lisp-indent-last-sexp)) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
597 (progn (goto-char calculate-lisp-indent-last-sexp) |
213 | 598 (beginning-of-line) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
599 (parse-partial-sexp (point) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
600 calculate-lisp-indent-last-sexp 0 t))) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
601 ;; 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
|
602 ;; 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
|
603 ;; 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
|
604 ;; inside the innermost containing sexp. |
213 | 605 (backward-prefix-chars) |
606 (current-column)) | |
607 (let ((function (buffer-substring (point) | |
608 (progn (forward-sexp 1) (point)))) | |
609 method) | |
3638
45169f86d3a4
(lisp-indent-function): Look for either
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
610 (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
|
611 (get (intern-soft function) 'lisp-indent-hook))) |
213 | 612 (cond ((or (eq method 'defun) |
613 (and (null method) | |
614 (> (length function) 3) | |
615 (string-match "\\`def" function))) | |
616 (lisp-indent-defform state indent-point)) | |
617 ((integerp method) | |
618 (lisp-indent-specform method state | |
619 indent-point normal-indent)) | |
620 (method | |
621 (funcall method state indent-point))))))) | |
622 | |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16563
diff
changeset
|
623 (defvar lisp-body-indent 2 |
2933
420dfaaacfc5
(lisp-body-indent): Add doc.
Richard M. Stallman <rms@gnu.org>
parents:
2450
diff
changeset
|
624 "Number of columns to indent the second line of a `(def...)' form.") |
213 | 625 |
626 (defun lisp-indent-specform (count state indent-point normal-indent) | |
627 (let ((containing-form-start (elt state 1)) | |
628 (i count) | |
629 body-indent containing-form-column) | |
630 ;; Move to the start of containing form, calculate indentation | |
631 ;; to use for non-distinguished forms (> count), and move past the | |
632 ;; function symbol. lisp-indent-function guarantees that there is at | |
633 ;; least one word or symbol character following open paren of containing | |
634 ;; form. | |
635 (goto-char containing-form-start) | |
636 (setq containing-form-column (current-column)) | |
637 (setq body-indent (+ lisp-body-indent containing-form-column)) | |
638 (forward-char 1) | |
639 (forward-sexp 1) | |
640 ;; Now find the start of the last form. | |
641 (parse-partial-sexp (point) indent-point 1 t) | |
642 (while (and (< (point) indent-point) | |
643 (condition-case () | |
644 (progn | |
645 (setq count (1- count)) | |
646 (forward-sexp 1) | |
647 (parse-partial-sexp (point) indent-point 1 t)) | |
648 (error nil)))) | |
649 ;; Point is sitting on first character of last (or count) sexp. | |
650 (if (> count 0) | |
651 ;; A distinguished form. If it is the first or second form use double | |
652 ;; lisp-body-indent, else normal indent. With lisp-body-indent bound | |
653 ;; to 2 (the default), this just happens to work the same with if as | |
654 ;; the older code, but it makes unwind-protect, condition-case, | |
655 ;; with-output-to-temp-buffer, et. al. much more tasteful. The older, | |
656 ;; less hacked, behavior can be obtained by replacing below with | |
657 ;; (list normal-indent containing-form-start). | |
658 (if (<= (- i count) 1) | |
659 (list (+ containing-form-column (* 2 lisp-body-indent)) | |
660 containing-form-start) | |
661 (list normal-indent containing-form-start)) | |
662 ;; A non-distinguished form. Use body-indent if there are no | |
663 ;; distinguished forms and this is the first undistinguished form, | |
664 ;; or if this is the first undistinguished form and the preceding | |
665 ;; distinguished form has indentation at least as great as body-indent. | |
666 (if (or (and (= i 0) (= count 0)) | |
667 (and (= count 0) (<= body-indent normal-indent))) | |
668 body-indent | |
669 normal-indent)))) | |
670 | |
671 (defun lisp-indent-defform (state indent-point) | |
672 (goto-char (car (cdr state))) | |
673 (forward-line 1) | |
674 (if (> (point) (car (cdr (cdr state)))) | |
675 (progn | |
676 (goto-char (car (cdr state))) | |
677 (+ lisp-body-indent (current-column))))) | |
678 | |
679 | |
680 ;; (put 'progn 'lisp-indent-function 0), say, causes progn to be indented | |
681 ;; like defun if the first form is placed on the next line, otherwise | |
682 ;; it is indented like any other form (i.e. forms line up under first). | |
683 | |
684 (put 'lambda 'lisp-indent-function 'defun) | |
685 (put 'autoload 'lisp-indent-function 'defun) | |
686 (put 'progn 'lisp-indent-function 0) | |
687 (put 'prog1 'lisp-indent-function 1) | |
688 (put 'prog2 'lisp-indent-function 2) | |
689 (put 'save-excursion 'lisp-indent-function 0) | |
690 (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
|
691 (put 'save-selected-window 'lisp-indent-function 0) |
213 | 692 (put 'save-restriction 'lisp-indent-function 0) |
1163 | 693 (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
|
694 (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
|
695 (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
|
696 (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
|
697 (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
|
698 (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
|
699 (put 'with-temp-buffer 'lisp-indent-function 0) |
23738
2ef2813414b6
(lisp-interaction-mode-map): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23723
diff
changeset
|
700 (put 'with-temp-message 'lisp-indent-function 1) |
213 | 701 (put 'let 'lisp-indent-function 1) |
702 (put 'let* 'lisp-indent-function 1) | |
703 (put 'while 'lisp-indent-function 1) | |
704 (put 'if 'lisp-indent-function 2) | |
705 (put 'catch 'lisp-indent-function 1) | |
706 (put 'condition-case 'lisp-indent-function 2) | |
707 (put 'unwind-protect 'lisp-indent-function 1) | |
708 (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
|
709 (put 'eval-after-load 'lisp-indent-function 1) |
213 | 710 |
711 (defun indent-sexp (&optional endpos) | |
712 "Indent each line of the list starting just after point. | |
713 If optional arg ENDPOS is given, indent each line, stopping when | |
714 ENDPOS is encountered." | |
715 (interactive) | |
727 | 716 (let ((indent-stack (list nil)) |
717 (next-depth 0) | |
10594
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
718 ;; 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
|
719 ;; 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
|
720 ;; 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
|
721 ;; 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
|
722 ;; 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
|
723 (starting-point (if endpos nil (point))) |
727 | 724 (last-point (point)) |
725 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
|
726 (or endpos |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
727 ;; 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
|
728 (save-excursion (forward-sexp 1))) |
213 | 729 (save-excursion |
730 (setq outer-loop-done nil) | |
731 (while (if endpos (< (point) endpos) | |
732 (not outer-loop-done)) | |
733 (setq last-depth next-depth | |
734 inner-loop-done nil) | |
735 ;; Parse this line so we can learn the state | |
736 ;; to indent the next line. | |
737 ;; This inner loop goes through only once | |
738 ;; unless a line ends inside a string. | |
739 (while (and (not inner-loop-done) | |
740 (not (setq outer-loop-done (eobp)))) | |
741 (setq state (parse-partial-sexp (point) (progn (end-of-line) (point)) | |
742 nil nil state)) | |
743 (setq next-depth (car state)) | |
744 ;; If the line contains a comment other than the sort | |
745 ;; that is indented like code, | |
746 ;; indent it now with indent-for-comment. | |
747 ;; Comments indented like code are right already. | |
748 ;; In any case clear the in-comment flag in the state | |
749 ;; because parse-partial-sexp never sees the newlines. | |
750 (if (car (nthcdr 4 state)) | |
751 (progn (indent-for-comment) | |
752 (end-of-line) | |
753 (setcar (nthcdr 4 state) nil))) | |
754 ;; If this line ends inside a string, | |
755 ;; go straight to next line, remaining within the inner loop, | |
756 ;; and turn off the \-flag. | |
757 (if (car (nthcdr 3 state)) | |
758 (progn | |
759 (forward-line 1) | |
760 (setcar (nthcdr 5 state) nil)) | |
761 (setq inner-loop-done t))) | |
762 (and endpos | |
727 | 763 (<= next-depth 0) |
764 (progn | |
765 (setq indent-stack (append indent-stack | |
766 (make-list (- next-depth) nil)) | |
767 last-depth (- last-depth next-depth) | |
768 next-depth 0))) | |
10594
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
769 (or outer-loop-done endpos |
213 | 770 (setq outer-loop-done (<= next-depth 0))) |
771 (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
|
772 (forward-line 1) |
213 | 773 (while (> last-depth next-depth) |
774 (setq indent-stack (cdr indent-stack) | |
775 last-depth (1- last-depth))) | |
776 (while (< last-depth next-depth) | |
777 (setq indent-stack (cons nil indent-stack) | |
778 last-depth (1+ last-depth))) | |
779 ;; Now go to the next line and indent it according | |
780 ;; to what we learned from parsing the previous one. | |
781 (forward-line 1) | |
782 (setq bol (point)) | |
783 (skip-chars-forward " \t") | |
784 ;; But not if the line is blank, or just a comment | |
785 ;; (except for double-semi comments; indent them as usual). | |
786 (if (or (eobp) (looking-at "\\s<\\|\n")) | |
787 nil | |
788 (if (and (car indent-stack) | |
789 (>= (car indent-stack) 0)) | |
790 (setq this-indent (car indent-stack)) | |
791 (let ((val (calculate-lisp-indent | |
792 (if (car indent-stack) (- (car indent-stack)) | |
727 | 793 starting-point)))) |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
794 (if (null val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
795 (setq this-indent val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
796 (if (integerp val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
797 (setcar indent-stack |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
798 (setq this-indent val)) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
799 (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
|
800 (setq this-indent (car val)))))) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
801 (if (and this-indent (/= (current-column) this-indent)) |
213 | 802 (progn (delete-region bol (point)) |
803 (indent-to this-indent))))) | |
804 (or outer-loop-done | |
805 (setq outer-loop-done (= (point) last-point)) | |
806 (setq last-point (point))))))) | |
807 | |
808 ;; Indent every line whose first char is between START and END inclusive. | |
809 (defun lisp-indent-region (start end) | |
810 (save-excursion | |
811 (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
|
812 (goto-char start) |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
813 (and (bolp) (not (eolp)) |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
814 (lisp-indent-line)) |
213 | 815 (indent-sexp endmark) |
816 (set-marker endmark nil)))) | |
817 | |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
818 ;;;; Lisp paragraph filling commands. |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
819 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
820 (defun lisp-fill-paragraph (&optional justify) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
821 "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
|
822 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
|
823 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
|
824 and initial semicolons." |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
825 (interactive "P") |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
826 (let ( |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
827 ;; 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
|
828 has-comment |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
829 |
14817
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
830 ;; 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
|
831 has-code-and-comment |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
832 |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
833 ;; 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
|
834 comment-fill-prefix |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
835 ) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
836 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
837 ;; 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
|
838 (save-excursion |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
839 (beginning-of-line) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
840 (cond |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
841 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
842 ;; 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
|
843 ((looking-at "[ \t]*;[; \t]*") |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
844 (setq has-comment t |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
845 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
|
846 (match-end 0)))) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
847 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
848 ;; 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
|
849 ;; 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
|
850 ;; character. |
13802
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
851 ((condition-case nil |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
852 (save-restriction |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
853 (narrow-to-region (point-min) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
854 (save-excursion (end-of-line) (point))) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
855 (while (not (looking-at ";\\|$")) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
856 (skip-chars-forward "^;\n\"\\\\?") |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
857 (cond |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
858 ((eq (char-after (point)) ?\\) (forward-char 2)) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
859 ((memq (char-after (point)) '(?\" ??)) (forward-sexp 1)))) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
860 (looking-at ";+[\t ]*")) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
861 (error nil)) |
14817
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
862 (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
|
863 (setq comment-fill-prefix |
13802
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
864 (concat (make-string (/ (current-column) 8) ?\t) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
865 (make-string (% (current-column) 8) ?\ ) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
866 (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
|
867 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
868 (if (not has-comment) |
21213 | 869 ;; `paragraph-start' is set here (not in the buffer-local |
870 ;; variable so that `forward-paragraph' et al work as | |
871 ;; expected) so that filling (doc) strings works sensibly. | |
872 ;; Adding the opening paren to avoid the following sexp being | |
873 ;; filled means that sexps generally aren't filled as normal | |
874 ;; text, which is probably sensible. The `;' and `:' stop the | |
875 ;; filled para at following comment lines and keywords | |
876 ;; (typically in `defcustom'). | |
877 (let ((paragraph-start (concat paragraph-start | |
878 "\\|\\s-*[\(;:\"]"))) | |
879 (fill-paragraph justify)) | |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
880 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
881 ;; 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
|
882 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
883 (save-restriction |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
884 (beginning-of-line) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
885 (narrow-to-region |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
886 ;; 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
|
887 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
888 (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
|
889 (looking-at "^[ \t]*;"))) |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
890 ;; 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
|
891 (or (looking-at ".*;") |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
892 (forward-line 1)) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
893 (point)) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
894 ;; 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
|
895 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
896 (while (progn (forward-line 1) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
897 (looking-at "^[ \t]*;"))) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
898 (point))) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
899 |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
900 ;; 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
|
901 (let* ((paragraph-start (concat paragraph-start "\\|[ \t;]*$")) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
902 (paragraph-separate (concat paragraph-start "\\|[ \t;]*$")) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
903 (paragraph-ignore-fill-prefix nil) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
904 (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
|
905 (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
|
906 (save-excursion |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
907 (forward-line 1) (point)))) |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
908 (end (progn |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
909 (forward-paragraph) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
910 (or (bolp) (newline 1)) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
911 (point))) |
14817
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
912 ;; 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
|
913 ;; 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
|
914 (beg (progn (backward-paragraph) |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
915 (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
|
916 (forward-line -1)) |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
917 (point)))) |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
918 (fill-region-as-paragraph beg end |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
919 justify nil |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
920 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
921 (goto-char beg) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
922 (if (looking-at fill-prefix) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
923 nil |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
924 (re-search-forward comment-start-skip) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
925 (point)))))))) |
10629
2c9bdcab7052
(lisp-fill-paragraph): Return t.
Richard M. Stallman <rms@gnu.org>
parents:
10628
diff
changeset
|
926 t)) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
927 |
213 | 928 (defun indent-code-rigidly (start end arg &optional nochange-regexp) |
929 "Indent all lines of code, starting in the region, sideways by ARG columns. | |
930 Does not affect lines starting inside comments or strings, assuming that | |
931 the start of the region is not inside them. | |
932 | |
933 Called from a program, takes args START, END, COLUMNS and NOCHANGE-REGEXP. | |
934 The last is a regexp which, if matched at the beginning of a line, | |
935 means don't indent that line." | |
936 (interactive "r\np") | |
937 (let (state) | |
938 (save-excursion | |
939 (goto-char end) | |
940 (setq end (point-marker)) | |
941 (goto-char start) | |
942 (or (bolp) | |
943 (setq state (parse-partial-sexp (point) | |
944 (progn | |
945 (forward-line 1) (point)) | |
946 nil nil state))) | |
947 (while (< (point) end) | |
948 (or (car (nthcdr 3 state)) | |
949 (and nochange-regexp | |
950 (looking-at nochange-regexp)) | |
951 ;; If line does not start in string, indent it | |
952 (let ((indent (current-indentation))) | |
953 (delete-region (point) (progn (skip-chars-forward " \t") (point))) | |
954 (or (eolp) | |
955 (indent-to (max 0 (+ indent arg)) 0)))) | |
956 (setq state (parse-partial-sexp (point) | |
957 (progn | |
958 (forward-line 1) (point)) | |
959 nil nil state)))))) | |
584 | 960 |
961 (provide 'lisp-mode) | |
962 | |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
963 ;;; lisp-mode.el ends here |