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