annotate lisp/emacs-lisp/lisp-mode.el @ 42143:009b1f3c3049

Add language/utf-8-lang, language/georgian.
author Dave Love <fx@gnu.org>
date Tue, 18 Dec 2001 17:23:14 +0000
parents fb0d648feaa6
children 103ed59cfd30
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
37640
a4403e99257a (lisp-interaction-mode): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 35638
diff changeset
3 ;; Copyright (C) 1985, 1986, 1999, 2000, 2001 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
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
9
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
13 ;; any later version.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
14
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
19
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14116
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14116
diff changeset
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14116
diff changeset
23 ;; Boston, MA 02111-1307, USA.
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
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
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
32 (defvar lisp-mode-abbrev-table nil)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
33
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
34 (defvar emacs-lisp-mode-syntax-table
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
35 (let ((table (make-syntax-table)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
36 (let ((i 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
37 (while (< i ?0)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
38 (modify-syntax-entry i "_ " table)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
39 (setq i (1+ i)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
40 (setq i (1+ ?9))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
41 (while (< i ?A)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
42 (modify-syntax-entry i "_ " table)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
43 (setq i (1+ i)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
44 (setq i (1+ ?Z))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
45 (while (< i ?a)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
46 (modify-syntax-entry i "_ " table)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
47 (setq i (1+ i)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
48 (setq i (1+ ?z))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
49 (while (< i 128)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
50 (modify-syntax-entry i "_ " table)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
51 (setq i (1+ i)))
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
52 (modify-syntax-entry ? " " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
53 (modify-syntax-entry ?\t " " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
54 (modify-syntax-entry ?\f " " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
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
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
57 (modify-syntax-entry ?\^m "> " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
58 (modify-syntax-entry ?\; "< " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
59 (modify-syntax-entry ?` "' " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
60 (modify-syntax-entry ?' "' " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
61 (modify-syntax-entry ?, "' " table)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
62 ;; Used to be singlequote; changed for flonums.
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
63 (modify-syntax-entry ?. "_ " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
64 (modify-syntax-entry ?# "' " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
65 (modify-syntax-entry ?\" "\" " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
66 (modify-syntax-entry ?\\ "\\ " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
67 (modify-syntax-entry ?\( "() " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
68 (modify-syntax-entry ?\) ")( " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
69 (modify-syntax-entry ?\[ "(] " table)
27814
f2abbe1d6b47 Don't change syntax of multibyte
Kenichi Handa <handa@m17n.org>
parents: 27809
diff changeset
70 (modify-syntax-entry ?\] ")[ " table))
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
71 table))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
72
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
73 (defvar lisp-mode-syntax-table
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
74 (let ((table (copy-syntax-table emacs-lisp-mode-syntax-table)))
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
75 (modify-syntax-entry ?\[ "_ " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
76 (modify-syntax-entry ?\] "_ " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
77 (modify-syntax-entry ?# "' 14bn" table)
27934
8c28c1c31e9b (lisp-mode-syntax-table): Fix syntax of |.
Dave Love <fx@gnu.org>
parents: 27814
diff changeset
78 (modify-syntax-entry ?| "\" 23b" table)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
79 table))
285
adb31fcccc2b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 255
diff changeset
80
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
81 (define-abbrev-table 'lisp-mode-abbrev-table ())
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
82
12701
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
83 (defvar lisp-imenu-generic-expression
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
84 (list
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
85 (list nil
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
86 (purecopy (concat "^\\s-*("
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
87 (eval-when-compile
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
88 (regexp-opt
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
89 '("defun" "defun*" "defsubst" "defmacro"
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
90 "defadvice" "define-skeleton"
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
91 "define-minor-mode" "define-derived-mode"
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
92 "define-compiler-macro" "define-modify-macro"
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
93 "defsetf" "define-setf-expander"
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
94 "define-method-combination"
40790
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
95 "defgeneric" "defmethod") t))
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
96 "\\s-+\\(\\sw\\(\\sw\\|\\s_\\)+\\)"))
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
97 2)
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
98 (list (purecopy "Variables")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
99 (purecopy (concat "^\\s-*("
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
100 (eval-when-compile
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
101 (regexp-opt
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
102 '("defvar" "defconst" "defconstant" "defcustom"
40790
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
103 "defparameter" "define-symbol-macro") t))
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
104 "\\s-+\\(\\sw\\(\\sw\\|\\s_\\)+\\)"))
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
105 2)
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
106 (list (purecopy "Types")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
107 (purecopy (concat "^\\s-*("
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
108 (eval-when-compile
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
109 (regexp-opt
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
110 '("defgroup" "deftype" "defstruct" "defclass"
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
111 "define-condition" "define-widget" "defface"
40790
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
112 "defpackage") t))
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
113 "\\s-+'?\\(\\sw\\(\\sw\\|\\s_\\)+\\)"))
12701
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
114 2))
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
115
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
116 "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
117
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
118 ;; 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
119 (put 'autoload 'doc-string-elt 3)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
120 (put 'defun '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 'defvar 'doc-string-elt 3)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
123 (put 'defcustom 'doc-string-elt 3)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
124 (put 'defconst 'doc-string-elt 3)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
125 (put 'defmacro 'doc-string-elt 3)
41812
fb0d648feaa6 (toplevel): Define docstring offset for `defmacro*'.
Colin Walters <walters@gnu.org>
parents: 41702
diff changeset
126 (put 'defmacro* 'doc-string-elt 3)
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
127 (put 'defsubst 'doc-string-elt 3)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
128 (put 'define-skeleton 'doc-string-elt 2)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
129 (put 'define-derived-mode 'doc-string-elt 4)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
130 (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
131 (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
132 (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
133 ;; define-global-mode has no explicit docstring.
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
134 (put 'easy-mmode-define-global-mode 'doc-string-elt 0)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
135
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
136
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
137 (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
138 (if (nth 3 state)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
139 (if (and (eq (nth 0 state) 1)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
140 ;; This might be a docstring.
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
141 (save-excursion
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
142 (let ((n 0))
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
143 (goto-char (nth 8 state))
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
144 (condition-case nil
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
145 (while (progn (backward-sexp 1) (setq n (1+ n))))
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
146 (scan-error nil))
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
147 (when (> n 0)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
148 (let ((sym (intern-soft
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
149 (buffer-substring
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
150 (point) (progn (forward-sexp 1) (point))))))
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
151 (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
152 font-lock-doc-face
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
153 font-lock-string-face)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
154 font-lock-comment-face))
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
155
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
156 ;; 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
157 ;; (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
158 (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
159 (when lisp-syntax
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
160 (set-syntax-table lisp-mode-syntax-table))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
161 (setq local-abbrev-table lisp-mode-abbrev-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
162 (make-local-variable 'paragraph-ignore-fill-prefix)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
163 (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
164 (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
165 (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
166 ;; 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
167 ;; 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
168 ;; 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
169 ;; 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
170 ;;(set (make-local-variable 'adaptive-fill-mode) nil)
20333
3627bd4b83d9 (lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20013
diff changeset
171 (make-local-variable 'normal-auto-fill-function)
3627bd4b83d9 (lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20013
diff changeset
172 (setq normal-auto-fill-function 'lisp-mode-auto-fill)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
173 (make-local-variable 'indent-line-function)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
174 (setq indent-line-function 'lisp-indent-line)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
175 (make-local-variable 'indent-region-function)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
176 (setq indent-region-function 'lisp-indent-region)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
177 (make-local-variable 'parse-sexp-ignore-comments)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
178 (setq parse-sexp-ignore-comments t)
6076
4f76564fc2cd (lisp-mode-variables): Set outline-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 5103
diff changeset
179 (make-local-variable 'outline-regexp)
26682
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
180 (setq outline-regexp ";;;;* \\|(")
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
181 (make-local-variable 'outline-level)
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
182 (setq outline-level 'lisp-outline-level)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
183 (make-local-variable 'comment-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
184 (setq comment-start ";")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
185 (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
186 ;; 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
187 ;; 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
188 (setq comment-start-skip "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *")
28994
0388cb689633 (lisp-mode-variables): Set comment-add.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28324
diff changeset
189 (make-local-variable 'comment-add)
0388cb689633 (lisp-mode-variables): Set comment-add.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28324
diff changeset
190 (setq comment-add 1) ;default to `;;' in comment-region
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
191 (make-local-variable 'comment-column)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
192 (setq comment-column 40)
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
193 (make-local-variable 'comment-indent-function)
12701
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
194 (setq comment-indent-function 'lisp-comment-indent)
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
195 (make-local-variable 'imenu-generic-expression)
27814
f2abbe1d6b47 Don't change syntax of multibyte
Kenichi Handa <handa@m17n.org>
parents: 27809
diff changeset
196 (setq imenu-generic-expression lisp-imenu-generic-expression)
f2abbe1d6b47 Don't change syntax of multibyte
Kenichi Handa <handa@m17n.org>
parents: 27809
diff changeset
197 (make-local-variable 'multibyte-syntax-as-symbol)
33467
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
198 (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
199 (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
200 (setq font-lock-defaults
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
201 '((lisp-font-lock-keywords
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
202 lisp-font-lock-keywords-1 lisp-font-lock-keywords-2)
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
203 nil nil (("+-*/.<>=!?$%_&~^:" . "w")) beginning-of-defun
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
204 (font-lock-mark-block-function . mark-defun)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
205 (font-lock-syntactic-face-function
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
206 . lisp-font-lock-syntactic-face-function))))
26682
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
207
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
208 (defun lisp-outline-level ()
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
209 "Lisp mode `outline-level' function."
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
210 (if (looking-at "(")
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
211 1000
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
212 (looking-at outline-regexp)
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
213 (- (match-end 0) (match-beginning 0))))
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
214
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
215
33467
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
216 (defvar lisp-mode-shared-map
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
217 (let ((map (make-sparse-keymap)))
38315
d34fd7c9092b (lisp-mode-shared-map): Bind TAB
Gerd Moellmann <gerd@gnu.org>
parents: 38169
diff changeset
218 (define-key map "\t" 'lisp-indent-line)
33467
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
219 (define-key map "\e\C-q" 'indent-sexp)
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
220 (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
221 ;; 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
222 ;; 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
223 ;; 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
224 ;;;(define-key map [backspace] 'backward-delete-char-untabify)
33467
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
225 map)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
226 "Keymap for commands shared by all sorts of Lisp modes.")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
227
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
228 (defvar emacs-lisp-mode-map ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
229 "Keymap for Emacs Lisp mode.
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
230 All commands in `lisp-mode-shared-map' are inherited by this map.")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
231
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
232 (if emacs-lisp-mode-map
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
233 ()
12035
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
234 (let ((map (make-sparse-keymap "Emacs-Lisp")))
21116
ccf251830c66 (lisp-interaction-mode-map)
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
235 (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
236 (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
237 (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
238 (define-key emacs-lisp-mode-map "\e\C-x" 'eval-defun)
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
239 (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
240 (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
241 (cons "Emacs-Lisp" map))
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
242 (define-key map [edebug-defun]
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
243 '("Instrument Function for Debugging" . edebug-defun))
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
244 (define-key map [byte-recompile]
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
245 '("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
246 (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
247 '("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
248 (define-key map [byte-compile]
12035
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
249 '("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
250 (define-key map [separator-eval] '("--"))
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
251 (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
252 (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
253 (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
254 (define-key map [separator-format] '("--"))
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
255 (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
256 (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
257 (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
258 (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
259 (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
260 (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
261
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
262 (defun emacs-lisp-byte-compile ()
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
263 "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
264 (interactive)
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
265 (if buffer-file-name
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
266 (byte-compile-file buffer-file-name)
14116
5f985037b64f (emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents: 13802
diff changeset
267 (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
268
14719
d477c6f756df Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents: 14628
diff changeset
269 (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
270 "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
271 (interactive)
5f985037b64f (emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents: 13802
diff changeset
272 (or buffer-file-name
5f985037b64f (emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents: 13802
diff changeset
273 (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
274 (require 'bytecomp)
5f985037b64f (emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents: 13802
diff changeset
275 ;; 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
276 (if (and (buffer-modified-p)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
277 (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
278 (save-buffer))
d477c6f756df Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents: 14628
diff changeset
279 (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
280 (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
281 (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
282 (byte-compile-file buffer-file-name t))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
283
25630
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
284 (defcustom emacs-lisp-mode-hook nil
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
285 "Hook run when entering Emacs Lisp mode."
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
286 :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
287 :type 'hook
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
288 :group 'lisp)
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
289
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
290 (defcustom lisp-mode-hook nil
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
291 "Hook run when entering Lisp mode."
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
292 :options '(imenu-add-menubar-index)
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
293 :type 'hook
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
294 :group 'lisp)
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
295
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
296 (defcustom lisp-interaction-mode-hook nil
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
297 "Hook run when entering Lisp Interaction mode."
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
298 :options '(turn-on-eldoc-mode)
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
299 :type 'hook
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
300 :group 'lisp)
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
301
41332
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
302 (defun emacs-lisp-mode ()
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
303 "Major mode for editing Lisp code to run in Emacs.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
304 Commands:
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
305 Delete converts tabs to spaces as it moves back.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
306 Blank lines separate paragraphs. Semicolons start comments.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
307 \\{emacs-lisp-mode-map}
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
308 Entry to this mode calls the value of `emacs-lisp-mode-hook'
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
309 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
310 (interactive)
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
311 (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
312 (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
313 (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
314 (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
315 (setq mode-name "Emacs-Lisp")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
316 (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
317 (setq imenu-case-fold-search nil)
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
318 (run-hooks 'emacs-lisp-mode-hook))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
319
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
320 (defvar lisp-mode-map
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
321 (let ((map (make-sparse-keymap)))
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
322 (set-keymap-parent map lisp-mode-shared-map)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
323 (define-key map "\e\C-x" 'lisp-eval-defun)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
324 (define-key map "\C-c\C-z" 'run-lisp)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
325 map)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
326 "Keymap for ordinary Lisp mode.
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
327 All commands in `lisp-mode-shared-map' are inherited by this map.")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
328
41332
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
329 (defun lisp-mode ()
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
330 "Major mode for editing Lisp code for Lisps other than GNU Emacs Lisp.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
331 Commands:
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
332 Delete converts tabs to spaces as it moves back.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
333 Blank lines separate paragraphs. Semicolons start comments.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
334 \\{lisp-mode-map}
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
335 Note that `run-lisp' may be used either to start an inferior Lisp job
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
336 or to switch back to an existing one.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
337
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
338 Entry to this mode calls the value of `lisp-mode-hook'
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
339 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
340 (interactive)
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
341 (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
342 (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
343 (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
344 (setq mode-name "Lisp")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
345 (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
346 (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
347 (setq comment-start-skip
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
348 "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
41332
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
349 (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
350 (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
351 (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
352 (set-syntax-table 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
353 (run-hooks 'lisp-mode-hook))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
354
28324
979a905864ab (lisp-eval-defun): Make arglist compatible with inf-lisp version.
Dave Love <fx@gnu.org>
parents: 27934
diff changeset
355 ;; 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
356 (defun lisp-eval-defun (&optional and-go)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
357 "Send the current defun to the Lisp process made by \\[run-lisp]."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
358 (interactive)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
359 (error "Process lisp does not exist"))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
360
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
361 (defvar lisp-interaction-mode-map
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
362 (let ((map (make-sparse-keymap)))
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
363 (set-keymap-parent map lisp-mode-shared-map)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
364 (define-key map "\e\C-x" 'eval-defun)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
365 (define-key map "\e\t" 'lisp-complete-symbol)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
366 (define-key map "\n" 'eval-print-last-sexp)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
367 map)
23738
2ef2813414b6 (lisp-interaction-mode-map): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23723
diff changeset
368 "Keymap for Lisp Interaction mode.
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
369 All commands in `lisp-mode-shared-map' are inherited by this map.")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
370
41512
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
371 (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
372 (define-derived-mode lisp-interaction-mode emacs-lisp-mode "Lisp Interaction"
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
373 "Major mode for typing and evaluating Lisp forms.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
374 Like Lisp mode except that \\[eval-print-last-sexp] evals the Lisp expression
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
375 before point, and prints its value into the buffer, advancing point.
41085
a5e4e3a88a9e Fix typo.
Pavel Janík <Pavel@Janik.cz>
parents: 40790
diff changeset
376 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
377 and `eval-expression-print-level'.
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
378
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
379 Commands:
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
380 Delete converts tabs to spaces as it moves back.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
381 Paragraphs are separated only by blank lines.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
382 Semicolons start comments.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
383 \\{lisp-interaction-mode-map}
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
384 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
385 if that value is non-nil.")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
386
248
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
387 (defun eval-print-last-sexp ()
38560
df8cff64f0f3 (eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
388 "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
389
df8cff64f0f3 (eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
390 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
391 `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
392 which see."
248
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
393 (interactive)
422
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
394 (let ((standard-output (current-buffer)))
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
395 (terpri)
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
396 (eval-last-sexp t)
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
397 (terpri)))
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
398
38572
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
399
38585
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
400 (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
401 "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
402 BEG and END are the start and end of the output in current-buffer.
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
403 VALUE is the Lisp value printed, ALT1 and ALT2 are strings for the
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
404 alternative printed representations that can be displayed."
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
405 (let ((map (make-sparse-keymap)))
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
406 (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
407 (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
408 (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
409 (add-text-properties
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
410 beg end
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
411 `(printed-value (,value ,alt1 ,alt2)
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
412 mouse-face highlight
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
413 keymap ,map
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
414 help-echo "RET, mouse-2: toggle abbreviated display"
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
415 rear-nonsticky (mouse-face keymap help-echo
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
416 printed-value)))))
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
417
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
418
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
419 (defun last-sexp-toggle-display ()
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
420 "Toggle between abbreviated and unabbreviated printed representations."
38572
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
421 (interactive)
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
422 (let ((value (get-text-property (point) 'printed-value)))
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
423 (when value
40730
b1a039465517 (last-sexp-toggle-display): Cope if previous-single-property-change or
Richard M. Stallman <rms@gnu.org>
parents: 40409
diff changeset
424 (let ((beg (or (previous-single-property-change (point) 'printed-value) (point)))
b1a039465517 (last-sexp-toggle-display): Cope if previous-single-property-change or
Richard M. Stallman <rms@gnu.org>
parents: 40409
diff changeset
425 (end (or (next-single-char-property-change (point) 'printed-value) (point)))
38578
4dce109d0aa3 (eval-last-sexp-1): Don't search for
Gerd Moellmann <gerd@gnu.org>
parents: 38576
diff changeset
426 (standard-output (current-buffer))
38585
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
427 (point (point)))
38572
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
428 (delete-region beg end)
38585
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
429 (insert (nth 1 value))
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
430 (last-sexp-setup-props beg (point)
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
431 (nth 0 value)
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
432 (nth 2 value)
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
433 (nth 1 value))
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
434 (goto-char (min (point-max) point))))))
38572
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
435
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
436
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
437 (defun eval-last-sexp-1 (eval-last-sexp-arg-internal)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
438 "Evaluate sexp before point; print value in minibuffer.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
439 With argument, print output into current buffer."
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
440 (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
441 (let ((value
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
442 (eval (let ((stab (syntax-table))
17066
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
443 (opoint (point))
19057
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
444 ignore-quotes
17066
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
445 expr)
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
446 (unwind-protect
249
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
447 (save-excursion
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
448 (set-syntax-table emacs-lisp-mode-syntax-table)
19057
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
449 ;; If this sexp appears to be enclosed in `...'
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
450 ;; then ignore the surrounding quotes.
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
451 (setq ignore-quotes
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
452 (or (eq (following-char) ?\')
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
453 (eq (preceding-char) ?\')))
249
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
454 (forward-sexp -1)
25642
556711217681 (eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents: 25630
diff changeset
455 ;; If we were after `?\e' (or similar case),
556711217681 (eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents: 25630
diff changeset
456 ;; use the whole thing, not just the `e'.
556711217681 (eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents: 25630
diff changeset
457 (when (eq (preceding-char) ?\\)
556711217681 (eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents: 25630
diff changeset
458 (forward-char -1)
556711217681 (eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents: 25630
diff changeset
459 (when (eq (preceding-char) ??)
556711217681 (eval-last-sexp): If after ?\LETTER, use all of that as the sexp.
Richard M. Stallman <rms@gnu.org>
parents: 25630
diff changeset
460 (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
461
30666
d470d496fd53 (eval-last-sexp-1): Handle `#N=' labels.
Gerd Moellmann <gerd@gnu.org>
parents: 30055
diff changeset
462 ;; Skip over `#N='s.
d470d496fd53 (eval-last-sexp-1): Handle `#N=' labels.
Gerd Moellmann <gerd@gnu.org>
parents: 30055
diff changeset
463 (when (eq (preceding-char) ?=)
d470d496fd53 (eval-last-sexp-1): Handle `#N=' labels.
Gerd Moellmann <gerd@gnu.org>
parents: 30055
diff changeset
464 (let (labeled-p)
d470d496fd53 (eval-last-sexp-1): Handle `#N=' labels.
Gerd Moellmann <gerd@gnu.org>
parents: 30055
diff changeset
465 (save-excursion
d470d496fd53 (eval-last-sexp-1): Handle `#N=' labels.
Gerd Moellmann <gerd@gnu.org>
parents: 30055
diff changeset
466 (skip-chars-backward "0-9#=")
d470d496fd53 (eval-last-sexp-1): Handle `#N=' labels.
Gerd Moellmann <gerd@gnu.org>
parents: 30055
diff changeset
467 (setq labeled-p (looking-at "\\(#[0-9]+=\\)+")))
d470d496fd53 (eval-last-sexp-1): Handle `#N=' labels.
Gerd Moellmann <gerd@gnu.org>
parents: 30055
diff changeset
468 (when labeled-p
d470d496fd53 (eval-last-sexp-1): Handle `#N=' labels.
Gerd Moellmann <gerd@gnu.org>
parents: 30055
diff changeset
469 (forward-sexp -1))))
d470d496fd53 (eval-last-sexp-1): Handle `#N=' labels.
Gerd Moellmann <gerd@gnu.org>
parents: 30055
diff changeset
470
1163
c205d560cc22 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 878
diff changeset
471 (save-restriction
19057
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
472 ;; vladimir@cs.ualberta.ca 30-Jul-1997: skip ` in
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
473 ;; `variable' so that the value is returned, not the
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
474 ;; name
19057
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
475 (if (and ignore-quotes
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
476 (eq (following-char) ?`))
b1251bcaaa0e (eval-last-sexp): Ignore `...' around sexp.
Richard M. Stallman <rms@gnu.org>
parents: 17353
diff changeset
477 (forward-char))
1163
c205d560cc22 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 878
diff changeset
478 (narrow-to-region (point-min) opoint)
17066
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
479 (setq expr (read (current-buffer)))
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
480 ;; If it's an (interactive ...) form, it's more
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
481 ;; useful to show how an interactive call would
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
482 ;; use it.
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
483 (and (consp expr)
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
484 (eq (car expr) 'interactive)
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
485 (setq expr
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
486 (list 'call-interactively
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
487 (list 'quote
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
488 (list 'lambda
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
489 '(&rest args)
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
490 expr
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
491 'args)))))
852e90e67fff (eval-last-sexp): Allow let-bindings to terminate
Karl Heuer <kwzh@gnu.org>
parents: 16687
diff changeset
492 expr))
25703
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
493 (set-syntax-table stab))))))
38578
4dce109d0aa3 (eval-last-sexp-1): Don't search for
Gerd Moellmann <gerd@gnu.org>
parents: 38576
diff changeset
494 (let ((unabbreviated (let ((print-length nil) (print-level nil))
4dce109d0aa3 (eval-last-sexp-1): Don't search for
Gerd Moellmann <gerd@gnu.org>
parents: 38576
diff changeset
495 (prin1-to-string value)))
4dce109d0aa3 (eval-last-sexp-1): Don't search for
Gerd Moellmann <gerd@gnu.org>
parents: 38576
diff changeset
496 (print-length eval-expression-print-length)
38566
795feb9422e4 (eval-last-sexp-1): If standard-output
Gerd Moellmann <gerd@gnu.org>
parents: 38560
diff changeset
497 (print-level eval-expression-print-level)
38576
c6a3a3a3c0de (eval-last-sexp-1): Look for a `...'
Gerd Moellmann <gerd@gnu.org>
parents: 38572
diff changeset
498 (beg (point))
c6a3a3a3c0de (eval-last-sexp-1): Look for a `...'
Gerd Moellmann <gerd@gnu.org>
parents: 38572
diff changeset
499 end)
40759
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
500 (prog1
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
501 (prin1 value)
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
502 (setq end (point))
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
503 (when (and (bufferp standard-output)
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
504 (or (not (null print-length))
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
505 (not (null print-level)))
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
506 (not (string= unabbreviated
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
507 (buffer-substring-no-properties beg end))))
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
508 (last-sexp-setup-props beg end value
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
509 unabbreviated
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
510 (buffer-substring-no-properties beg end))
7441fb1a40ac (eval-last-sexp-1): Return the value of the evaluated form.
Richard M. Stallman <rms@gnu.org>
parents: 40730
diff changeset
511 ))))))
38572
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
512
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
513
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
514 (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
515 "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
516 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
517 (interactive "P")
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
518 (if (null eval-expression-debug-on-error)
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
519 (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
520 (let ((old-value (make-symbol "t")) new-value value)
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
521 (let ((debug-on-error old-value))
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
522 (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
523 (setq new-value debug-on-error))
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
524 (unless (eq old-value new-value)
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
525 (setq debug-on-error new-value))
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
526 value)))
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
527
25434
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
528 (defun eval-defun-1 (form)
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
529 "Change defvar into defconst within FORM.
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
530 Likewise for other constructs as necessary."
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
531 ;; 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
532 ;; the same, since this gets a macroexpended form.
25434
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
533 (cond ((and (eq (car form) 'defvar)
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
534 (cdr-safe (cdr-safe form)))
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
535 ;; Force variable to be bound.
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
536 (cons 'defconst (cdr form)))
28324
979a905864ab (lisp-eval-defun): Make arglist compatible with inf-lisp version.
Dave Love <fx@gnu.org>
parents: 27934
diff changeset
537 ;; `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
538 ;; `custom-declare-variable' with a quoted value arg.
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
539 ((and (eq (car form) 'custom-declare-variable)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
540 (default-boundp (eval (nth 1 form))))
25434
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
541 ;; 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
542 (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
543 form)
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
544 ((eq (car form) 'progn)
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
545 (cons 'progn (mapcar 'eval-defun-1 (cdr form))))
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
546 (t form)))
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
547
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
548 (defun eval-defun-2 ()
248
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
549 "Evaluate defun that point is in or before.
24895
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
550 The value is displayed in the minibuffer.
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
551 If the current defun is actually a call to `defvar',
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
552 then reset the variable using the initial value expression
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
553 even if the variable already has some other value.
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
554 \(Normally `defvar' does not change the variable's value
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
555 if it already has a value.\)
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
556
23388
8aa1f99efb66 (eval-defun): Return the evaluation result.
Karl Heuer <kwzh@gnu.org>
parents: 23191
diff changeset
557 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
558 Return the result of evaluation."
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
559 (interactive "P")
25703
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
560 (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
561 (print-length eval-expression-print-length)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
562 (print-level eval-expression-print-level))
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
563 (save-excursion
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
564 ;; 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
565 ;; 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
566 ;; variable. Re-written using `apply' to avoid capturing
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
567 ;; variables like `end'.
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
568 (apply
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
569 #'eval-region
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
570 (let ((standard-output t)
25703
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
571 beg end form)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
572 ;; 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
573 (save-excursion
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
574 (end-of-defun)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
575 (beginning-of-defun)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
576 (setq beg (point))
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
577 (setq form (read (current-buffer)))
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
578 (setq end (point)))
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
579 ;; Alter the form if necessary, changing defvar into defconst, etc.
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
580 (setq form (eval-defun-1 (macroexpand form)))
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
581 (list beg end standard-output
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
582 `(lambda (ignore)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
583 ;; Skipping to the end of the specified region
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
584 ;; will make eval-region return.
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
585 (goto-char ,end)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
586 ',form))))))
25107
2aa414a532f2 (eval-defun): Re-written to avoid
Dave Love <fx@gnu.org>
parents: 24895
diff changeset
587 ;; The result of evaluation has been put onto VALUES. So return it.
2aa414a532f2 (eval-defun): Re-written to avoid
Dave Love <fx@gnu.org>
parents: 24895
diff changeset
588 (car values))
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
589
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
590 (defun eval-defun (edebug-it)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
591 "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
592
40409
216728b10960 (eval-defun): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 39564
diff changeset
593 If the current defun is actually a call to `defvar' or `defcustom',
216728b10960 (eval-defun): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 39564
diff changeset
594 evaluating it this way resets the variable using its initial value
216728b10960 (eval-defun): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 39564
diff changeset
595 expression even if the variable already has some other value.
216728b10960 (eval-defun): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 39564
diff changeset
596 \(Normally `defvar' and `defcustom' do not alter the value if there
216728b10960 (eval-defun): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 39564
diff changeset
597 already is one.)
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
598
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
599 With a prefix argument, instrument the code for Edebug.
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
600
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
601 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
602 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
603 instrumented, just FUNCTION is printed.
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
604
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
605 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
606 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
607 `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
608 which see."
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
609 (interactive "P")
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
610 (cond (edebug-it
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
611 (require 'edebug)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
612 (eval-defun (not edebug-all-defs)))
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
613 (t
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
614 (if (null eval-expression-debug-on-error)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
615 (eval-defun-2)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
616 (let ((old-value (make-symbol "t")) new-value value)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
617 (let ((debug-on-error old-value))
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
618 (setq value (eval-defun-2))
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
619 (setq new-value debug-on-error))
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
620 (unless (eq old-value new-value)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
621 (setq debug-on-error new-value))
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
622 value)))))
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
623
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
624
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
625 (defun lisp-comment-indent ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
626 (if (looking-at "\\s<\\s<\\s<")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
627 (current-column)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
628 (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
629 (let ((tem (or (calculate-lisp-indent) (current-column))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
630 (if (listp tem) (car tem) tem))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
631 (skip-chars-backward " \t")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
632 (max (if (bolp) 0 (1+ (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
633 comment-column))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
634
40790
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
635 ;; 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
636 ;; 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
637 ;; taking a `;' inside a string started on another line for a comment starter.
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
638 ;; Note: `newcomment' gets it right in 99% of the cases if you're using
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
639 ;; font-lock, anyway, 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
640 (defun lisp-mode-auto-fill ()
3627bd4b83d9 (lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20013
diff changeset
641 (if (> (current-column) (current-fill-column))
3627bd4b83d9 (lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20013
diff changeset
642 (if (save-excursion
41512
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
643 (nth 4 (syntax-ppss (point))))
20333
3627bd4b83d9 (lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20013
diff changeset
644 (do-auto-fill)
41512
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
645 (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
646 comment-auto-fill-only-comments)
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
647 (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
648 (do-auto-fill))))))
20333
3627bd4b83d9 (lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20013
diff changeset
649
37991
908deaf5c7f5 (lisp-indent-offset): Add a doc string.
Eli Zaretskii <eliz@gnu.org>
parents: 37739
diff changeset
650 (defvar lisp-indent-offset nil
908deaf5c7f5 (lisp-indent-offset): Add a doc string.
Eli Zaretskii <eliz@gnu.org>
parents: 37739
diff changeset
651 "If non-nil, indent second line of expressions that many more columns.")
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
652 (defvar lisp-indent-function 'lisp-indent-function)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
653
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
654 (defun lisp-indent-line (&optional whole-exp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
655 "Indent current line as Lisp code.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
656 With argument, indent any additional lines of the same expression
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
657 rigidly along with this one."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
658 (interactive "P")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
659 (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
660 (pos (- (point-max) (point)))
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
661 (beg (progn (beginning-of-line) (point))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
662 (skip-chars-forward " \t")
17308
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
663 (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
664 ;; 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
665 ;; or a line that starts in a string.
677
7a9b4ea68565 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 659
diff changeset
666 (goto-char (- (point-max) pos))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
667 (if (and (looking-at "\\s<") (not (looking-at "\\s<\\s<")))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
668 ;; Single-semicolon comment lines should be indented
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
669 ;; as comment lines, not as code.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
670 (progn (indent-for-comment) (forward-char -1))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
671 (if (listp indent) (setq indent (car indent)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
672 (setq shift-amt (- indent (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
673 (if (zerop shift-amt)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
674 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
675 (delete-region beg (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
676 (indent-to indent)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
677 ;; If initial point was within line's indentation,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
678 ;; position after the indentation. Else stay at same point in text.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
679 (if (> (- (point-max) pos) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
680 (goto-char (- (point-max) pos)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
681 ;; If desired, shift remaining lines of expression the same amount.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
682 (and whole-exp (not (zerop shift-amt))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
683 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
684 (goto-char beg)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
685 (forward-sexp 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
686 (setq end (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
687 (goto-char beg)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
688 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
689 (setq beg (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
690 (> end beg))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
691 (indent-code-rigidly beg end shift-amt)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
692
9424
738999b0296f Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9423
diff changeset
693 (defvar calculate-lisp-indent-last-sexp)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
694
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
695 (defun calculate-lisp-indent (&optional parse-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
696 "Return appropriate indentation for current line as Lisp code.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
697 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
698 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
699 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
700
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
701 The value can also be a list of the form (COLUMN CONTAINING-SEXP-START).
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
702 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
703 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
704 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
705 is the buffer position of the start of the containing expression."
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
706 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
707 (beginning-of-line)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
708 (let ((indent-point (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
709 state paren-depth
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
710 ;; setting this to a number inhibits calling hook
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
711 (desired-indent nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
712 (retry t)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
713 calculate-lisp-indent-last-sexp containing-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
714 (if parse-start
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
715 (goto-char parse-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
716 (beginning-of-defun))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
717 ;; Find outermost containing sexp
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
718 (while (< (point) indent-point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
719 (setq state (parse-partial-sexp (point) indent-point 0)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
720 ;; Find innermost containing sexp
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
721 (while (and retry
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
722 state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
723 (> (setq paren-depth (elt state 0)) 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
724 (setq retry nil)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
725 (setq calculate-lisp-indent-last-sexp (elt state 2))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
726 (setq containing-sexp (elt state 1))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
727 ;; Position following last unclosed open.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
728 (goto-char (1+ containing-sexp))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
729 ;; Is there a complete sexp since then?
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
730 (if (and calculate-lisp-indent-last-sexp
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
731 (> calculate-lisp-indent-last-sexp (point)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
732 ;; 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
733 (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
734 indent-point 0)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
735 (if (setq retry (car (cdr peek))) (setq state peek)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
736 (if retry
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
737 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
738 ;; Innermost containing sexp found
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
739 (goto-char (1+ containing-sexp))
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
740 (if (not calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
741 ;; indent-point immediately follows open paren.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
742 ;; Don't call hook.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
743 (setq desired-indent (current-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
744 ;; 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
745 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
746 (cond ((looking-at "\\s(")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
747 ;; First element of containing sexp is a list.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
748 ;; Indent under that list.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
749 )
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
750 ((> (save-excursion (forward-line 1) (point))
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
751 calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
752 ;; This is the first line to start within the containing sexp.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
753 ;; It's almost certainly a function call.
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
754 (if (= (point) calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
755 ;; Containing sexp has nothing before this line
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
756 ;; except the first element. Indent under that element.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
757 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
758 ;; Skip the first element, find start of second (the first
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
759 ;; argument of the function call) and indent under.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
760 (progn (forward-sexp 1)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
761 (parse-partial-sexp (point)
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
762 calculate-lisp-indent-last-sexp
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
763 0 t)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
764 (backward-prefix-chars))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
765 (t
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
766 ;; Indent beneath first sexp on same line as
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
767 ;; `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
768 ;; almost certainly a function call.
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
769 (goto-char calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
770 (beginning-of-line)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
771 (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
772 0 t)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
773 (backward-prefix-chars)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
774 ;; 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
775 ;; Call indentation hook except when overridden by lisp-indent-offset
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
776 ;; or if the desired indentation has already been computed.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
777 (let ((normal-indent (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
778 (cond ((elt state 3)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
779 ;; 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
780 nil)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
781 ((and (integerp lisp-indent-offset) containing-sexp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
782 ;; Indent by constant offset
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
783 (goto-char containing-sexp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
784 (+ (current-column) lisp-indent-offset))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
785 (desired-indent)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
786 ((and (boundp 'lisp-indent-function)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
787 lisp-indent-function
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
788 (not retry))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
789 (or (funcall lisp-indent-function indent-point state)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
790 normal-indent))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
791 (t
214
a1430f8459e5 *** empty log message ***
Brian Preble <rassilon@gnu.org>
parents: 213
diff changeset
792 normal-indent))))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
793
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
794 (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
795 "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
796 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
797 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
798
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
799 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
800 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
801 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
802
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
803 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
804 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
805 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
806 * `defun', meaning indent `defun'-style;
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
807 * 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
808 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
809 aruments like a body;
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
810 * 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
811 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
812 the indentation.
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
813
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
814 This function also returns nil meaning don't specify the indentation."
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
815 (let ((normal-indent (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
816 (goto-char (1+ (elt state 1)))
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
817 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
818 (if (and (elt state 2)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
819 (not (looking-at "\\sw\\|\\s_")))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
820 ;; car of form doesn't seem to be a a symbol
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
821 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
822 (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
823 calculate-lisp-indent-last-sexp))
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
824 (progn (goto-char calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
825 (beginning-of-line)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
826 (parse-partial-sexp (point)
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
827 calculate-lisp-indent-last-sexp 0 t)))
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
828 ;; Indent under the list or under the first sexp on the same
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
829 ;; line as calculate-lisp-indent-last-sexp. Note that first
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
830 ;; thing on that line has to be complete sexp since we are
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
831 ;; inside the innermost containing sexp.
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
832 (backward-prefix-chars)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
833 (current-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
834 (let ((function (buffer-substring (point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
835 (progn (forward-sexp 1) (point))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
836 method)
3638
45169f86d3a4 (lisp-indent-function): Look for either
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
837 (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
838 (get (intern-soft function) 'lisp-indent-hook)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
839 (cond ((or (eq method 'defun)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
840 (and (null method)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
841 (> (length function) 3)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
842 (string-match "\\`def" function)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
843 (lisp-indent-defform state indent-point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
844 ((integerp method)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
845 (lisp-indent-specform method state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
846 indent-point normal-indent))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
847 (method
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
848 (funcall method state indent-point)))))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
849
16687
049c87a96dca Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16563
diff changeset
850 (defvar lisp-body-indent 2
2933
420dfaaacfc5 (lisp-body-indent): Add doc.
Richard M. Stallman <rms@gnu.org>
parents: 2450
diff changeset
851 "Number of columns to indent the second line of a `(def...)' form.")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
852
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
853 (defun lisp-indent-specform (count state indent-point normal-indent)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
854 (let ((containing-form-start (elt state 1))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
855 (i count)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
856 body-indent containing-form-column)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
857 ;; Move to the start of containing form, calculate indentation
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
858 ;; to use for non-distinguished forms (> count), and move past the
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
859 ;; function symbol. lisp-indent-function guarantees that there is at
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
860 ;; least one word or symbol character following open paren of containing
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
861 ;; form.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
862 (goto-char containing-form-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
863 (setq containing-form-column (current-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
864 (setq body-indent (+ lisp-body-indent containing-form-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
865 (forward-char 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
866 (forward-sexp 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
867 ;; Now find the start of the last form.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
868 (parse-partial-sexp (point) indent-point 1 t)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
869 (while (and (< (point) indent-point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
870 (condition-case ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
871 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
872 (setq count (1- count))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
873 (forward-sexp 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
874 (parse-partial-sexp (point) indent-point 1 t))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
875 (error nil))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
876 ;; Point is sitting on first character of last (or count) sexp.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
877 (if (> count 0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
878 ;; A distinguished form. If it is the first or second form use double
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
879 ;; lisp-body-indent, else normal indent. With lisp-body-indent bound
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
880 ;; to 2 (the default), this just happens to work the same with if as
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
881 ;; the older code, but it makes unwind-protect, condition-case,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
882 ;; with-output-to-temp-buffer, et. al. much more tasteful. The older,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
883 ;; less hacked, behavior can be obtained by replacing below with
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
884 ;; (list normal-indent containing-form-start).
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
885 (if (<= (- i count) 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
886 (list (+ containing-form-column (* 2 lisp-body-indent))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
887 containing-form-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
888 (list normal-indent containing-form-start))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
889 ;; A non-distinguished form. Use body-indent if there are no
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
890 ;; distinguished forms and this is the first undistinguished form,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
891 ;; or if this is the first undistinguished form and the preceding
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
892 ;; distinguished form has indentation at least as great as body-indent.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
893 (if (or (and (= i 0) (= count 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
894 (and (= count 0) (<= body-indent normal-indent)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
895 body-indent
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
896 normal-indent))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
897
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
898 (defun lisp-indent-defform (state indent-point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
899 (goto-char (car (cdr state)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
900 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
901 (if (> (point) (car (cdr (cdr state))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
902 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
903 (goto-char (car (cdr state)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
904 (+ lisp-body-indent (current-column)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
905
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
906
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
907 ;; (put 'progn 'lisp-indent-function 0), say, causes progn to be indented
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
908 ;; like defun if the first form is placed on the next line, otherwise
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
909 ;; it is indented like any other form (i.e. forms line up under first).
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
910
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
911 (put 'lambda 'lisp-indent-function 'defun)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
912 (put 'autoload 'lisp-indent-function 'defun)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
913 (put 'progn 'lisp-indent-function 0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
914 (put 'prog1 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
915 (put 'prog2 'lisp-indent-function 2)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
916 (put 'save-excursion 'lisp-indent-function 0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
917 (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
918 (put 'save-selected-window 'lisp-indent-function 0)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
919 (put 'save-restriction 'lisp-indent-function 0)
1163
c205d560cc22 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 878
diff changeset
920 (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
921 (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
922 (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
923 (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
924 (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
925 (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
926 (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
927 (put 'with-temp-message 'lisp-indent-function 1)
27300
baffb2de5ce9 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 26682
diff changeset
928 (put 'with-syntax-table 'lisp-indent-function 1)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
929 (put 'let 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
930 (put 'let* 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
931 (put 'while 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
932 (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
933 (put 'read-if 'lisp-indent-function 2)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
934 (put 'catch 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
935 (put 'condition-case 'lisp-indent-function 2)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
936 (put 'unwind-protect 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
937 (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
938 (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
939 (put 'dolist 'lisp-indent-function 1)
a681b4de47a1 Add indent specs for dolist, dotimes, when, unless.
Dave Love <fx@gnu.org>
parents: 27303
diff changeset
940 (put 'dotimes 'lisp-indent-function 1)
a681b4de47a1 Add indent specs for dolist, dotimes, when, unless.
Dave Love <fx@gnu.org>
parents: 27303
diff changeset
941 (put 'when 'lisp-indent-function 1)
a681b4de47a1 Add indent specs for dolist, dotimes, when, unless.
Dave Love <fx@gnu.org>
parents: 27303
diff changeset
942 (put 'unless 'lisp-indent-function 1)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
943
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
944 (defun indent-sexp (&optional endpos)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
945 "Indent each line of the list starting just after point.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
946 If optional arg ENDPOS is given, indent each line, stopping when
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
947 ENDPOS is encountered."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
948 (interactive)
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
949 (let ((indent-stack (list nil))
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
950 (next-depth 0)
10594
aadef46f00f7 (lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents: 9424
diff changeset
951 ;; 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
952 ;; 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
953 ;; 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
954 ;; 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
955 ;; 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
956 (starting-point (if endpos nil (point)))
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
957 (last-point (point))
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
958 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
959 (or endpos
aadef46f00f7 (lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents: 9424
diff changeset
960 ;; 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
961 (save-excursion (forward-sexp 1)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
962 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
963 (setq outer-loop-done nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
964 (while (if endpos (< (point) endpos)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
965 (not outer-loop-done))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
966 (setq last-depth next-depth
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
967 inner-loop-done nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
968 ;; Parse this line so we can learn the state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
969 ;; to indent the next line.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
970 ;; This inner loop goes through only once
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
971 ;; unless a line ends inside a string.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
972 (while (and (not inner-loop-done)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
973 (not (setq outer-loop-done (eobp))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
974 (setq state (parse-partial-sexp (point) (progn (end-of-line) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
975 nil nil state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
976 (setq next-depth (car state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
977 ;; If the line contains a comment other than the sort
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
978 ;; that is indented like code,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
979 ;; indent it now with indent-for-comment.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
980 ;; Comments indented like code are right already.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
981 ;; In any case clear the in-comment flag in the state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
982 ;; because parse-partial-sexp never sees the newlines.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
983 (if (car (nthcdr 4 state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
984 (progn (indent-for-comment)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
985 (end-of-line)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
986 (setcar (nthcdr 4 state) nil)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
987 ;; If this line ends inside a string,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
988 ;; go straight to next line, remaining within the inner loop,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
989 ;; and turn off the \-flag.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
990 (if (car (nthcdr 3 state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
991 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
992 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
993 (setcar (nthcdr 5 state) nil))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
994 (setq inner-loop-done t)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
995 (and endpos
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
996 (<= next-depth 0)
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
997 (progn
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
998 (setq indent-stack (nconc indent-stack
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
999 (make-list (- next-depth) nil))
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1000 last-depth (- last-depth next-depth)
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1001 next-depth 0)))
10594
aadef46f00f7 (lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents: 9424
diff changeset
1002 (or outer-loop-done endpos
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1003 (setq outer-loop-done (<= next-depth 0)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1004 (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
1005 (forward-line 1)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1006 (while (> last-depth next-depth)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1007 (setq indent-stack (cdr indent-stack)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1008 last-depth (1- last-depth)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1009 (while (< last-depth next-depth)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1010 (setq indent-stack (cons nil indent-stack)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1011 last-depth (1+ last-depth)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1012 ;; Now go to the next line and indent it according
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1013 ;; to what we learned from parsing the previous one.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1014 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1015 (setq bol (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1016 (skip-chars-forward " \t")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1017 ;; But not if the line is blank, or just a comment
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1018 ;; (except for double-semi comments; indent them as usual).
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1019 (if (or (eobp) (looking-at "\\s<\\|\n"))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1020 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1021 (if (and (car indent-stack)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1022 (>= (car indent-stack) 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1023 (setq this-indent (car indent-stack))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1024 (let ((val (calculate-lisp-indent
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1025 (if (car indent-stack) (- (car indent-stack))
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1026 starting-point))))
17308
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1027 (if (null val)
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1028 (setq this-indent val)
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1029 (if (integerp val)
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1030 (setcar indent-stack
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1031 (setq this-indent val))
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1032 (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
1033 (setq this-indent (car val))))))
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1034 (if (and this-indent (/= (current-column) this-indent))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1035 (progn (delete-region bol (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1036 (indent-to this-indent)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1037 (or outer-loop-done
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1038 (setq outer-loop-done (= (point) last-point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1039 (setq last-point (point)))))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1040
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1041 (defun lisp-indent-region (start end)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
1042 "Indent every line whose first char is between START and END inclusive."
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1043 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1044 (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
1045 (goto-char start)
aadef46f00f7 (lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents: 9424
diff changeset
1046 (and (bolp) (not (eolp))
aadef46f00f7 (lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents: 9424
diff changeset
1047 (lisp-indent-line))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1048 (indent-sexp endmark)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1049 (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
1050
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1051 ;;;; Lisp paragraph filling commands.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1052
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1053 (defun lisp-fill-paragraph (&optional justify)
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1054 "Like \\[fill-paragraph], but handle Emacs Lisp comments.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1055 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
1056 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
1057 and initial semicolons."
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1058 (interactive "P")
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1059 (let (
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1060 ;; Non-nil if the current line contains a comment.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1061 has-comment
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1062
14817
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1063 ;; Non-nil if the current line contains code and a comment.
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1064 has-code-and-comment
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1065
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1066 ;; If has-comment, the appropriate fill-prefix for the comment.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1067 comment-fill-prefix
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1068 )
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1069
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1070 ;; Figure out what kind of comment we are looking at.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1071 (save-excursion
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1072 (beginning-of-line)
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1073 (cond
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1074
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1075 ;; A line with nothing but a comment on it?
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1076 ((looking-at "[ \t]*;[; \t]*")
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1077 (setq has-comment t
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1078 comment-fill-prefix (buffer-substring (match-beginning 0)
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1079 (match-end 0))))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1080
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1081 ;; A line with some code, followed by a comment? Remember that the
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1082 ;; semi which starts the comment shouldn't be part of a string or
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1083 ;; character.
41512
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
1084 ((let ((state (syntax-ppss (line-end-position))))
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
1085 (when (nth 4 state)
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
1086 (goto-char (nth 8 state))
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
1087 (looking-at ";+[\t ]*")))
14817
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1088 (setq has-comment t has-code-and-comment t)
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1089 (setq comment-fill-prefix
40790
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
1090 (concat (make-string (/ (current-column) tab-width) ?\t)
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
1091 (make-string (% (current-column) tab-width) ?\ )
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1092 (buffer-substring (match-beginning 0) (match-end 0)))))))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1093
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1094 (if (not has-comment)
21213
2816d2c192fb (lisp-fill-paragraph): Adjust
Dave Love <fx@gnu.org>
parents: 21116
diff changeset
1095 ;; `paragraph-start' is set here (not in the buffer-local
2816d2c192fb (lisp-fill-paragraph): Adjust
Dave Love <fx@gnu.org>
parents: 21116
diff changeset
1096 ;; variable so that `forward-paragraph' et al work as
2816d2c192fb (lisp-fill-paragraph): Adjust
Dave Love <fx@gnu.org>
parents: 21116
diff changeset
1097 ;; expected) so that filling (doc) strings works sensibly.
2816d2c192fb (lisp-fill-paragraph): Adjust
Dave Love <fx@gnu.org>
parents: 21116
diff changeset
1098 ;; Adding the opening paren to avoid the following sexp being
2816d2c192fb (lisp-fill-paragraph): Adjust
Dave Love <fx@gnu.org>
parents: 21116
diff changeset
1099 ;; filled means that sexps generally aren't filled as normal
2816d2c192fb (lisp-fill-paragraph): Adjust
Dave Love <fx@gnu.org>
parents: 21116
diff changeset
1100 ;; text, which is probably sensible. The `;' and `:' stop the
2816d2c192fb (lisp-fill-paragraph): Adjust
Dave Love <fx@gnu.org>
parents: 21116
diff changeset
1101 ;; filled para at following comment lines and keywords
2816d2c192fb (lisp-fill-paragraph): Adjust
Dave Love <fx@gnu.org>
parents: 21116
diff changeset
1102 ;; (typically in `defcustom').
2816d2c192fb (lisp-fill-paragraph): Adjust
Dave Love <fx@gnu.org>
parents: 21116
diff changeset
1103 (let ((paragraph-start (concat paragraph-start
40790
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
1104 "\\|\\s-*[\(;:\"]"))
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
1105 ;; Avoid filling the first line of docstring.
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
1106 (paragraph-separate
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
1107 (concat paragraph-separate "\\|\\s-*\".*\\.$")))
21213
2816d2c192fb (lisp-fill-paragraph): Adjust
Dave Love <fx@gnu.org>
parents: 21116
diff changeset
1108 (fill-paragraph justify))
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1109
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1110 ;; Narrow to include only the comment, and then fill the region.
14628
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1111 (save-excursion
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1112 (save-restriction
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1113 (beginning-of-line)
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1114 (narrow-to-region
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1115 ;; Find the first line we should include in the region to fill.
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1116 (save-excursion
41310
ab1a42ecf560 (lisp-fill-paragraph): Don't move back to a line without a comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41085
diff changeset
1117 (while (and (zerop (forward-line -1))
ab1a42ecf560 (lisp-fill-paragraph): Don't move back to a line without a comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41085
diff changeset
1118 (looking-at "[ \t]*;")))
ab1a42ecf560 (lisp-fill-paragraph): Don't move back to a line without a comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41085
diff changeset
1119 ;; We may have gone too far. Go forward again.
ab1a42ecf560 (lisp-fill-paragraph): Don't move back to a line without a comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41085
diff changeset
1120 (or (looking-at ".*;")
ab1a42ecf560 (lisp-fill-paragraph): Don't move back to a line without a comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41085
diff changeset
1121 (forward-line 1))
14628
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1122 (point))
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1123 ;; Find the beginning of the first line past the region to fill.
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1124 (save-excursion
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1125 (while (progn (forward-line 1)
40790
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
1126 (looking-at "[ \t]*;")))
14628
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1127 (point)))
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1128
14628
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1129 ;; Lines with only semicolons on them can be paragraph boundaries.
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1130 (let* ((paragraph-start (concat paragraph-start "\\|[ \t;]*$"))
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1131 (paragraph-separate (concat paragraph-start "\\|[ \t;]*$"))
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1132 (paragraph-ignore-fill-prefix nil)
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1133 (fill-prefix comment-fill-prefix)
14817
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1134 (after-line (if has-code-and-comment
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1135 (save-excursion
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1136 (forward-line 1) (point))))
14628
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1137 (end (progn
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1138 (forward-paragraph)
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1139 (or (bolp) (newline 1))
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1140 (point)))
14817
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1141 ;; If this comment starts on a line with code,
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1142 ;; include that like in the filling.
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1143 (beg (progn (backward-paragraph)
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1144 (if (eq (point) after-line)
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1145 (forward-line -1))
cdd8a024f000 (lisp-fill-paragraph): Treat code-and-comment case specially.
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
1146 (point))))
14628
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1147 (fill-region-as-paragraph beg end
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1148 justify nil
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1149 (save-excursion
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1150 (goto-char beg)
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1151 (if (looking-at fill-prefix)
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1152 nil
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1153 (re-search-forward comment-start-skip)
c932ad13ccd9 (lisp-fill-paragraph): When filling a comment,
Karl Heuer <kwzh@gnu.org>
parents: 14495
diff changeset
1154 (point))))))))
10629
2c9bdcab7052 (lisp-fill-paragraph): Return t.
Richard M. Stallman <rms@gnu.org>
parents: 10628
diff changeset
1155 t))
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
1156
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1157 (defun indent-code-rigidly (start end arg &optional nochange-regexp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1158 "Indent all lines of code, starting in the region, sideways by ARG columns.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1159 Does not affect lines starting inside comments or strings, assuming that
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1160 the start of the region is not inside them.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1161
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1162 Called from a program, takes args START, END, COLUMNS and NOCHANGE-REGEXP.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1163 The last is a regexp which, if matched at the beginning of a line,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1164 means don't indent that line."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1165 (interactive "r\np")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1166 (let (state)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1167 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1168 (goto-char end)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1169 (setq end (point-marker))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1170 (goto-char start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1171 (or (bolp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1172 (setq state (parse-partial-sexp (point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1173 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1174 (forward-line 1) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1175 nil nil state)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1176 (while (< (point) end)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1177 (or (car (nthcdr 3 state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1178 (and nochange-regexp
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1179 (looking-at nochange-regexp))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1180 ;; If line does not start in string, indent it
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1181 (let ((indent (current-indentation)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1182 (delete-region (point) (progn (skip-chars-forward " \t") (point)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1183 (or (eolp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1184 (indent-to (max 0 (+ indent arg)) 0))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1185 (setq state (parse-partial-sexp (point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1186 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1187 (forward-line 1) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1188 nil nil state))))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 422
diff changeset
1189
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 422
diff changeset
1190 (provide 'lisp-mode)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 422
diff changeset
1191
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 584
diff changeset
1192 ;;; lisp-mode.el ends here