Mercurial > emacs
annotate lisp/emacs-lisp/lisp-mode.el @ 26660:4a90f5041fd2
*** empty log message ***
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Tue, 30 Nov 1999 14:15:15 +0000 |
parents | 5984b9cfea66 |
children | 57098e9f96e8 |
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") | |
25703
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
329 (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t)) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
330 (debug-on-error eval-expression-debug-on-error)) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
331 (let ((value |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
332 (eval (let ((stab (syntax-table)) |
17066
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
333 (opoint (point)) |
19057
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
334 ignore-quotes |
17066
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
335 expr) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
336 (unwind-protect |
249 | 337 (save-excursion |
338 (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
|
339 ;; 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
|
340 ;; then ignore the surrounding quotes. |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
341 (setq ignore-quotes |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
342 (or (eq (following-char) ?\') |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
343 (eq (preceding-char) ?\'))) |
249 | 344 (forward-sexp -1) |
25642
556711217681
(eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents:
25630
diff
changeset
|
345 ;; If we were after `?\e' (or similar case), |
556711217681
(eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents:
25630
diff
changeset
|
346 ;; use the whole thing, not just the `e'. |
556711217681
(eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents:
25630
diff
changeset
|
347 (when (eq (preceding-char) ?\\) |
556711217681
(eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents:
25630
diff
changeset
|
348 (forward-char -1) |
556711217681
(eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents:
25630
diff
changeset
|
349 (when (eq (preceding-char) ??) |
556711217681
(eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents:
25630
diff
changeset
|
350 (forward-char -1))) |
1163 | 351 (save-restriction |
19057
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
352 ;; 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
|
353 ;; `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
|
354 ;; name |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
355 (if (and ignore-quotes |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
356 (eq (following-char) ?`)) |
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
357 (forward-char)) |
1163 | 358 (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
|
359 (setq expr (read (current-buffer))) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
360 ;; 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
|
361 ;; 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
|
362 ;; use it. |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
363 (and (consp expr) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
364 (eq (car expr) 'interactive) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
365 (setq expr |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
366 (list 'call-interactively |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
367 (list 'quote |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
368 (list 'lambda |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
369 '(&rest args) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
370 expr |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
371 'args))))) |
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
372 expr)) |
25703
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
373 (set-syntax-table stab)))))) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
374 (let ((print-length eval-expression-print-length) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
375 (print-level eval-expression-print-level)) |
25723
5984b9cfea66
(eval-last-sexp): Use prin1 instead of print.
Gerd Moellmann <gerd@gnu.org>
parents:
25703
diff
changeset
|
376 (prin1 value))))) |
213 | 377 |
25434
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
378 ;; Change defvar into defconst within FORM, |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
379 ;; and likewise for other constructs as necessary. |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
380 (defun eval-defun-1 (form) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
381 (cond ((and (eq (car form) 'defvar) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
382 (cdr-safe (cdr-safe form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
383 ;; Force variable to be bound. |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
384 (cons 'defconst (cdr form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
385 ((and (eq (car form) 'defcustom) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
386 (default-boundp (nth 1 form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
387 ;; Force variable to be bound. |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
388 (set-default (nth 1 form) (eval (nth 2 form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
389 form) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
390 ((eq (car form) 'progn) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
391 (cons 'progn (mapcar 'eval-defun-1 (cdr form)))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
392 (t form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
393 |
2450
17d258d8e8e4
(eval-defun): Rename argument to avoid collision.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
394 (defun eval-defun (eval-defun-arg-internal) |
248 | 395 "Evaluate defun that point is in or before. |
24895 | 396 The value is displayed in the minibuffer. |
397 If the current defun is actually a call to `defvar', | |
398 then reset the variable using the initial value expression | |
399 even if the variable already has some other value. | |
400 \(Normally `defvar' does not change the variable's value | |
401 if it already has a value.\) | |
402 | |
23388
8aa1f99efb66
(eval-defun): Return the evaluation result.
Karl Heuer <kwzh@gnu.org>
parents:
23191
diff
changeset
|
403 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
|
404 Return the result of evaluation." |
213 | 405 (interactive "P") |
25703
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
406 (let ((debug-on-error eval-expression-debug-on-error) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
407 (print-length eval-expression-print-length) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
408 (print-level eval-expression-print-level)) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
409 (save-excursion |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
410 ;; Arrange for eval-region to "read" the (possibly) altered form. |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
411 ;; eval-region handles recording which file defines a function or |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
412 ;; variable. Re-written using `apply' to avoid capturing |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
413 ;; variables like `end'. |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
414 (apply |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
415 #'eval-region |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
416 (let ((standard-output (if eval-defun-arg-internal (current-buffer) t)) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
417 beg end form) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
418 ;; Read the form from the buffer, and record where it ends. |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
419 (save-excursion |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
420 (end-of-defun) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
421 (beginning-of-defun) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
422 (setq beg (point)) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
423 (setq form (read (current-buffer))) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
424 (setq end (point))) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
425 ;; Alter the form if necessary, changing defvar into defconst, etc. |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
426 (setq form (eval-defun-1 (macroexpand form))) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
427 (list beg end standard-output |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
428 `(lambda (ignore) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
429 ;; Skipping to the end of the specified region |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
430 ;; will make eval-region return. |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
431 (goto-char ,end) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
432 ',form)))))) |
25107 | 433 ;; The result of evaluation has been put onto VALUES. So return it. |
434 (car values)) | |
213 | 435 |
436 (defun lisp-comment-indent () | |
437 (if (looking-at "\\s<\\s<\\s<") | |
438 (current-column) | |
439 (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
|
440 (let ((tem (or (calculate-lisp-indent) (current-column)))) |
213 | 441 (if (listp tem) (car tem) tem)) |
442 (skip-chars-backward " \t") | |
443 (max (if (bolp) 0 (1+ (current-column))) | |
444 comment-column)))) | |
445 | |
20333
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
446 (defun lisp-mode-auto-fill () |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
447 (if (> (current-column) (current-fill-column)) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
448 (if (save-excursion |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
449 (nth 4 (parse-partial-sexp (save-excursion |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
450 (beginning-of-defun) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
451 (point)) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
452 (point)))) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
453 (do-auto-fill) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
454 (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
|
455 (do-auto-fill))))) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
456 |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16563
diff
changeset
|
457 (defvar lisp-indent-offset nil "") |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16563
diff
changeset
|
458 (defvar lisp-indent-function 'lisp-indent-function "") |
213 | 459 |
460 (defun lisp-indent-line (&optional whole-exp) | |
461 "Indent current line as Lisp code. | |
462 With argument, indent any additional lines of the same expression | |
463 rigidly along with this one." | |
464 (interactive "P") | |
465 (let ((indent (calculate-lisp-indent)) shift-amt beg end | |
466 (pos (- (point-max) (point)))) | |
467 (beginning-of-line) | |
468 (setq beg (point)) | |
469 (skip-chars-forward " \t") | |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
470 (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
|
471 ;; 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
|
472 ;; or a line that starts in a string. |
677
7a9b4ea68565
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
659
diff
changeset
|
473 (goto-char (- (point-max) pos)) |
213 | 474 (if (and (looking-at "\\s<") (not (looking-at "\\s<\\s<"))) |
475 ;; Single-semicolon comment lines should be indented | |
476 ;; as comment lines, not as code. | |
477 (progn (indent-for-comment) (forward-char -1)) | |
478 (if (listp indent) (setq indent (car indent))) | |
479 (setq shift-amt (- indent (current-column))) | |
480 (if (zerop shift-amt) | |
481 nil | |
482 (delete-region beg (point)) | |
483 (indent-to indent))) | |
484 ;; If initial point was within line's indentation, | |
485 ;; position after the indentation. Else stay at same point in text. | |
486 (if (> (- (point-max) pos) (point)) | |
487 (goto-char (- (point-max) pos))) | |
488 ;; If desired, shift remaining lines of expression the same amount. | |
489 (and whole-exp (not (zerop shift-amt)) | |
490 (save-excursion | |
491 (goto-char beg) | |
492 (forward-sexp 1) | |
493 (setq end (point)) | |
494 (goto-char beg) | |
495 (forward-line 1) | |
496 (setq beg (point)) | |
497 (> end beg)) | |
498 (indent-code-rigidly beg end shift-amt))))) | |
499 | |
9424
738999b0296f
Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9423
diff
changeset
|
500 (defvar calculate-lisp-indent-last-sexp) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
501 |
213 | 502 (defun calculate-lisp-indent (&optional parse-start) |
503 "Return appropriate indentation for current line as Lisp code. | |
504 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
|
505 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
|
506 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
|
507 |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
508 The value can also be a list of the form (COLUMN CONTAINING-SEXP-START). |
213 | 509 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
|
510 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
|
511 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
|
512 is the buffer position of the start of the containing expression." |
213 | 513 (save-excursion |
514 (beginning-of-line) | |
515 (let ((indent-point (point)) | |
516 state paren-depth | |
517 ;; setting this to a number inhibits calling hook | |
518 (desired-indent nil) | |
519 (retry t) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
520 calculate-lisp-indent-last-sexp containing-sexp) |
213 | 521 (if parse-start |
522 (goto-char parse-start) | |
523 (beginning-of-defun)) | |
524 ;; Find outermost containing sexp | |
525 (while (< (point) indent-point) | |
526 (setq state (parse-partial-sexp (point) indent-point 0))) | |
527 ;; Find innermost containing sexp | |
528 (while (and retry | |
529 state | |
530 (> (setq paren-depth (elt state 0)) 0)) | |
531 (setq retry nil) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
532 (setq calculate-lisp-indent-last-sexp (elt state 2)) |
213 | 533 (setq containing-sexp (elt state 1)) |
534 ;; Position following last unclosed open. | |
535 (goto-char (1+ containing-sexp)) | |
536 ;; Is there a complete sexp since then? | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
537 (if (and calculate-lisp-indent-last-sexp |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
538 (> calculate-lisp-indent-last-sexp (point))) |
213 | 539 ;; 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
|
540 (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
|
541 indent-point 0))) |
213 | 542 (if (setq retry (car (cdr peek))) (setq state peek))))) |
543 (if retry | |
544 nil | |
545 ;; Innermost containing sexp found | |
546 (goto-char (1+ containing-sexp)) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
547 (if (not calculate-lisp-indent-last-sexp) |
213 | 548 ;; indent-point immediately follows open paren. |
549 ;; Don't call hook. | |
550 (setq desired-indent (current-column)) | |
551 ;; 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
|
552 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) |
213 | 553 (cond ((looking-at "\\s(") |
554 ;; First element of containing sexp is a list. | |
555 ;; Indent under that list. | |
556 ) | |
557 ((> (save-excursion (forward-line 1) (point)) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
558 calculate-lisp-indent-last-sexp) |
213 | 559 ;; This is the first line to start within the containing sexp. |
560 ;; It's almost certainly a function call. | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
561 (if (= (point) calculate-lisp-indent-last-sexp) |
213 | 562 ;; Containing sexp has nothing before this line |
563 ;; except the first element. Indent under that element. | |
564 nil | |
565 ;; Skip the first element, find start of second (the first | |
566 ;; argument of the function call) and indent under. | |
567 (progn (forward-sexp 1) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
568 (parse-partial-sexp (point) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
569 calculate-lisp-indent-last-sexp |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
570 0 t))) |
213 | 571 (backward-prefix-chars)) |
572 (t | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
573 ;; Indent beneath first sexp on same line as |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
574 ;; calculate-lisp-indent-last-sexp. Again, it's |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
575 ;; almost certainly a function call. |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
576 (goto-char calculate-lisp-indent-last-sexp) |
213 | 577 (beginning-of-line) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
578 (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
|
579 0 t) |
213 | 580 (backward-prefix-chars))))) |
581 ;; 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
|
582 ;; Call indentation hook except when overridden by lisp-indent-offset |
213 | 583 ;; or if the desired indentation has already been computed. |
584 (let ((normal-indent (current-column))) | |
585 (cond ((elt state 3) | |
586 ;; 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
|
587 nil) |
213 | 588 ((and (integerp lisp-indent-offset) containing-sexp) |
589 ;; Indent by constant offset | |
590 (goto-char containing-sexp) | |
591 (+ (current-column) lisp-indent-offset)) | |
592 (desired-indent) | |
593 ((and (boundp 'lisp-indent-function) | |
594 lisp-indent-function | |
595 (not retry)) | |
596 (or (funcall lisp-indent-function indent-point state) | |
597 normal-indent)) | |
598 (t | |
214 | 599 normal-indent)))))) |
213 | 600 |
601 (defun lisp-indent-function (indent-point state) | |
602 (let ((normal-indent (current-column))) | |
603 (goto-char (1+ (elt state 1))) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
604 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) |
213 | 605 (if (and (elt state 2) |
606 (not (looking-at "\\sw\\|\\s_"))) | |
607 ;; car of form doesn't seem to be a a symbol | |
608 (progn | |
609 (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
|
610 calculate-lisp-indent-last-sexp)) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
611 (progn (goto-char calculate-lisp-indent-last-sexp) |
213 | 612 (beginning-of-line) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
613 (parse-partial-sexp (point) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
614 calculate-lisp-indent-last-sexp 0 t))) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
615 ;; 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
|
616 ;; 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
|
617 ;; 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
|
618 ;; inside the innermost containing sexp. |
213 | 619 (backward-prefix-chars) |
620 (current-column)) | |
621 (let ((function (buffer-substring (point) | |
622 (progn (forward-sexp 1) (point)))) | |
623 method) | |
3638
45169f86d3a4
(lisp-indent-function): Look for either
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
624 (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
|
625 (get (intern-soft function) 'lisp-indent-hook))) |
213 | 626 (cond ((or (eq method 'defun) |
627 (and (null method) | |
628 (> (length function) 3) | |
629 (string-match "\\`def" function))) | |
630 (lisp-indent-defform state indent-point)) | |
631 ((integerp method) | |
632 (lisp-indent-specform method state | |
633 indent-point normal-indent)) | |
634 (method | |
635 (funcall method state indent-point))))))) | |
636 | |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16563
diff
changeset
|
637 (defvar lisp-body-indent 2 |
2933
420dfaaacfc5
(lisp-body-indent): Add doc.
Richard M. Stallman <rms@gnu.org>
parents:
2450
diff
changeset
|
638 "Number of columns to indent the second line of a `(def...)' form.") |
213 | 639 |
640 (defun lisp-indent-specform (count state indent-point normal-indent) | |
641 (let ((containing-form-start (elt state 1)) | |
642 (i count) | |
643 body-indent containing-form-column) | |
644 ;; Move to the start of containing form, calculate indentation | |
645 ;; to use for non-distinguished forms (> count), and move past the | |
646 ;; function symbol. lisp-indent-function guarantees that there is at | |
647 ;; least one word or symbol character following open paren of containing | |
648 ;; form. | |
649 (goto-char containing-form-start) | |
650 (setq containing-form-column (current-column)) | |
651 (setq body-indent (+ lisp-body-indent containing-form-column)) | |
652 (forward-char 1) | |
653 (forward-sexp 1) | |
654 ;; Now find the start of the last form. | |
655 (parse-partial-sexp (point) indent-point 1 t) | |
656 (while (and (< (point) indent-point) | |
657 (condition-case () | |
658 (progn | |
659 (setq count (1- count)) | |
660 (forward-sexp 1) | |
661 (parse-partial-sexp (point) indent-point 1 t)) | |
662 (error nil)))) | |
663 ;; Point is sitting on first character of last (or count) sexp. | |
664 (if (> count 0) | |
665 ;; A distinguished form. If it is the first or second form use double | |
666 ;; lisp-body-indent, else normal indent. With lisp-body-indent bound | |
667 ;; to 2 (the default), this just happens to work the same with if as | |
668 ;; the older code, but it makes unwind-protect, condition-case, | |
669 ;; with-output-to-temp-buffer, et. al. much more tasteful. The older, | |
670 ;; less hacked, behavior can be obtained by replacing below with | |
671 ;; (list normal-indent containing-form-start). | |
672 (if (<= (- i count) 1) | |
673 (list (+ containing-form-column (* 2 lisp-body-indent)) | |
674 containing-form-start) | |
675 (list normal-indent containing-form-start)) | |
676 ;; A non-distinguished form. Use body-indent if there are no | |
677 ;; distinguished forms and this is the first undistinguished form, | |
678 ;; or if this is the first undistinguished form and the preceding | |
679 ;; distinguished form has indentation at least as great as body-indent. | |
680 (if (or (and (= i 0) (= count 0)) | |
681 (and (= count 0) (<= body-indent normal-indent))) | |
682 body-indent | |
683 normal-indent)))) | |
684 | |
685 (defun lisp-indent-defform (state indent-point) | |
686 (goto-char (car (cdr state))) | |
687 (forward-line 1) | |
688 (if (> (point) (car (cdr (cdr state)))) | |
689 (progn | |
690 (goto-char (car (cdr state))) | |
691 (+ lisp-body-indent (current-column))))) | |
692 | |
693 | |
694 ;; (put 'progn 'lisp-indent-function 0), say, causes progn to be indented | |
695 ;; like defun if the first form is placed on the next line, otherwise | |
696 ;; it is indented like any other form (i.e. forms line up under first). | |
697 | |
698 (put 'lambda 'lisp-indent-function 'defun) | |
699 (put 'autoload 'lisp-indent-function 'defun) | |
700 (put 'progn 'lisp-indent-function 0) | |
701 (put 'prog1 'lisp-indent-function 1) | |
702 (put 'prog2 'lisp-indent-function 2) | |
703 (put 'save-excursion 'lisp-indent-function 0) | |
704 (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
|
705 (put 'save-selected-window 'lisp-indent-function 0) |
213 | 706 (put 'save-restriction 'lisp-indent-function 0) |
1163 | 707 (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
|
708 (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
|
709 (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
|
710 (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
|
711 (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
|
712 (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
|
713 (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
|
714 (put 'with-temp-message 'lisp-indent-function 1) |
213 | 715 (put 'let 'lisp-indent-function 1) |
716 (put 'let* 'lisp-indent-function 1) | |
717 (put 'while 'lisp-indent-function 1) | |
718 (put 'if 'lisp-indent-function 2) | |
719 (put 'catch 'lisp-indent-function 1) | |
720 (put 'condition-case 'lisp-indent-function 2) | |
721 (put 'unwind-protect 'lisp-indent-function 1) | |
722 (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
|
723 (put 'eval-after-load 'lisp-indent-function 1) |
213 | 724 |
725 (defun indent-sexp (&optional endpos) | |
726 "Indent each line of the list starting just after point. | |
727 If optional arg ENDPOS is given, indent each line, stopping when | |
728 ENDPOS is encountered." | |
729 (interactive) | |
727 | 730 (let ((indent-stack (list nil)) |
731 (next-depth 0) | |
10594
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
732 ;; 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
|
733 ;; 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
|
734 ;; 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
|
735 ;; 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
|
736 ;; 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
|
737 (starting-point (if endpos nil (point))) |
727 | 738 (last-point (point)) |
739 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
|
740 (or endpos |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
741 ;; 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
|
742 (save-excursion (forward-sexp 1))) |
213 | 743 (save-excursion |
744 (setq outer-loop-done nil) | |
745 (while (if endpos (< (point) endpos) | |
746 (not outer-loop-done)) | |
747 (setq last-depth next-depth | |
748 inner-loop-done nil) | |
749 ;; Parse this line so we can learn the state | |
750 ;; to indent the next line. | |
751 ;; This inner loop goes through only once | |
752 ;; unless a line ends inside a string. | |
753 (while (and (not inner-loop-done) | |
754 (not (setq outer-loop-done (eobp)))) | |
755 (setq state (parse-partial-sexp (point) (progn (end-of-line) (point)) | |
756 nil nil state)) | |
757 (setq next-depth (car state)) | |
758 ;; If the line contains a comment other than the sort | |
759 ;; that is indented like code, | |
760 ;; indent it now with indent-for-comment. | |
761 ;; Comments indented like code are right already. | |
762 ;; In any case clear the in-comment flag in the state | |
763 ;; because parse-partial-sexp never sees the newlines. | |
764 (if (car (nthcdr 4 state)) | |
765 (progn (indent-for-comment) | |
766 (end-of-line) | |
767 (setcar (nthcdr 4 state) nil))) | |
768 ;; If this line ends inside a string, | |
769 ;; go straight to next line, remaining within the inner loop, | |
770 ;; and turn off the \-flag. | |
771 (if (car (nthcdr 3 state)) | |
772 (progn | |
773 (forward-line 1) | |
774 (setcar (nthcdr 5 state) nil)) | |
775 (setq inner-loop-done t))) | |
776 (and endpos | |
727 | 777 (<= next-depth 0) |
778 (progn | |
779 (setq indent-stack (append indent-stack | |
780 (make-list (- next-depth) nil)) | |
781 last-depth (- last-depth next-depth) | |
782 next-depth 0))) | |
10594
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
783 (or outer-loop-done endpos |
213 | 784 (setq outer-loop-done (<= next-depth 0))) |
785 (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
|
786 (forward-line 1) |
213 | 787 (while (> last-depth next-depth) |
788 (setq indent-stack (cdr indent-stack) | |
789 last-depth (1- last-depth))) | |
790 (while (< last-depth next-depth) | |
791 (setq indent-stack (cons nil indent-stack) | |
792 last-depth (1+ last-depth))) | |
793 ;; Now go to the next line and indent it according | |
794 ;; to what we learned from parsing the previous one. | |
795 (forward-line 1) | |
796 (setq bol (point)) | |
797 (skip-chars-forward " \t") | |
798 ;; But not if the line is blank, or just a comment | |
799 ;; (except for double-semi comments; indent them as usual). | |
800 (if (or (eobp) (looking-at "\\s<\\|\n")) | |
801 nil | |
802 (if (and (car indent-stack) | |
803 (>= (car indent-stack) 0)) | |
804 (setq this-indent (car indent-stack)) | |
805 (let ((val (calculate-lisp-indent | |
806 (if (car indent-stack) (- (car indent-stack)) | |
727 | 807 starting-point)))) |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
808 (if (null val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
809 (setq this-indent val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
810 (if (integerp val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
811 (setcar indent-stack |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
812 (setq this-indent val)) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
813 (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
|
814 (setq this-indent (car val)))))) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
815 (if (and this-indent (/= (current-column) this-indent)) |
213 | 816 (progn (delete-region bol (point)) |
817 (indent-to this-indent))))) | |
818 (or outer-loop-done | |
819 (setq outer-loop-done (= (point) last-point)) | |
820 (setq last-point (point))))))) | |
821 | |
822 ;; Indent every line whose first char is between START and END inclusive. | |
823 (defun lisp-indent-region (start end) | |
824 (save-excursion | |
825 (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
|
826 (goto-char start) |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
827 (and (bolp) (not (eolp)) |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
828 (lisp-indent-line)) |
213 | 829 (indent-sexp endmark) |
830 (set-marker endmark nil)))) | |
831 | |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
832 ;;;; Lisp paragraph filling commands. |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
833 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
834 (defun lisp-fill-paragraph (&optional justify) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
835 "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
|
836 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
|
837 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
|
838 and initial semicolons." |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
839 (interactive "P") |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
840 (let ( |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
841 ;; 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
|
842 has-comment |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
843 |
14817
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
844 ;; 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
|
845 has-code-and-comment |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
846 |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
847 ;; 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
|
848 comment-fill-prefix |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
849 ) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
850 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
851 ;; 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
|
852 (save-excursion |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
853 (beginning-of-line) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
854 (cond |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
855 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
856 ;; 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
|
857 ((looking-at "[ \t]*;[; \t]*") |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
858 (setq has-comment t |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
859 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
|
860 (match-end 0)))) |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
861 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
862 ;; 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
|
863 ;; 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
|
864 ;; character. |
13802
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
865 ((condition-case nil |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
866 (save-restriction |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
867 (narrow-to-region (point-min) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
868 (save-excursion (end-of-line) (point))) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
869 (while (not (looking-at ";\\|$")) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
870 (skip-chars-forward "^;\n\"\\\\?") |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
871 (cond |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
872 ((eq (char-after (point)) ?\\) (forward-char 2)) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
873 ((memq (char-after (point)) '(?\" ??)) (forward-sexp 1)))) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
874 (looking-at ";+[\t ]*")) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
875 (error nil)) |
14817
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
876 (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
|
877 (setq comment-fill-prefix |
13802
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
878 (concat (make-string (/ (current-column) 8) ?\t) |
8107433d6a22
(lisp-fill-paragraph): Several changes.
Karl Heuer <kwzh@gnu.org>
parents:
13504
diff
changeset
|
879 (make-string (% (current-column) 8) ?\ ) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
880 (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
|
881 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
882 (if (not has-comment) |
21213 | 883 ;; `paragraph-start' is set here (not in the buffer-local |
884 ;; variable so that `forward-paragraph' et al work as | |
885 ;; expected) so that filling (doc) strings works sensibly. | |
886 ;; Adding the opening paren to avoid the following sexp being | |
887 ;; filled means that sexps generally aren't filled as normal | |
888 ;; text, which is probably sensible. The `;' and `:' stop the | |
889 ;; filled para at following comment lines and keywords | |
890 ;; (typically in `defcustom'). | |
891 (let ((paragraph-start (concat paragraph-start | |
892 "\\|\\s-*[\(;:\"]"))) | |
893 (fill-paragraph justify)) | |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
894 |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
895 ;; 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
|
896 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
897 (save-restriction |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
898 (beginning-of-line) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
899 (narrow-to-region |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
900 ;; 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
|
901 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
902 (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
|
903 (looking-at "^[ \t]*;"))) |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
904 ;; 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
|
905 (or (looking-at ".*;") |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
906 (forward-line 1)) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
907 (point)) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
908 ;; 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
|
909 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
910 (while (progn (forward-line 1) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
911 (looking-at "^[ \t]*;"))) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
912 (point))) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
913 |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
914 ;; 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
|
915 (let* ((paragraph-start (concat paragraph-start "\\|[ \t;]*$")) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
916 (paragraph-separate (concat paragraph-start "\\|[ \t;]*$")) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
917 (paragraph-ignore-fill-prefix nil) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
918 (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
|
919 (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
|
920 (save-excursion |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
921 (forward-line 1) (point)))) |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
922 (end (progn |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
923 (forward-paragraph) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
924 (or (bolp) (newline 1)) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
925 (point))) |
14817
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
926 ;; 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
|
927 ;; 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
|
928 (beg (progn (backward-paragraph) |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
929 (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
|
930 (forward-line -1)) |
cdd8a024f000
(lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
931 (point)))) |
14628
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
932 (fill-region-as-paragraph beg end |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
933 justify nil |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
934 (save-excursion |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
935 (goto-char beg) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
936 (if (looking-at fill-prefix) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
937 nil |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
938 (re-search-forward comment-start-skip) |
c932ad13ccd9
(lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents:
14495
diff
changeset
|
939 (point)))))))) |
10629
2c9bdcab7052
(lisp-fill-paragraph): Return t.
Richard M. Stallman <rms@gnu.org>
parents:
10628
diff
changeset
|
940 t)) |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
941 |
213 | 942 (defun indent-code-rigidly (start end arg &optional nochange-regexp) |
943 "Indent all lines of code, starting in the region, sideways by ARG columns. | |
944 Does not affect lines starting inside comments or strings, assuming that | |
945 the start of the region is not inside them. | |
946 | |
947 Called from a program, takes args START, END, COLUMNS and NOCHANGE-REGEXP. | |
948 The last is a regexp which, if matched at the beginning of a line, | |
949 means don't indent that line." | |
950 (interactive "r\np") | |
951 (let (state) | |
952 (save-excursion | |
953 (goto-char end) | |
954 (setq end (point-marker)) | |
955 (goto-char start) | |
956 (or (bolp) | |
957 (setq state (parse-partial-sexp (point) | |
958 (progn | |
959 (forward-line 1) (point)) | |
960 nil nil state))) | |
961 (while (< (point) end) | |
962 (or (car (nthcdr 3 state)) | |
963 (and nochange-regexp | |
964 (looking-at nochange-regexp)) | |
965 ;; If line does not start in string, indent it | |
966 (let ((indent (current-indentation))) | |
967 (delete-region (point) (progn (skip-chars-forward " \t") (point))) | |
968 (or (eolp) | |
969 (indent-to (max 0 (+ indent arg)) 0)))) | |
970 (setq state (parse-partial-sexp (point) | |
971 (progn | |
972 (forward-line 1) (point)) | |
973 nil nil state)))))) | |
584 | 974 |
975 (provide 'lisp-mode) | |
976 | |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
977 ;;; lisp-mode.el ends here |