Mercurial > emacs
annotate lisp/emacs-lisp/lisp-mode.el @ 57363:ef5d2ed6459e
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-603
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-44
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 07 Oct 2004 05:53:41 +0000 |
parents | 5418c6e288fc |
children | 3493253e6b69 cce1c0ee76ee |
rev | line source |
---|---|
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
38315
diff
changeset
|
1 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
2 |
54315
cad9b29a5224
(lisp-mode-variables): Set it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53922
diff
changeset
|
3 ;; Copyright (C) 1985,86,1999,2000,01,03,2004 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) | |
50677
152c21ba1618
(emacs-lisp-mode-syntax-table): Give @ prefix syntax.
Richard M. Stallman <rms@gnu.org>
parents:
50585
diff
changeset
|
62 (modify-syntax-entry ?@ "' " table) |
213 | 63 ;; Used to be singlequote; changed for flonums. |
27809 | 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) | |
70 (modify-syntax-entry ?\[ "(] " table) | |
27814
f2abbe1d6b47
Don't change syntax of multibyte
Kenichi Handa <handa@m17n.org>
parents:
27809
diff
changeset
|
71 (modify-syntax-entry ?\] ")[ " table)) |
27809 | 72 table)) |
213 | 73 |
27809 | 74 (defvar lisp-mode-syntax-table |
75 (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table))) | |
76 (modify-syntax-entry ?\[ "_ " table) | |
77 (modify-syntax-entry ?\] "_ " table) | |
78 (modify-syntax-entry ?# "' 14bn" table) | |
27934
8c28c1c31e9b
(lisp-mode-syntax-table): Fix syntax of |.
Dave Love <fx@gnu.org>
parents:
27814
diff
changeset
|
79 (modify-syntax-entry ?| "\" 23b" table) |
27809 | 80 table)) |
285 | 81 |
213 | 82 (define-abbrev-table 'lisp-mode-abbrev-table ()) |
83 | |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
84 (defvar lisp-imenu-generic-expression |
27809 | 85 (list |
35279
139991123d49
(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents:
34366
diff
changeset
|
86 (list nil |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
87 (purecopy (concat "^\\s-*(" |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
88 (eval-when-compile |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
89 (regexp-opt |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
90 '("defun" "defun*" "defsubst" "defmacro" |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
91 "defadvice" "define-skeleton" |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
92 "define-minor-mode" "define-derived-mode" |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
93 "define-compiler-macro" "define-modify-macro" |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
94 "defsetf" "define-setf-expander" |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
95 "define-method-combination" |
40790
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
96 "defgeneric" "defmethod") t)) |
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
97 "\\s-+\\(\\sw\\(\\sw\\|\\s_\\)+\\)")) |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
98 2) |
35279
139991123d49
(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents:
34366
diff
changeset
|
99 (list (purecopy "Variables") |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
100 (purecopy (concat "^\\s-*(" |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
101 (eval-when-compile |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
102 (regexp-opt |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
103 '("defvar" "defconst" "defconstant" "defcustom" |
40790
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
104 "defparameter" "define-symbol-macro") t)) |
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
105 "\\s-+\\(\\sw\\(\\sw\\|\\s_\\)+\\)")) |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
106 2) |
35279
139991123d49
(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents:
34366
diff
changeset
|
107 (list (purecopy "Types") |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
108 (purecopy (concat "^\\s-*(" |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
109 (eval-when-compile |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
110 (regexp-opt |
49522
4dd5da1ea3dc
* font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents:
48127
diff
changeset
|
111 '("defgroup" "deftheme" "deftype" "defstruct" |
4dd5da1ea3dc
* font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents:
48127
diff
changeset
|
112 "defclass" "define-condition" "define-widget" |
4dd5da1ea3dc
* font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents:
48127
diff
changeset
|
113 "defface" "defpackage") t)) |
40790
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
114 "\\s-+'?\\(\\sw\\(\\sw\\|\\s_\\)+\\)")) |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
115 2)) |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
116 |
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
117 "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
|
118 |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
119 ;; This was originally in autoload.el and is still used there. |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
120 (put 'autoload 'doc-string-elt 3) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
121 (put 'defun 'doc-string-elt 3) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
122 (put 'defun* 'doc-string-elt 3) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
123 (put 'defvar 'doc-string-elt 3) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
124 (put 'defcustom 'doc-string-elt 3) |
49522
4dd5da1ea3dc
* font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents:
48127
diff
changeset
|
125 (put 'deftheme 'doc-string-elt 2) |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
126 (put 'defconst 'doc-string-elt 3) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
127 (put 'defmacro 'doc-string-elt 3) |
41812
fb0d648feaa6
(toplevel): Define docstring offset for `defmacro*'.
Colin Walters <walters@gnu.org>
parents:
41702
diff
changeset
|
128 (put 'defmacro* 'doc-string-elt 3) |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
129 (put 'defsubst 'doc-string-elt 3) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
130 (put 'define-skeleton 'doc-string-elt 2) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
131 (put 'define-derived-mode 'doc-string-elt 4) |
56996
5418c6e288fc
(define-compilation-mode): Specify `doc-string-elt' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56840
diff
changeset
|
132 (put 'define-compilation-mode 'doc-string-elt 3) |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
133 (put 'easy-mmode-define-minor-mode 'doc-string-elt 2) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
134 (put 'define-minor-mode 'doc-string-elt 2) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
135 (put 'define-generic-mode 'doc-string-elt 7) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
136 ;; define-global-mode has no explicit docstring. |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
137 (put 'easy-mmode-define-global-mode 'doc-string-elt 0) |
49522
4dd5da1ea3dc
* font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents:
48127
diff
changeset
|
138 (put 'define-ibuffer-filter 'doc-string-elt 2) |
42699
1da0dfa86ab5
Handle define-ibuffer-column, define-ibuffer-filter,
Colin Walters <walters@gnu.org>
parents:
42235
diff
changeset
|
139 (put 'define-ibuffer-op 'doc-string-elt 3) |
49522
4dd5da1ea3dc
* font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents:
48127
diff
changeset
|
140 (put 'define-ibuffer-sorter 'doc-string-elt 2) |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
141 |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
142 (defun lisp-font-lock-syntactic-face-function (state) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
143 (if (nth 3 state) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
144 (if (and (eq (nth 0 state) 1) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
145 ;; This might be a docstring. |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
146 (save-excursion |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
147 (let ((n 0)) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
148 (goto-char (nth 8 state)) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
149 (condition-case nil |
51261
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
150 (while (and (not (bobp)) |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
151 (progn (backward-sexp 1) (setq n (1+ n))))) |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
152 (scan-error nil)) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
153 (when (> n 0) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
154 (let ((sym (intern-soft |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
155 (buffer-substring |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
156 (point) (progn (forward-sexp 1) (point)))))) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
157 (eq n (or (get sym 'doc-string-elt) 3))))))) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
158 font-lock-doc-face |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
159 font-lock-string-face) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
160 font-lock-comment-face)) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
161 |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
162 ;; The LISP-SYNTAX argument is used by code in inf-lisp.el and is |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
163 ;; (uselessly) passed from pp.el, chistory.el, gnus-kill.el and score-mode.el |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
164 (defun lisp-mode-variables (&optional lisp-syntax) |
40790
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
165 (when lisp-syntax |
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
166 (set-syntax-table lisp-mode-syntax-table)) |
213 | 167 (setq local-abbrev-table lisp-mode-abbrev-table) |
168 (make-local-variable 'paragraph-ignore-fill-prefix) | |
169 (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
|
170 (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
|
171 (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
|
172 ;; 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
|
173 ;; 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
|
174 ;; because lisp-fill-paragraph should do the job. |
40790
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
175 ;; I believe that newcomment's auto-fill code properly deals with it -stef |
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
176 ;;(set (make-local-variable 'adaptive-fill-mode) nil) |
213 | 177 (make-local-variable 'indent-line-function) |
178 (setq indent-line-function 'lisp-indent-line) | |
179 (make-local-variable 'indent-region-function) | |
180 (setq indent-region-function 'lisp-indent-region) | |
181 (make-local-variable 'parse-sexp-ignore-comments) | |
182 (setq parse-sexp-ignore-comments t) | |
6076
4f76564fc2cd
(lisp-mode-variables): Set outline-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
5103
diff
changeset
|
183 (make-local-variable 'outline-regexp) |
53922
6a3ed3adac17
(lisp-mode-variables): Adapt outline-regexp to the new conventions for
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
184 (setq outline-regexp ";;;;* [^ \t\n]\\|(") |
26682
57098e9f96e8
(lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents:
25723
diff
changeset
|
185 (make-local-variable 'outline-level) |
57098e9f96e8
(lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents:
25723
diff
changeset
|
186 (setq outline-level 'lisp-outline-level) |
213 | 187 (make-local-variable 'comment-start) |
188 (setq comment-start ";") | |
189 (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
|
190 ;; 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
|
191 ;; 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
|
192 (setq comment-start-skip "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *") |
28994
0388cb689633
(lisp-mode-variables): Set comment-add.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28324
diff
changeset
|
193 (make-local-variable 'comment-add) |
0388cb689633
(lisp-mode-variables): Set comment-add.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28324
diff
changeset
|
194 (setq comment-add 1) ;default to `;;' in comment-region |
213 | 195 (make-local-variable 'comment-column) |
196 (setq comment-column 40) | |
54315
cad9b29a5224
(lisp-mode-variables): Set it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53922
diff
changeset
|
197 ;; Don't get confused by `;' in doc strings when paragraph-filling. |
cad9b29a5224
(lisp-mode-variables): Set it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53922
diff
changeset
|
198 (set (make-local-variable 'comment-use-global-state) t) |
12701
c50826e44362
(lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents:
12682
diff
changeset
|
199 (make-local-variable 'imenu-generic-expression) |
27814
f2abbe1d6b47
Don't change syntax of multibyte
Kenichi Handa <handa@m17n.org>
parents:
27809
diff
changeset
|
200 (setq imenu-generic-expression lisp-imenu-generic-expression) |
f2abbe1d6b47
Don't change syntax of multibyte
Kenichi Handa <handa@m17n.org>
parents:
27809
diff
changeset
|
201 (make-local-variable 'multibyte-syntax-as-symbol) |
33467
09da172d93be
(lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33238
diff
changeset
|
202 (setq multibyte-syntax-as-symbol t) |
41512
4f4835967793
(lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41509
diff
changeset
|
203 (set (make-local-variable 'syntax-begin-function) 'beginning-of-defun) |
33467
09da172d93be
(lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33238
diff
changeset
|
204 (setq font-lock-defaults |
09da172d93be
(lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33238
diff
changeset
|
205 '((lisp-font-lock-keywords |
09da172d93be
(lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33238
diff
changeset
|
206 lisp-font-lock-keywords-1 lisp-font-lock-keywords-2) |
54501
96f7b2598aa3
(lisp-mode-variables): Don't set
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54315
diff
changeset
|
207 nil nil (("+-*/.<>=!?$%_&~^:" . "w")) nil |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
208 (font-lock-mark-block-function . mark-defun) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
209 (font-lock-syntactic-face-function |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
210 . lisp-font-lock-syntactic-face-function)))) |
26682
57098e9f96e8
(lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents:
25723
diff
changeset
|
211 |
57098e9f96e8
(lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents:
25723
diff
changeset
|
212 (defun lisp-outline-level () |
57098e9f96e8
(lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents:
25723
diff
changeset
|
213 "Lisp mode `outline-level' function." |
54501
96f7b2598aa3
(lisp-mode-variables): Don't set
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54315
diff
changeset
|
214 (if (looking-at "(\\|;;;###autoload") |
26682
57098e9f96e8
(lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents:
25723
diff
changeset
|
215 1000 |
57098e9f96e8
(lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents:
25723
diff
changeset
|
216 (looking-at outline-regexp) |
57098e9f96e8
(lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents:
25723
diff
changeset
|
217 (- (match-end 0) (match-beginning 0)))) |
57098e9f96e8
(lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents:
25723
diff
changeset
|
218 |
35279
139991123d49
(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents:
34366
diff
changeset
|
219 |
33467
09da172d93be
(lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33238
diff
changeset
|
220 (defvar lisp-mode-shared-map |
09da172d93be
(lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33238
diff
changeset
|
221 (let ((map (make-sparse-keymap))) |
38315
d34fd7c9092b
(lisp-mode-shared-map): Bind TAB
Gerd Moellmann <gerd@gnu.org>
parents:
38169
diff
changeset
|
222 (define-key map "\t" 'lisp-indent-line) |
33467
09da172d93be
(lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33238
diff
changeset
|
223 (define-key map "\e\C-q" 'indent-sexp) |
09da172d93be
(lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33238
diff
changeset
|
224 (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
|
225 ;; 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
|
226 ;; 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
|
227 ;; 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
|
228 ;;;(define-key map [backspace] 'backward-delete-char-untabify) |
33467
09da172d93be
(lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33238
diff
changeset
|
229 map) |
213 | 230 "Keymap for commands shared by all sorts of Lisp modes.") |
231 | |
232 (defvar emacs-lisp-mode-map () | |
233 "Keymap for Emacs Lisp mode. | |
32294
a6eff9b566ae
(lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents:
30666
diff
changeset
|
234 All commands in `lisp-mode-shared-map' are inherited by this map.") |
213 | 235 |
236 (if emacs-lisp-mode-map | |
237 () | |
12035
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
238 (let ((map (make-sparse-keymap "Emacs-Lisp"))) |
21116
ccf251830c66
(lisp-interaction-mode-map)
Richard M. Stallman <rms@gnu.org>
parents:
20459
diff
changeset
|
239 (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
|
240 (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
|
241 (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
|
242 (define-key emacs-lisp-mode-map "\e\C-x" 'eval-defun) |
55805
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
243 (define-key emacs-lisp-mode-map "\e\C-q" 'indent-pp-sexp) |
12035
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
244 (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
|
245 (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
|
246 (cons "Emacs-Lisp" map)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
247 (define-key map [edebug-defun] |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
248 '("Instrument Function for Debugging" . edebug-defun)) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
249 (define-key map [byte-recompile] |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
250 '("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
|
251 (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
|
252 '("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
|
253 (define-key map [byte-compile] |
12035
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
254 '("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
|
255 (define-key map [separator-eval] '("--")) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
256 (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
|
257 (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
|
258 (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
|
259 (define-key map [separator-format] '("--")) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
260 (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
|
261 (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
|
262 (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
|
263 (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
|
264 (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
|
265 (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
|
266 |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
267 (defun emacs-lisp-byte-compile () |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
268 "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
|
269 (interactive) |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
270 (if buffer-file-name |
c3747e64cff0
(emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents:
10968
diff
changeset
|
271 (byte-compile-file buffer-file-name) |
14116
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
272 (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
|
273 |
14719
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
274 (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
|
275 "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
|
276 (interactive) |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
277 (or buffer-file-name |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
278 (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
|
279 (require 'bytecomp) |
5f985037b64f
(emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents:
13802
diff
changeset
|
280 ;; 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
|
281 (if (and (buffer-modified-p) |
27809 | 282 (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
|
283 (save-buffer)) |
d477c6f756df
Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents:
14628
diff
changeset
|
284 (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
|
285 (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
|
286 (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
|
287 (byte-compile-file buffer-file-name t)))) |
213 | 288 |
25630
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
289 (defcustom emacs-lisp-mode-hook nil |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
290 "Hook run when entering Emacs Lisp mode." |
27809 | 291 :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
|
292 :type 'hook |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
293 :group 'lisp) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
294 |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
295 (defcustom lisp-mode-hook nil |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
296 "Hook run when entering Lisp mode." |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
297 :options '(imenu-add-menubar-index) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
298 :type 'hook |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
299 :group 'lisp) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
300 |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
301 (defcustom lisp-interaction-mode-hook nil |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
302 "Hook run when entering Lisp Interaction mode." |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
303 :options '(turn-on-eldoc-mode) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
304 :type 'hook |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
305 :group 'lisp) |
4feb8ce584a5
(lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents:
25434
diff
changeset
|
306 |
41332
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
307 (defun emacs-lisp-mode () |
213 | 308 "Major mode for editing Lisp code to run in Emacs. |
309 Commands: | |
310 Delete converts tabs to spaces as it moves back. | |
311 Blank lines separate paragraphs. Semicolons start comments. | |
312 \\{emacs-lisp-mode-map} | |
313 Entry to this mode calls the value of `emacs-lisp-mode-hook' | |
314 if that value is non-nil." | |
41332
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
315 (interactive) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
316 (kill-all-local-variables) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
317 (use-local-map emacs-lisp-mode-map) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
318 (set-syntax-table emacs-lisp-mode-syntax-table) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
319 (setq major-mode 'emacs-lisp-mode) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
320 (setq mode-name "Emacs-Lisp") |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
321 (lisp-mode-variables) |
41332
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
322 (setq imenu-case-fold-search nil) |
51981
e363b422bcd4
(emacs-lisp-mode): Use run-mode-hooks.
Richard M. Stallman <rms@gnu.org>
parents:
51439
diff
changeset
|
323 (run-mode-hooks 'emacs-lisp-mode-hook)) |
51261
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
324 (put 'emacs-lisp-mode 'custom-mode-group 'lisp) |
213 | 325 |
27809 | 326 (defvar lisp-mode-map |
327 (let ((map (make-sparse-keymap))) | |
32294
a6eff9b566ae
(lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents:
30666
diff
changeset
|
328 (set-keymap-parent map lisp-mode-shared-map) |
27809 | 329 (define-key map "\e\C-x" 'lisp-eval-defun) |
330 (define-key map "\C-c\C-z" 'run-lisp) | |
331 map) | |
213 | 332 "Keymap for ordinary Lisp mode. |
32294
a6eff9b566ae
(lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents:
30666
diff
changeset
|
333 All commands in `lisp-mode-shared-map' are inherited by this map.") |
213 | 334 |
41332
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
335 (defun lisp-mode () |
213 | 336 "Major mode for editing Lisp code for Lisps other than GNU Emacs Lisp. |
337 Commands: | |
338 Delete converts tabs to spaces as it moves back. | |
339 Blank lines separate paragraphs. Semicolons start comments. | |
340 \\{lisp-mode-map} | |
341 Note that `run-lisp' may be used either to start an inferior Lisp job | |
342 or to switch back to an existing one. | |
343 | |
344 Entry to this mode calls the value of `lisp-mode-hook' | |
345 if that value is non-nil." | |
41332
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
346 (interactive) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
347 (kill-all-local-variables) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
348 (use-local-map lisp-mode-map) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
349 (setq major-mode 'lisp-mode) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
350 (setq mode-name "Lisp") |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
351 (lisp-mode-variables) |
41332
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
352 (make-local-variable 'comment-start-skip) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
353 (setq comment-start-skip |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
354 "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *") |
41332
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
355 (make-local-variable 'font-lock-keywords-case-fold-search) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
356 (setq font-lock-keywords-case-fold-search t) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
357 (setq imenu-case-fold-search t) |
15d7e3180dcf
(lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents:
41310
diff
changeset
|
358 (set-syntax-table lisp-mode-syntax-table) |
51981
e363b422bcd4
(emacs-lisp-mode): Use run-mode-hooks.
Richard M. Stallman <rms@gnu.org>
parents:
51439
diff
changeset
|
359 (run-mode-hooks 'lisp-mode-hook)) |
55773
6010b740e1d0
(lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents:
55521
diff
changeset
|
360 (put 'lisp-mode 'find-tag-default-function 'lisp-find-tag-default) |
6010b740e1d0
(lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents:
55521
diff
changeset
|
361 |
6010b740e1d0
(lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents:
55521
diff
changeset
|
362 (defun lisp-find-tag-default () |
6010b740e1d0
(lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents:
55521
diff
changeset
|
363 (let ((default (find-tag-default))) |
6010b740e1d0
(lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents:
55521
diff
changeset
|
364 (when (stringp default) |
6010b740e1d0
(lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents:
55521
diff
changeset
|
365 (if (string-match ":+" default) |
6010b740e1d0
(lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents:
55521
diff
changeset
|
366 (substring default (match-end 0)) |
56829 | 367 default)))) |
213 | 368 |
52288 | 369 ;; Used in old LispM code. |
370 (defalias 'common-lisp-mode 'lisp-mode) | |
371 | |
28324
979a905864ab
(lisp-eval-defun): Make arglist compatible with inf-lisp version.
Dave Love <fx@gnu.org>
parents:
27934
diff
changeset
|
372 ;; 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
|
373 (defun lisp-eval-defun (&optional and-go) |
213 | 374 "Send the current defun to the Lisp process made by \\[run-lisp]." |
375 (interactive) | |
376 (error "Process lisp does not exist")) | |
377 | |
27809 | 378 (defvar lisp-interaction-mode-map |
379 (let ((map (make-sparse-keymap))) | |
32294
a6eff9b566ae
(lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents:
30666
diff
changeset
|
380 (set-keymap-parent map lisp-mode-shared-map) |
27809 | 381 (define-key map "\e\C-x" 'eval-defun) |
55805
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
382 (define-key map "\e\C-q" 'indent-pp-sexp) |
27809 | 383 (define-key map "\e\t" 'lisp-complete-symbol) |
384 (define-key map "\n" 'eval-print-last-sexp) | |
385 map) | |
23738
2ef2813414b6
(lisp-interaction-mode-map): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23723
diff
changeset
|
386 "Keymap for Lisp Interaction mode. |
32294
a6eff9b566ae
(lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents:
30666
diff
changeset
|
387 All commands in `lisp-mode-shared-map' are inherited by this map.") |
213 | 388 |
41512
4f4835967793
(lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41509
diff
changeset
|
389 (defvar lisp-interaction-mode-abbrev-table lisp-mode-abbrev-table) |
33467
09da172d93be
(lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33238
diff
changeset
|
390 (define-derived-mode lisp-interaction-mode emacs-lisp-mode "Lisp Interaction" |
213 | 391 "Major mode for typing and evaluating Lisp forms. |
392 Like Lisp mode except that \\[eval-print-last-sexp] evals the Lisp expression | |
393 before point, and prints its value into the buffer, advancing point. | |
41085 | 394 Note that printing is controlled by `eval-expression-print-length' |
37640
a4403e99257a
(lisp-interaction-mode): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
35638
diff
changeset
|
395 and `eval-expression-print-level'. |
213 | 396 |
397 Commands: | |
398 Delete converts tabs to spaces as it moves back. | |
399 Paragraphs are separated only by blank lines. | |
400 Semicolons start comments. | |
401 \\{lisp-interaction-mode-map} | |
402 Entry to this mode calls the value of `lisp-interaction-mode-hook' | |
41512
4f4835967793
(lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41509
diff
changeset
|
403 if that value is non-nil.") |
213 | 404 |
248 | 405 (defun eval-print-last-sexp () |
38560
df8cff64f0f3
(eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents:
38412
diff
changeset
|
406 "Evaluate sexp before point; print value into current buffer. |
df8cff64f0f3
(eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents:
38412
diff
changeset
|
407 |
df8cff64f0f3
(eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents:
38412
diff
changeset
|
408 Note that printing the result is controlled by the variables |
df8cff64f0f3
(eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents:
38412
diff
changeset
|
409 `eval-expression-print-length' and `eval-expression-print-level', |
df8cff64f0f3
(eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents:
38412
diff
changeset
|
410 which see." |
248 | 411 (interactive) |
422 | 412 (let ((standard-output (current-buffer))) |
413 (terpri) | |
414 (eval-last-sexp t) | |
415 (terpri))) | |
35279
139991123d49
(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents:
34366
diff
changeset
|
416 |
38572
107f826252d2
(last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38566
diff
changeset
|
417 |
38585
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
418 (defun last-sexp-setup-props (beg end value alt1 alt2) |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
419 "Set up text properties for the output of `eval-last-sexp-1'. |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
420 BEG and END are the start and end of the output in current-buffer. |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49522
diff
changeset
|
421 VALUE is the Lisp value printed, ALT1 and ALT2 are strings for the |
38585
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
422 alternative printed representations that can be displayed." |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
423 (let ((map (make-sparse-keymap))) |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
424 (define-key map "\C-m" 'last-sexp-toggle-display) |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
425 (define-key map [down-mouse-2] 'mouse-set-point) |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
426 (define-key map [mouse-2] 'last-sexp-toggle-display) |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
427 (add-text-properties |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49522
diff
changeset
|
428 beg end |
38585
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
429 `(printed-value (,value ,alt1 ,alt2) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49522
diff
changeset
|
430 mouse-face highlight |
38585
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
431 keymap ,map |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
432 help-echo "RET, mouse-2: toggle abbreviated display" |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
433 rear-nonsticky (mouse-face keymap help-echo |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
434 printed-value))))) |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
435 |
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
436 |
50503
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
437 (defun last-sexp-toggle-display (&optional arg) |
38585
f2c0f6df43ab
(last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38578
diff
changeset
|
438 "Toggle between abbreviated and unabbreviated printed representations." |
50503
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
439 (interactive "P") |
51290
0e0d3c3dca7f
(last-sexp-toggle-display):
Richard M. Stallman <rms@gnu.org>
parents:
51261
diff
changeset
|
440 (save-restriction |
0e0d3c3dca7f
(last-sexp-toggle-display):
Richard M. Stallman <rms@gnu.org>
parents:
51261
diff
changeset
|
441 (widen) |
50503
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
442 (let ((value (get-text-property (point) 'printed-value))) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
443 (when value |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
444 (let ((beg (or (previous-single-property-change (min (point-max) (1+ (point))) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
445 'printed-value) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
446 (point))) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
447 (end (or (next-single-char-property-change (point) 'printed-value) (point))) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
448 (standard-output (current-buffer)) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
449 (point (point))) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
450 (delete-region beg end) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
451 (insert (nth 1 value)) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
452 (last-sexp-setup-props beg (point) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
453 (nth 0 value) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
454 (nth 2 value) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
455 (nth 1 value)) |
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
456 (goto-char (min (point-max) point))))))) |
38572
107f826252d2
(last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38566
diff
changeset
|
457 |
51261
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
458 (defun prin1-char (char) |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
459 "Return a string representing CHAR as a character rather than as an integer. |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
460 If CHAR is not a character, return nil." |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
461 (and (integerp char) |
55521
ea0f46cadeb2
(prin1-char): Use eventp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54501
diff
changeset
|
462 (eventp char) |
56825
dcd7b1b4690d
(prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents:
56686
diff
changeset
|
463 (let ((c (event-basic-type char)) |
56840
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
464 (mods (event-modifiers char)) |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
465 string) |
56825
dcd7b1b4690d
(prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents:
56686
diff
changeset
|
466 ;; Prevent ?A from turning into ?\S-a. |
dcd7b1b4690d
(prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents:
56686
diff
changeset
|
467 (if (and (memq 'shift mods) |
56840
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
468 (zerop (logand char ?\S-\^@)) |
56825
dcd7b1b4690d
(prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents:
56686
diff
changeset
|
469 (not (let ((case-fold-search nil)) |
dcd7b1b4690d
(prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents:
56686
diff
changeset
|
470 (char-equal c (upcase c))))) |
dcd7b1b4690d
(prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents:
56686
diff
changeset
|
471 (setq c (upcase c) mods nil)) |
56840
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
472 ;; What string are we considering using? |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
473 (condition-case nil |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
474 (setq string |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
475 (concat |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
476 "?" |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
477 (mapconcat |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
478 (lambda (modif) |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
479 (cond ((eq modif 'super) "\\s-") |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
480 (t (string ?\\ (upcase (aref (symbol-name modif) 0)) ?-)))) |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
481 mods "") |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
482 (cond |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
483 ((memq c '(?\; ?\( ?\) ?\{ ?\} ?\[ ?\] ?\" ?\' ?\\)) (string ?\\ c)) |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
484 ((eq c 127) "\\C-?") |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
485 (t |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
486 (string c))))) |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
487 (error nil)) |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
488 ;; Verify the string reads a CHAR, not to some other character. |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
489 ;; If it doesn't, return nil instead. |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
490 (and string |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
491 (= (car (read-from-string string)) char) |
14c8ead25d14
(prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents:
56829
diff
changeset
|
492 string)))) |
56996
5418c6e288fc
(define-compilation-mode): Specify `doc-string-elt' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56840
diff
changeset
|
493 |
51261
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
494 |
27303
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
495 (defun eval-last-sexp-1 (eval-last-sexp-arg-internal) |
213 | 496 "Evaluate sexp before point; print value in minibuffer. |
497 With argument, print output into current buffer." | |
27303
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
498 (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
|
499 (let ((value |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
500 (eval (let ((stab (syntax-table)) |
17066
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
501 (opoint (point)) |
19057
b1251bcaaa0e
(eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents:
17353
diff
changeset
|
502 ignore-quotes |
17066
852e90e67fff
(eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents:
16687
diff
changeset
|
503 expr) |
51425
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
504 (save-excursion |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
505 (with-syntax-table emacs-lisp-mode-syntax-table |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
506 ;; If this sexp appears to be enclosed in `...' |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
507 ;; then ignore the surrounding quotes. |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
508 (setq ignore-quotes |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
509 (or (eq (following-char) ?\') |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
510 (eq (preceding-char) ?\'))) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
511 (forward-sexp -1) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
512 ;; If we were after `?\e' (or similar case), |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
513 ;; use the whole thing, not just the `e'. |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
514 (when (eq (preceding-char) ?\\) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
515 (forward-char -1) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
516 (when (eq (preceding-char) ??) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
517 (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
|
518 |
51425
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
519 ;; Skip over `#N='s. |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
520 (when (eq (preceding-char) ?=) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
521 (let (labeled-p) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
522 (save-excursion |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
523 (skip-chars-backward "0-9#=") |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
524 (setq labeled-p (looking-at "\\(#[0-9]+=\\)+"))) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
525 (when labeled-p |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
526 (forward-sexp -1)))) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
527 |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
528 (save-restriction |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
529 ;; vladimir@cs.ualberta.ca 30-Jul-1997: skip ` in |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
530 ;; `variable' so that the value is returned, not the |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
531 ;; name |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
532 (if (and ignore-quotes |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
533 (eq (following-char) ?`)) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
534 (forward-char)) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
535 (narrow-to-region (point-min) opoint) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
536 (setq expr (read (current-buffer))) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
537 ;; If it's an (interactive ...) form, it's more |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
538 ;; useful to show how an interactive call would |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
539 ;; use it. |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
540 (and (consp expr) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
541 (eq (car expr) 'interactive) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
542 (setq expr |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
543 (list 'call-interactively |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
544 (list 'quote |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
545 (list 'lambda |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
546 '(&rest args) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
547 expr |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
548 'args))))) |
346b661f431e
(eval-last-sexp-1): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
51290
diff
changeset
|
549 expr))))))) |
52208
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
550 (eval-last-sexp-print-value value)))) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
551 |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
552 (defun eval-last-sexp-print-value (value) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
553 (let ((unabbreviated (let ((print-length nil) (print-level nil)) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
554 (prin1-to-string value))) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
555 (print-length eval-expression-print-length) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
556 (print-level eval-expression-print-level) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
557 (beg (point)) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
558 end) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
559 (prog1 |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
560 (prin1 value) |
55829
fcd2e17daffa
(prin1-char): Catch errors from `string'.
Richard M. Stallman <rms@gnu.org>
parents:
55805
diff
changeset
|
561 (let ((str (eval-expression-print-format value))) |
fcd2e17daffa
(prin1-char): Catch errors from `string'.
Richard M. Stallman <rms@gnu.org>
parents:
55805
diff
changeset
|
562 (if str (princ str))) |
52208
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
563 (setq end (point)) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
564 (when (and (bufferp standard-output) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
565 (or (not (null print-length)) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
566 (not (null print-level))) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
567 (not (string= unabbreviated |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
568 (buffer-substring-no-properties beg end)))) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
569 (last-sexp-setup-props beg end value |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
570 unabbreviated |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
571 (buffer-substring-no-properties beg end)) |
4a7f0e1b3678
(eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents:
51981
diff
changeset
|
572 )))) |
38572
107f826252d2
(last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
38566
diff
changeset
|
573 |
213 | 574 |
56686
c28ce21eb5ae
(eval-last-sexp): Don't cons a new symbol each time.
Richard M. Stallman <rms@gnu.org>
parents:
56003
diff
changeset
|
575 (defvar eval-last-sexp-fake-value (make-symbol "t")) |
c28ce21eb5ae
(eval-last-sexp): Don't cons a new symbol each time.
Richard M. Stallman <rms@gnu.org>
parents:
56003
diff
changeset
|
576 |
27303
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
577 (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
|
578 "Evaluate sexp before point; print value in minibuffer. |
38169
8a3e61895b17
(eval-last-sexp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
37991
diff
changeset
|
579 Interactively, with prefix argument, print output into current buffer." |
27303
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
580 (interactive "P") |
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
581 (if (null eval-expression-debug-on-error) |
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
582 (eval-last-sexp-1 eval-last-sexp-arg-internal) |
56686
c28ce21eb5ae
(eval-last-sexp): Don't cons a new symbol each time.
Richard M. Stallman <rms@gnu.org>
parents:
56003
diff
changeset
|
583 (let ((old-value eval-last-sexp-fake-value) new-value value) |
27303
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
584 (let ((debug-on-error old-value)) |
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
585 (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
|
586 (setq new-value debug-on-error)) |
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
587 (unless (eq old-value new-value) |
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
588 (setq debug-on-error new-value)) |
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
589 value))) |
35279
139991123d49
(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents:
34366
diff
changeset
|
590 |
25434
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
591 (defun eval-defun-1 (form) |
56003
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
592 "Treat some expressions specially. |
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
593 Reset the `defvar' and `defcustom' variables to the initial value. |
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
594 Reinitialize the face according to the `defface' specification." |
32294
a6eff9b566ae
(lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents:
30666
diff
changeset
|
595 ;; 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
|
596 ;; the same, since this gets a macroexpended form. |
42235
103ed59cfd30
(eval-defun-1): Cope with atoms as args.
Richard M. Stallman <rms@gnu.org>
parents:
41812
diff
changeset
|
597 (cond ((not (listp form)) |
103ed59cfd30
(eval-defun-1): Cope with atoms as args.
Richard M. Stallman <rms@gnu.org>
parents:
41812
diff
changeset
|
598 form) |
103ed59cfd30
(eval-defun-1): Cope with atoms as args.
Richard M. Stallman <rms@gnu.org>
parents:
41812
diff
changeset
|
599 ((and (eq (car form) 'defvar) |
51261
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
600 (cdr-safe (cdr-safe form)) |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
601 (boundp (cadr form))) |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
602 ;; Force variable to be re-set. |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
603 `(progn (defvar ,(nth 1 form) nil ,@(nthcdr 3 form)) |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
604 (setq ,(nth 1 form) ,(nth 2 form)))) |
28324
979a905864ab
(lisp-eval-defun): Make arglist compatible with inf-lisp version.
Dave Love <fx@gnu.org>
parents:
27934
diff
changeset
|
605 ;; `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
|
606 ;; `custom-declare-variable' with a quoted value arg. |
27809 | 607 ((and (eq (car form) 'custom-declare-variable) |
608 (default-boundp (eval (nth 1 form)))) | |
25434
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
609 ;; 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
|
610 (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
|
611 form) |
56003
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
612 ;; `defface' is macroexpanded to `custom-declare-face'. |
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
613 ((eq (car form) 'custom-declare-face) |
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
614 ;; Reset the face. |
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
615 (put (eval (nth 1 form)) 'face-defface-spec nil) |
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
616 (setq face-new-frame-defaults |
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
617 (assq-delete-all (eval (nth 1 form)) face-new-frame-defaults)) |
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
618 form) |
25434
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
619 ((eq (car form) 'progn) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
620 (cons 'progn (mapcar 'eval-defun-1 (cdr form)))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
621 (t form))) |
9a7891b32d1a
(eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents:
25109
diff
changeset
|
622 |
30055
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
623 (defun eval-defun-2 () |
248 | 624 "Evaluate defun that point is in or before. |
24895 | 625 The value is displayed in the minibuffer. |
626 If the current defun is actually a call to `defvar', | |
627 then reset the variable using the initial value expression | |
628 even if the variable already has some other value. | |
629 \(Normally `defvar' does not change the variable's value | |
630 if it already has a value.\) | |
631 | |
23388
8aa1f99efb66
(eval-defun): Return the evaluation result.
Karl Heuer <kwzh@gnu.org>
parents:
23191
diff
changeset
|
632 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
|
633 Return the result of evaluation." |
213 | 634 (interactive "P") |
25703
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
635 (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
|
636 (print-length eval-expression-print-length) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
637 (print-level eval-expression-print-level)) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
638 (save-excursion |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
639 ;; 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
|
640 ;; 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
|
641 ;; variable. Re-written using `apply' to avoid capturing |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
642 ;; variables like `end'. |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
643 (apply |
35279
139991123d49
(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents:
34366
diff
changeset
|
644 #'eval-region |
30055
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
645 (let ((standard-output t) |
25703
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
646 beg end form) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
647 ;; 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
|
648 (save-excursion |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
649 (end-of-defun) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
650 (beginning-of-defun) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
651 (setq beg (point)) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
652 (setq form (read (current-buffer))) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
653 (setq end (point))) |
56003
9650d55ad73d
(eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents:
55829
diff
changeset
|
654 ;; Alter the form if necessary. |
25703
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
655 (setq form (eval-defun-1 (macroexpand form))) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
656 (list beg end standard-output |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
657 `(lambda (ignore) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
658 ;; Skipping to the end of the specified region |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
659 ;; will make eval-region return. |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
660 (goto-char ,end) |
00b4eac00979
(eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents:
25642
diff
changeset
|
661 ',form)))))) |
25107 | 662 ;; The result of evaluation has been put onto VALUES. So return it. |
663 (car values)) | |
27303
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
664 |
30055
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
665 (defun eval-defun (edebug-it) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
666 "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
|
667 |
40409 | 668 If the current defun is actually a call to `defvar' or `defcustom', |
669 evaluating it this way resets the variable using its initial value | |
670 expression even if the variable already has some other value. | |
671 \(Normally `defvar' and `defcustom' do not alter the value if there | |
672 already is one.) | |
30055
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
673 |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
674 With a prefix argument, instrument the code for Edebug. |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
675 |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
676 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
|
677 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
|
678 instrumented, just FUNCTION is printed. |
27303
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
679 |
30055
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
680 If not acting on a `defun', the result of evaluation is displayed in |
38560
df8cff64f0f3
(eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents:
38412
diff
changeset
|
681 the minibuffer. This display is controlled by the variables |
df8cff64f0f3
(eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents:
38412
diff
changeset
|
682 `eval-expression-print-length' and `eval-expression-print-level', |
df8cff64f0f3
(eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents:
38412
diff
changeset
|
683 which see." |
27303
6af9b684a1a0
(eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
27300
diff
changeset
|
684 (interactive "P") |
30055
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
685 (cond (edebug-it |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
686 (require 'edebug) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
687 (eval-defun (not edebug-all-defs))) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
688 (t |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
689 (if (null eval-expression-debug-on-error) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
690 (eval-defun-2) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
691 (let ((old-value (make-symbol "t")) new-value value) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
692 (let ((debug-on-error old-value)) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
693 (setq value (eval-defun-2)) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
694 (setq new-value debug-on-error)) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
695 (unless (eq old-value new-value) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
696 (setq debug-on-error new-value)) |
16e560dd4ab8
(eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents:
28994
diff
changeset
|
697 value))))) |
50503
7c83c5770cb6
(last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents:
50463
diff
changeset
|
698 |
35279
139991123d49
(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents:
34366
diff
changeset
|
699 |
213 | 700 (defun lisp-comment-indent () |
701 (if (looking-at "\\s<\\s<\\s<") | |
702 (current-column) | |
703 (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
|
704 (let ((tem (or (calculate-lisp-indent) (current-column)))) |
213 | 705 (if (listp tem) (car tem) tem)) |
706 (skip-chars-backward " \t") | |
707 (max (if (bolp) 0 (1+ (current-column))) | |
708 comment-column)))) | |
709 | |
40790
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
710 ;; This function just forces a more costly detection of comments (using |
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
711 ;; parse-partial-sexp from beginning-of-defun). I.e. It avoids the problem of |
3b3c00fa282a
(lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40759
diff
changeset
|
712 ;; taking a `;' inside a string started on another line for a comment starter. |
54501
96f7b2598aa3
(lisp-mode-variables): Don't set
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54315
diff
changeset
|
713 ;; Note: `newcomment' gets it right now since we set comment-use-global-state |
96f7b2598aa3
(lisp-mode-variables): Don't set
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54315
diff
changeset
|
714 ;; so we could get rid of it. -stef |
20333
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
715 (defun lisp-mode-auto-fill () |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
716 (if (> (current-column) (current-fill-column)) |
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
717 (if (save-excursion |
41512
4f4835967793
(lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41509
diff
changeset
|
718 (nth 4 (syntax-ppss (point)))) |
20333
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
719 (do-auto-fill) |
41512
4f4835967793
(lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41509
diff
changeset
|
720 (unless (and (boundp 'comment-auto-fill-only-comments) |
4f4835967793
(lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41509
diff
changeset
|
721 comment-auto-fill-only-comments) |
4f4835967793
(lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41509
diff
changeset
|
722 (let ((comment-start nil) (comment-start-skip nil)) |
4f4835967793
(lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41509
diff
changeset
|
723 (do-auto-fill)))))) |
20333
3627bd4b83d9
(lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20013
diff
changeset
|
724 |
37991
908deaf5c7f5
(lisp-indent-offset): Add a doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
37739
diff
changeset
|
725 (defvar lisp-indent-offset nil |
908deaf5c7f5
(lisp-indent-offset): Add a doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
37739
diff
changeset
|
726 "If non-nil, indent second line of expressions that many more columns.") |
27809 | 727 (defvar lisp-indent-function 'lisp-indent-function) |
213 | 728 |
729 (defun lisp-indent-line (&optional whole-exp) | |
730 "Indent current line as Lisp code. | |
731 With argument, indent any additional lines of the same expression | |
732 rigidly along with this one." | |
733 (interactive "P") | |
39564
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
734 (let ((indent (calculate-lisp-indent)) shift-amt end |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
735 (pos (- (point-max) (point))) |
0e059993ad95
(lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents:
38585
diff
changeset
|
736 (beg (progn (beginning-of-line) (point)))) |
213 | 737 (skip-chars-forward " \t") |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
738 (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
|
739 ;; 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
|
740 ;; or a line that starts in a string. |
677
7a9b4ea68565
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
659
diff
changeset
|
741 (goto-char (- (point-max) pos)) |
213 | 742 (if (and (looking-at "\\s<") (not (looking-at "\\s<\\s<"))) |
743 ;; Single-semicolon comment lines should be indented | |
744 ;; as comment lines, not as code. | |
745 (progn (indent-for-comment) (forward-char -1)) | |
746 (if (listp indent) (setq indent (car indent))) | |
747 (setq shift-amt (- indent (current-column))) | |
748 (if (zerop shift-amt) | |
749 nil | |
750 (delete-region beg (point)) | |
751 (indent-to indent))) | |
752 ;; If initial point was within line's indentation, | |
753 ;; position after the indentation. Else stay at same point in text. | |
754 (if (> (- (point-max) pos) (point)) | |
755 (goto-char (- (point-max) pos))) | |
756 ;; If desired, shift remaining lines of expression the same amount. | |
757 (and whole-exp (not (zerop shift-amt)) | |
758 (save-excursion | |
759 (goto-char beg) | |
760 (forward-sexp 1) | |
761 (setq end (point)) | |
762 (goto-char beg) | |
763 (forward-line 1) | |
764 (setq beg (point)) | |
765 (> end beg)) | |
766 (indent-code-rigidly beg end shift-amt))))) | |
767 | |
9424
738999b0296f
Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9423
diff
changeset
|
768 (defvar calculate-lisp-indent-last-sexp) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
769 |
213 | 770 (defun calculate-lisp-indent (&optional parse-start) |
771 "Return appropriate indentation for current line as Lisp code. | |
772 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
|
773 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
|
774 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
|
775 |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
776 The value can also be a list of the form (COLUMN CONTAINING-SEXP-START). |
213 | 777 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
|
778 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
|
779 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
|
780 is the buffer position of the start of the containing expression." |
213 | 781 (save-excursion |
782 (beginning-of-line) | |
783 (let ((indent-point (point)) | |
784 state paren-depth | |
785 ;; setting this to a number inhibits calling hook | |
786 (desired-indent nil) | |
787 (retry t) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
788 calculate-lisp-indent-last-sexp containing-sexp) |
213 | 789 (if parse-start |
790 (goto-char parse-start) | |
791 (beginning-of-defun)) | |
792 ;; Find outermost containing sexp | |
793 (while (< (point) indent-point) | |
794 (setq state (parse-partial-sexp (point) indent-point 0))) | |
795 ;; Find innermost containing sexp | |
796 (while (and retry | |
797 state | |
798 (> (setq paren-depth (elt state 0)) 0)) | |
799 (setq retry nil) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
800 (setq calculate-lisp-indent-last-sexp (elt state 2)) |
213 | 801 (setq containing-sexp (elt state 1)) |
802 ;; Position following last unclosed open. | |
803 (goto-char (1+ containing-sexp)) | |
804 ;; Is there a complete sexp since then? | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
805 (if (and calculate-lisp-indent-last-sexp |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
806 (> calculate-lisp-indent-last-sexp (point))) |
213 | 807 ;; 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
|
808 (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
|
809 indent-point 0))) |
213 | 810 (if (setq retry (car (cdr peek))) (setq state peek))))) |
811 (if retry | |
812 nil | |
813 ;; Innermost containing sexp found | |
814 (goto-char (1+ containing-sexp)) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
815 (if (not calculate-lisp-indent-last-sexp) |
213 | 816 ;; indent-point immediately follows open paren. |
817 ;; Don't call hook. | |
818 (setq desired-indent (current-column)) | |
819 ;; 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
|
820 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) |
213 | 821 (cond ((looking-at "\\s(") |
822 ;; First element of containing sexp is a list. | |
823 ;; Indent under that list. | |
824 ) | |
825 ((> (save-excursion (forward-line 1) (point)) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
826 calculate-lisp-indent-last-sexp) |
213 | 827 ;; This is the first line to start within the containing sexp. |
828 ;; It's almost certainly a function call. | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
829 (if (= (point) calculate-lisp-indent-last-sexp) |
213 | 830 ;; Containing sexp has nothing before this line |
831 ;; except the first element. Indent under that element. | |
832 nil | |
833 ;; Skip the first element, find start of second (the first | |
834 ;; argument of the function call) and indent under. | |
835 (progn (forward-sexp 1) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
836 (parse-partial-sexp (point) |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
837 calculate-lisp-indent-last-sexp |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
838 0 t))) |
213 | 839 (backward-prefix-chars)) |
840 (t | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
841 ;; Indent beneath first sexp on same line as |
27809 | 842 ;; `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
|
843 ;; almost certainly a function call. |
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
844 (goto-char calculate-lisp-indent-last-sexp) |
213 | 845 (beginning-of-line) |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
846 (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
|
847 0 t) |
213 | 848 (backward-prefix-chars))))) |
849 ;; 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
|
850 ;; Call indentation hook except when overridden by lisp-indent-offset |
213 | 851 ;; or if the desired indentation has already been computed. |
852 (let ((normal-indent (current-column))) | |
853 (cond ((elt state 3) | |
854 ;; 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
|
855 nil) |
213 | 856 ((and (integerp lisp-indent-offset) containing-sexp) |
857 ;; Indent by constant offset | |
858 (goto-char containing-sexp) | |
859 (+ (current-column) lisp-indent-offset)) | |
860 (desired-indent) | |
861 ((and (boundp 'lisp-indent-function) | |
862 lisp-indent-function | |
863 (not retry)) | |
864 (or (funcall lisp-indent-function indent-point state) | |
865 normal-indent)) | |
866 (t | |
214 | 867 normal-indent)))))) |
213 | 868 |
869 (defun lisp-indent-function (indent-point state) | |
41509
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
870 "This function is the normal value of the variable `lisp-indent-function'. |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
871 It is used when indenting a line within a function call, to see if the |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
872 called function says anything special about how to indent the line. |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
873 |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
874 INDENT-POINT is the position where the user typed TAB, or equivalent. |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
875 Point is located at the point to indent under (for default indentation); |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
876 STATE is the `parse-partial-sexp' state for that position. |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
877 |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
878 If the current line is in a call to a Lisp function |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
879 which has a non-nil property `lisp-indent-function', |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
880 that specifies how to do the indentation. The property value can be |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
881 * `defun', meaning indent `defun'-style; |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
882 * an integer N, meaning indent the first N arguments specially |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
883 like ordinary function arguments and then indent any further |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
884 aruments like a body; |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
885 * a function to call just as this function was called. |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
886 If that function returns nil, that means it doesn't specify |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
887 the indentation. |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
888 |
aeb0c4a140d2
(lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents:
41334
diff
changeset
|
889 This function also returns nil meaning don't specify the indentation." |
213 | 890 (let ((normal-indent (current-column))) |
891 (goto-char (1+ (elt state 1))) | |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
892 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) |
213 | 893 (if (and (elt state 2) |
894 (not (looking-at "\\sw\\|\\s_"))) | |
46159 | 895 ;; car of form doesn't seem to be a symbol |
213 | 896 (progn |
897 (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
|
898 calculate-lisp-indent-last-sexp)) |
51261
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
899 (progn (goto-char calculate-lisp-indent-last-sexp) |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
900 (beginning-of-line) |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
901 (parse-partial-sexp (point) |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
902 calculate-lisp-indent-last-sexp 0 t))) |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
903 ;; Indent under the list or under the first sexp on the same |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
904 ;; line as calculate-lisp-indent-last-sexp. Note that first |
a3a1d78e827e
(lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50677
diff
changeset
|
905 ;; thing on that line has to be complete sexp since we are |
9423
9076245a9fed
(calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents:
9415
diff
changeset
|
906 ;; inside the innermost containing sexp. |
213 | 907 (backward-prefix-chars) |
908 (current-column)) | |
909 (let ((function (buffer-substring (point) | |
910 (progn (forward-sexp 1) (point)))) | |
911 method) | |
3638
45169f86d3a4
(lisp-indent-function): Look for either
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
912 (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
|
913 (get (intern-soft function) 'lisp-indent-hook))) |
213 | 914 (cond ((or (eq method 'defun) |
915 (and (null method) | |
916 (> (length function) 3) | |
917 (string-match "\\`def" function))) | |
918 (lisp-indent-defform state indent-point)) | |
919 ((integerp method) | |
920 (lisp-indent-specform method state | |
921 indent-point normal-indent)) | |
922 (method | |
923 (funcall method state indent-point))))))) | |
924 | |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16563
diff
changeset
|
925 (defvar lisp-body-indent 2 |
2933
420dfaaacfc5
(lisp-body-indent): Add doc.
Richard M. Stallman <rms@gnu.org>
parents:
2450
diff
changeset
|
926 "Number of columns to indent the second line of a `(def...)' form.") |
213 | 927 |
928 (defun lisp-indent-specform (count state indent-point normal-indent) | |
929 (let ((containing-form-start (elt state 1)) | |
930 (i count) | |
931 body-indent containing-form-column) | |
932 ;; Move to the start of containing form, calculate indentation | |
933 ;; to use for non-distinguished forms (> count), and move past the | |
934 ;; function symbol. lisp-indent-function guarantees that there is at | |
935 ;; least one word or symbol character following open paren of containing | |
936 ;; form. | |
937 (goto-char containing-form-start) | |
938 (setq containing-form-column (current-column)) | |
939 (setq body-indent (+ lisp-body-indent containing-form-column)) | |
940 (forward-char 1) | |
941 (forward-sexp 1) | |
942 ;; Now find the start of the last form. | |
943 (parse-partial-sexp (point) indent-point 1 t) | |
944 (while (and (< (point) indent-point) | |
945 (condition-case () | |
946 (progn | |
947 (setq count (1- count)) | |
948 (forward-sexp 1) | |
949 (parse-partial-sexp (point) indent-point 1 t)) | |
950 (error nil)))) | |
951 ;; Point is sitting on first character of last (or count) sexp. | |
952 (if (> count 0) | |
953 ;; A distinguished form. If it is the first or second form use double | |
954 ;; lisp-body-indent, else normal indent. With lisp-body-indent bound | |
955 ;; to 2 (the default), this just happens to work the same with if as | |
956 ;; the older code, but it makes unwind-protect, condition-case, | |
957 ;; with-output-to-temp-buffer, et. al. much more tasteful. The older, | |
958 ;; less hacked, behavior can be obtained by replacing below with | |
959 ;; (list normal-indent containing-form-start). | |
960 (if (<= (- i count) 1) | |
961 (list (+ containing-form-column (* 2 lisp-body-indent)) | |
962 containing-form-start) | |
963 (list normal-indent containing-form-start)) | |
964 ;; A non-distinguished form. Use body-indent if there are no | |
965 ;; distinguished forms and this is the first undistinguished form, | |
966 ;; or if this is the first undistinguished form and the preceding | |
967 ;; distinguished form has indentation at least as great as body-indent. | |
968 (if (or (and (= i 0) (= count 0)) | |
969 (and (= count 0) (<= body-indent normal-indent))) | |
970 body-indent | |
971 normal-indent)))) | |
972 | |
973 (defun lisp-indent-defform (state indent-point) | |
974 (goto-char (car (cdr state))) | |
975 (forward-line 1) | |
976 (if (> (point) (car (cdr (cdr state)))) | |
977 (progn | |
978 (goto-char (car (cdr state))) | |
979 (+ lisp-body-indent (current-column))))) | |
980 | |
35279
139991123d49
(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents:
34366
diff
changeset
|
981 |
213 | 982 ;; (put 'progn 'lisp-indent-function 0), say, causes progn to be indented |
983 ;; like defun if the first form is placed on the next line, otherwise | |
984 ;; it is indented like any other form (i.e. forms line up under first). | |
985 | |
986 (put 'lambda 'lisp-indent-function 'defun) | |
987 (put 'autoload 'lisp-indent-function 'defun) | |
988 (put 'progn 'lisp-indent-function 0) | |
989 (put 'prog1 'lisp-indent-function 1) | |
990 (put 'prog2 'lisp-indent-function 2) | |
991 (put 'save-excursion 'lisp-indent-function 0) | |
992 (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
|
993 (put 'save-selected-window 'lisp-indent-function 0) |
213 | 994 (put 'save-restriction 'lisp-indent-function 0) |
1163 | 995 (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
|
996 (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
|
997 (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
|
998 (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
|
999 (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
|
1000 (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
|
1001 (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
|
1002 (put 'with-temp-message 'lisp-indent-function 1) |
27300
baffb2de5ce9
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
26682
diff
changeset
|
1003 (put 'with-syntax-table 'lisp-indent-function 1) |
213 | 1004 (put 'let 'lisp-indent-function 1) |
1005 (put 'let* 'lisp-indent-function 1) | |
1006 (put 'while 'lisp-indent-function 1) | |
1007 (put 'if 'lisp-indent-function 2) | |
41702
1e0988cac637
(read-if): Add lisp-indent-function prop.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41512
diff
changeset
|
1008 (put 'read-if 'lisp-indent-function 2) |
213 | 1009 (put 'catch 'lisp-indent-function 1) |
1010 (put 'condition-case 'lisp-indent-function 2) | |
1011 (put 'unwind-protect 'lisp-indent-function 1) | |
1012 (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
|
1013 (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
|
1014 (put 'dolist 'lisp-indent-function 1) |
a681b4de47a1
Add indent specs for dolist, dotimes, when, unless.
Dave Love <fx@gnu.org>
parents:
27303
diff
changeset
|
1015 (put 'dotimes 'lisp-indent-function 1) |
a681b4de47a1
Add indent specs for dolist, dotimes, when, unless.
Dave Love <fx@gnu.org>
parents:
27303
diff
changeset
|
1016 (put 'when 'lisp-indent-function 1) |
a681b4de47a1
Add indent specs for dolist, dotimes, when, unless.
Dave Love <fx@gnu.org>
parents:
27303
diff
changeset
|
1017 (put 'unless 'lisp-indent-function 1) |
213 | 1018 |
1019 (defun indent-sexp (&optional endpos) | |
1020 "Indent each line of the list starting just after point. | |
1021 If optional arg ENDPOS is given, indent each line, stopping when | |
1022 ENDPOS is encountered." | |
1023 (interactive) | |
727 | 1024 (let ((indent-stack (list nil)) |
1025 (next-depth 0) | |
10594
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
1026 ;; 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
|
1027 ;; 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
|
1028 ;; 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
|
1029 ;; 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
|
1030 ;; 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
|
1031 (starting-point (if endpos nil (point))) |
727 | 1032 (last-point (point)) |
1033 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
|
1034 (or endpos |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
1035 ;; 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
|
1036 (save-excursion (forward-sexp 1))) |
213 | 1037 (save-excursion |
1038 (setq outer-loop-done nil) | |
1039 (while (if endpos (< (point) endpos) | |
1040 (not outer-loop-done)) | |
1041 (setq last-depth next-depth | |
1042 inner-loop-done nil) | |
1043 ;; Parse this line so we can learn the state | |
1044 ;; to indent the next line. | |
1045 ;; This inner loop goes through only once | |
1046 ;; unless a line ends inside a string. | |
1047 (while (and (not inner-loop-done) | |
1048 (not (setq outer-loop-done (eobp)))) | |
1049 (setq state (parse-partial-sexp (point) (progn (end-of-line) (point)) | |
1050 nil nil state)) | |
1051 (setq next-depth (car state)) | |
1052 ;; If the line contains a comment other than the sort | |
1053 ;; that is indented like code, | |
1054 ;; indent it now with indent-for-comment. | |
1055 ;; Comments indented like code are right already. | |
1056 ;; In any case clear the in-comment flag in the state | |
1057 ;; because parse-partial-sexp never sees the newlines. | |
1058 (if (car (nthcdr 4 state)) | |
1059 (progn (indent-for-comment) | |
1060 (end-of-line) | |
1061 (setcar (nthcdr 4 state) nil))) | |
1062 ;; If this line ends inside a string, | |
1063 ;; go straight to next line, remaining within the inner loop, | |
1064 ;; and turn off the \-flag. | |
1065 (if (car (nthcdr 3 state)) | |
1066 (progn | |
1067 (forward-line 1) | |
1068 (setcar (nthcdr 5 state) nil)) | |
1069 (setq inner-loop-done t))) | |
1070 (and endpos | |
727 | 1071 (<= next-depth 0) |
1072 (progn | |
32294
a6eff9b566ae
(lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents:
30666
diff
changeset
|
1073 (setq indent-stack (nconc indent-stack |
a6eff9b566ae
(lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents:
30666
diff
changeset
|
1074 (make-list (- next-depth) nil)) |
727 | 1075 last-depth (- last-depth next-depth) |
1076 next-depth 0))) | |
10594
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
1077 (or outer-loop-done endpos |
213 | 1078 (setq outer-loop-done (<= next-depth 0))) |
1079 (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
|
1080 (forward-line 1) |
213 | 1081 (while (> last-depth next-depth) |
1082 (setq indent-stack (cdr indent-stack) | |
1083 last-depth (1- last-depth))) | |
1084 (while (< last-depth next-depth) | |
1085 (setq indent-stack (cons nil indent-stack) | |
1086 last-depth (1+ last-depth))) | |
1087 ;; Now go to the next line and indent it according | |
1088 ;; to what we learned from parsing the previous one. | |
1089 (forward-line 1) | |
1090 (setq bol (point)) | |
1091 (skip-chars-forward " \t") | |
1092 ;; But not if the line is blank, or just a comment | |
1093 ;; (except for double-semi comments; indent them as usual). | |
1094 (if (or (eobp) (looking-at "\\s<\\|\n")) | |
1095 nil | |
1096 (if (and (car indent-stack) | |
1097 (>= (car indent-stack) 0)) | |
1098 (setq this-indent (car indent-stack)) | |
1099 (let ((val (calculate-lisp-indent | |
1100 (if (car indent-stack) (- (car indent-stack)) | |
727 | 1101 starting-point)))) |
17308
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
1102 (if (null val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
1103 (setq this-indent val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
1104 (if (integerp val) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
1105 (setcar indent-stack |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
1106 (setq this-indent val)) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
1107 (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
|
1108 (setq this-indent (car val)))))) |
e52fa60d97e8
(indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents:
17144
diff
changeset
|
1109 (if (and this-indent (/= (current-column) this-indent)) |
213 | 1110 (progn (delete-region bol (point)) |
1111 (indent-to this-indent))))) | |
1112 (or outer-loop-done | |
1113 (setq outer-loop-done (= (point) last-point)) | |
1114 (setq last-point (point))))))) | |
1115 | |
1116 (defun lisp-indent-region (start end) | |
27809 | 1117 "Indent every line whose first char is between START and END inclusive." |
213 | 1118 (save-excursion |
1119 (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
|
1120 (goto-char start) |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
1121 (and (bolp) (not (eolp)) |
aadef46f00f7
(lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents:
9424
diff
changeset
|
1122 (lisp-indent-line)) |
213 | 1123 (indent-sexp endmark) |
1124 (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
|
1125 |
55805
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1126 (defun indent-pp-sexp (&optional arg) |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1127 "Indent each line of the list or, with prefix ARG, pretty-printify the list." |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1128 (interactive "P") |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1129 (if arg |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1130 (save-excursion |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1131 (save-restriction |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1132 (narrow-to-region (point) (progn (forward-sexp 1) (point))) |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1133 (pp-buffer) |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1134 (goto-char (point-max)) |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1135 (if (eq (char-before) ?\n) |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1136 (delete-char -1))))) |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1137 (indent-sexp)) |
a4c5317be59a
* emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents:
55773
diff
changeset
|
1138 |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
1139 ;;;; Lisp paragraph filling commands. |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
1140 |
50001
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1141 (defcustom emacs-lisp-docstring-fill-column 65 |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1142 "Value of `fill-column' to use when filling a docstring. |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1143 Any non-integer value means do not use a different value of |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1144 `fill-column' when filling docstrings." |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1145 :type '(choice (integer) |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1146 (const :tag "Use the current `fill-column'" t)) |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1147 :group 'lisp) |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1148 |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
1149 (defun lisp-fill-paragraph (&optional justify) |
50001
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1150 "Like \\[fill-paragraph], but handle Emacs Lisp comments and docstrings. |
1865
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
1151 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
|
1152 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
|
1153 and initial semicolons." |
05be3e0c082f
* lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents:
1163
diff
changeset
|
1154 (interactive "P") |
48127
ebfdb0351da6
(lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48119
diff
changeset
|
1155 (or (fill-comment-paragraph justify) |
50001
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1156 ;; Point is on a program line (a line no comment); we are interested |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1157 ;; particularly in docstring lines. |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1158 ;; |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1159 ;; We bind `paragraph-start' and `paragraph-separate' temporarily. They |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1160 ;; are buffer-local, but we avoid changing them so that they can be set |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1161 ;; to make `forward-paragraph' and friends do something the user wants. |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1162 ;; |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1163 ;; `paragraph-start': The `(' in the character alternative and the |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1164 ;; left-singlequote plus `(' sequence after the \\| alternative prevent |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1165 ;; sexps and backquoted sexps that follow a docstring from being filled |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1166 ;; with the docstring. This setting has the consequence of inhibiting |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1167 ;; filling many program lines that are not docstrings, which is sensible, |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1168 ;; because the user probably asked to fill program lines by accident, or |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1169 ;; expecting indentation (perhaps we should try to do indenting in that |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1170 ;; case). The `;' and `:' stop the paragraph being filled at following |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1171 ;; comment lines and at keywords (e.g., in `defcustom'). Left parens are |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1172 ;; escaped to keep font-locking, filling, & paren matching in the source |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1173 ;; file happy. |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1174 ;; |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1175 ;; `paragraph-separate': A clever regexp distinguishes the first line of |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1176 ;; a docstring and identifies it as a paragraph separator, so that it |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1177 ;; won't be filled. (Since the first line of documentation stands alone |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1178 ;; in some contexts, filling should not alter the contents the author has |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1179 ;; chosen.) Only the first line of a docstring begins with whitespace |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1180 ;; and a quotation mark and ends with a period or (rarely) a comma. |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1181 ;; |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1182 ;; The `fill-column' is temporarily bound to |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1183 ;; `emacs-lisp-docstring-fill-column' if that value is an integer. |
48127
ebfdb0351da6
(lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48119
diff
changeset
|
1184 (let ((paragraph-start (concat paragraph-start |
50001
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1185 "\\|\\s-*\\([\(;:\"]\\|`\(\\)")) |
48127
ebfdb0351da6
(lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48119
diff
changeset
|
1186 (paragraph-separate |
50001
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1187 (concat paragraph-separate "\\|\\s-*\".*[,\\.]$")) |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1188 (fill-column (if (integerp emacs-lisp-docstring-fill-column) |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1189 emacs-lisp-docstring-fill-column |
745c2428aae8
(emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents:
49598
diff
changeset
|
1190 fill-column))) |
48127
ebfdb0351da6
(lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48119
diff
changeset
|
1191 (fill-paragraph justify)) |
ebfdb0351da6
(lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48119
diff
changeset
|
1192 ;; Never return nil. |
ebfdb0351da6
(lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48119
diff
changeset
|
1193 t)) |
35279
139991123d49
(lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents:
34366
diff
changeset
|
1194 |
213 | 1195 (defun indent-code-rigidly (start end arg &optional nochange-regexp) |
1196 "Indent all lines of code, starting in the region, sideways by ARG columns. | |
1197 Does not affect lines starting inside comments or strings, assuming that | |
1198 the start of the region is not inside them. | |
1199 | |
1200 Called from a program, takes args START, END, COLUMNS and NOCHANGE-REGEXP. | |
1201 The last is a regexp which, if matched at the beginning of a line, | |
1202 means don't indent that line." | |
1203 (interactive "r\np") | |
1204 (let (state) | |
1205 (save-excursion | |
1206 (goto-char end) | |
1207 (setq end (point-marker)) | |
1208 (goto-char start) | |
1209 (or (bolp) | |
1210 (setq state (parse-partial-sexp (point) | |
1211 (progn | |
1212 (forward-line 1) (point)) | |
1213 nil nil state))) | |
1214 (while (< (point) end) | |
1215 (or (car (nthcdr 3 state)) | |
1216 (and nochange-regexp | |
1217 (looking-at nochange-regexp)) | |
1218 ;; If line does not start in string, indent it | |
1219 (let ((indent (current-indentation))) | |
1220 (delete-region (point) (progn (skip-chars-forward " \t") (point))) | |
1221 (or (eolp) | |
1222 (indent-to (max 0 (+ indent arg)) 0)))) | |
1223 (setq state (parse-partial-sexp (point) | |
1224 (progn | |
1225 (forward-line 1) (point)) | |
1226 nil nil state)))))) | |
584 | 1227 |
1228 (provide 'lisp-mode) | |
1229 | |
52401 | 1230 ;;; arch-tag: 414c7f93-c245-4b77-8ed5-ed05ef7ff1bf |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
1231 ;;; lisp-mode.el ends here |