annotate lisp/emacs-lisp/lisp-mode.el @ 93120:ade33d67202c

(emacs-lisp-mode-map): Add menu entry for disassemble.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 21 Mar 2008 06:08:21 +0000
parents a155e008f7c7
children 641cbad340a8
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
64751
5b1a238fcbb4 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64349
diff changeset
3 ;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2002, 2003, 2004,
79704
78ee6fae0e41 Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 78730
diff changeset
4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 811
diff changeset
5
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 727
diff changeset
6 ;; Maintainer: FSF
811
e694e0879463 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
7 ;; Keywords: lisp, languages
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 727
diff changeset
8
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
10
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
78217
935157c0b596 Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents: 78180
diff changeset
13 ;; the Free Software Foundation; either version 3, or (at your option)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
14 ;; any later version.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
15
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
20
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
21 ;; 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
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64085
18a818a2ee7c Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 63988
diff changeset
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18a818a2ee7c Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 63988
diff changeset
24 ;; Boston, MA 02110-1301, USA.
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
25
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
26 ;;; Commentary:
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
27
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
28 ;; 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
29 ;; 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
30
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
31 ;;; Code:
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
32
65200
67e480d2dc8c (font-lock-comment-face, font-lock-doc-face, font-lock-string-face,
Juanma Barranquero <lekktu@gmail.com>
parents: 64751
diff changeset
33 (defvar font-lock-comment-face)
67e480d2dc8c (font-lock-comment-face, font-lock-doc-face, font-lock-string-face,
Juanma Barranquero <lekktu@gmail.com>
parents: 64751
diff changeset
34 (defvar font-lock-doc-face)
67e480d2dc8c (font-lock-comment-face, font-lock-doc-face, font-lock-string-face,
Juanma Barranquero <lekktu@gmail.com>
parents: 64751
diff changeset
35 (defvar font-lock-keywords-case-fold-search)
67e480d2dc8c (font-lock-comment-face, font-lock-doc-face, font-lock-string-face,
Juanma Barranquero <lekktu@gmail.com>
parents: 64751
diff changeset
36 (defvar font-lock-string-face)
67e480d2dc8c (font-lock-comment-face, font-lock-doc-face, font-lock-string-face,
Juanma Barranquero <lekktu@gmail.com>
parents: 64751
diff changeset
37
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
38 (defvar lisp-mode-abbrev-table nil)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
39
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
40 (define-abbrev-table 'lisp-mode-abbrev-table ())
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
41
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
42 (defvar emacs-lisp-mode-syntax-table
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
43 (let ((table (make-syntax-table)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
44 (let ((i 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
45 (while (< i ?0)
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+ ?9))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
49 (while (< i ?A)
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)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
52 (setq i (1+ ?Z))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
53 (while (< i ?a)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
54 (modify-syntax-entry i "_ " table)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
55 (setq i (1+ i)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
56 (setq i (1+ ?z))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
57 (while (< i 128)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
58 (modify-syntax-entry i "_ " table)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
59 (setq i (1+ i)))
65200
67e480d2dc8c (font-lock-comment-face, font-lock-doc-face, font-lock-string-face,
Juanma Barranquero <lekktu@gmail.com>
parents: 64751
diff changeset
60 (modify-syntax-entry ?\s " " table)
82216
86901570c4a7 (emacs-lisp-mode-syntax-table): Treat non-break space as whitespace in Lisp.
Richard M. Stallman <rms@gnu.org>
parents: 78217
diff changeset
61 ;; Non-break space acts as whitespace.
86901570c4a7 (emacs-lisp-mode-syntax-table): Treat non-break space as whitespace in Lisp.
Richard M. Stallman <rms@gnu.org>
parents: 78217
diff changeset
62 (modify-syntax-entry ?\x8a0 " " table)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
63 (modify-syntax-entry ?\t " " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
64 (modify-syntax-entry ?\f " " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
65 (modify-syntax-entry ?\n "> " table)
65852
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
66 ;; This is probably obsolete since nowadays such features use overlays.
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
67 ;; ;; Give CR the same syntax as newline, for selective-display.
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
68 ;; (modify-syntax-entry ?\^m "> " table)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
69 (modify-syntax-entry ?\; "< " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
70 (modify-syntax-entry ?` "' " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
71 (modify-syntax-entry ?' "' " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
72 (modify-syntax-entry ?, "' " table)
50677
152c21ba1618 (emacs-lisp-mode-syntax-table): Give @ prefix syntax.
Richard M. Stallman <rms@gnu.org>
parents: 50585
diff changeset
73 (modify-syntax-entry ?@ "' " table)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
74 ;; Used to be singlequote; changed for flonums.
27809
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 ?\" "\" " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
78 (modify-syntax-entry ?\\ "\\ " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
79 (modify-syntax-entry ?\( "() " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
80 (modify-syntax-entry ?\) ")( " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
81 (modify-syntax-entry ?\[ "(] " table)
27814
f2abbe1d6b47 Don't change syntax of multibyte
Kenichi Handa <handa@m17n.org>
parents: 27809
diff changeset
82 (modify-syntax-entry ?\] ")[ " table))
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
83 table))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
84
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
85 (defvar lisp-mode-syntax-table
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
86 (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
87 (modify-syntax-entry ?\[ "_ " table)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
88 (modify-syntax-entry ?\] "_ " table)
65852
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
89 (modify-syntax-entry ?# "' 14b" table)
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
90 (modify-syntax-entry ?| "\" 23bn" table)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
91 table))
285
adb31fcccc2b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 255
diff changeset
92
12701
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
93 (defvar lisp-imenu-generic-expression
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
94 (list
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
95 (list nil
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
96 (purecopy (concat "^\\s-*("
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
97 (eval-when-compile
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
98 (regexp-opt
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
99 '("defun" "defun*" "defsubst" "defmacro"
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
100 "defadvice" "define-skeleton"
67295
df35219b6508 Put `doc-string-elt' property on
Juri Linkov <juri@jurta.org>
parents: 67276
diff changeset
101 "define-minor-mode" "define-global-minor-mode"
75641
0c165a40f76b define-global-minor-mode changed to define-globalized-minor-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 75346
diff changeset
102 "define-globalized-minor-mode"
67295
df35219b6508 Put `doc-string-elt' property on
Juri Linkov <juri@jurta.org>
parents: 67276
diff changeset
103 "define-derived-mode" "define-generic-mode"
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
104 "define-compiler-macro" "define-modify-macro"
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
105 "defsetf" "define-setf-expander"
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
106 "define-method-combination"
40790
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
107 "defgeneric" "defmethod") t))
67276
249c0ac46fca (lisp-imenu-generic-expression): Fix bug whereby names of length one
Eli Zaretskii <eliz@gnu.org>
parents: 66747
diff changeset
108 "\\s-+\\(\\(\\sw\\|\\s_\\)+\\)"))
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
109 2)
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
110 (list (purecopy "Variables")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
111 (purecopy (concat "^\\s-*("
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
112 (eval-when-compile
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
113 (regexp-opt
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
114 '("defvar" "defconst" "defconstant" "defcustom"
40790
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
115 "defparameter" "define-symbol-macro") t))
67276
249c0ac46fca (lisp-imenu-generic-expression): Fix bug whereby names of length one
Eli Zaretskii <eliz@gnu.org>
parents: 66747
diff changeset
116 "\\s-+\\(\\(\\sw\\|\\s_\\)+\\)"))
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
117 2)
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
118 (list (purecopy "Types")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
119 (purecopy (concat "^\\s-*("
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
120 (eval-when-compile
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
121 (regexp-opt
49522
4dd5da1ea3dc * font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents: 48127
diff changeset
122 '("defgroup" "deftheme" "deftype" "defstruct"
4dd5da1ea3dc * font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents: 48127
diff changeset
123 "defclass" "define-condition" "define-widget"
4dd5da1ea3dc * font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents: 48127
diff changeset
124 "defface" "defpackage") t))
67276
249c0ac46fca (lisp-imenu-generic-expression): Fix bug whereby names of length one
Eli Zaretskii <eliz@gnu.org>
parents: 66747
diff changeset
125 "\\s-+'?\\(\\(\\sw\\|\\s_\\)+\\)"))
12701
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
126 2))
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
127
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
128 "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
129
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
130 ;; 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
131 (put 'autoload 'doc-string-elt 3)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
132 (put 'defun 'doc-string-elt 3)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
133 (put 'defun* 'doc-string-elt 3)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
134 (put 'defvar 'doc-string-elt 3)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
135 (put 'defcustom 'doc-string-elt 3)
49522
4dd5da1ea3dc * font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents: 48127
diff changeset
136 (put 'deftheme 'doc-string-elt 2)
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
137 (put 'defconst 'doc-string-elt 3)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
138 (put 'defmacro 'doc-string-elt 3)
41812
fb0d648feaa6 (toplevel): Define docstring offset for `defmacro*'.
Colin Walters <walters@gnu.org>
parents: 41702
diff changeset
139 (put 'defmacro* 'doc-string-elt 3)
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
140 (put 'defsubst 'doc-string-elt 3)
63108
a19780959d63 (defstruct): Set 'doc-string-elt property.
Juanma Barranquero <lekktu@gmail.com>
parents: 62363
diff changeset
141 (put 'defstruct 'doc-string-elt 2)
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
142 (put 'define-skeleton 'doc-string-elt 2)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
143 (put 'define-derived-mode 'doc-string-elt 4)
56996
5418c6e288fc (define-compilation-mode): Specify `doc-string-elt' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 56840
diff changeset
144 (put 'define-compilation-mode 'doc-string-elt 3)
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
145 (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
146 (put 'define-minor-mode 'doc-string-elt 2)
67295
df35219b6508 Put `doc-string-elt' property on
Juri Linkov <juri@jurta.org>
parents: 67276
diff changeset
147 (put 'easy-mmode-define-global-mode 'doc-string-elt 2)
df35219b6508 Put `doc-string-elt' property on
Juri Linkov <juri@jurta.org>
parents: 67276
diff changeset
148 (put 'define-global-minor-mode 'doc-string-elt 2)
75641
0c165a40f76b define-global-minor-mode changed to define-globalized-minor-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 75346
diff changeset
149 (put 'define-globalized-minor-mode 'doc-string-elt 2)
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
150 (put 'define-generic-mode 'doc-string-elt 7)
49522
4dd5da1ea3dc * font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents: 48127
diff changeset
151 (put 'define-ibuffer-filter 'doc-string-elt 2)
42699
1da0dfa86ab5 Handle define-ibuffer-column, define-ibuffer-filter,
Colin Walters <walters@gnu.org>
parents: 42235
diff changeset
152 (put 'define-ibuffer-op 'doc-string-elt 3)
49522
4dd5da1ea3dc * font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
John Paul Wallington <jpw@pobox.com>
parents: 48127
diff changeset
153 (put 'define-ibuffer-sorter 'doc-string-elt 2)
65851
c9b01535e163 (lambda): Add its doc-string-elt property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65849
diff changeset
154 (put 'lambda 'doc-string-elt 2)
66404
48fff88992ce (easy-mmode-define-global-mode): Don't add a dummy doc-string-elt property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65852
diff changeset
155 (put 'defalias 'doc-string-elt 3)
48fff88992ce (easy-mmode-define-global-mode): Don't add a dummy doc-string-elt property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65852
diff changeset
156 (put 'defvaralias 'doc-string-elt 3)
48fff88992ce (easy-mmode-define-global-mode): Don't add a dummy doc-string-elt property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65852
diff changeset
157 (put 'define-category 'doc-string-elt 2)
65851
c9b01535e163 (lambda): Add its doc-string-elt property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65849
diff changeset
158
c9b01535e163 (lambda): Add its doc-string-elt property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65849
diff changeset
159 (defvar lisp-doc-string-elt-property 'doc-string-elt
c9b01535e163 (lambda): Add its doc-string-elt property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65849
diff changeset
160 "The symbol property that holds the docstring position info.")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
161
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
162 (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
163 (if (nth 3 state)
65852
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
164 ;; This might be a (doc)string or a |...| symbol.
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
165 (let ((startpos (nth 8 state)))
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
166 (if (eq (char-after startpos) ?|)
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
167 ;; This is not a string, but a |...| symbol.
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
168 nil
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
169 (let* ((listbeg (nth 1 state))
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
170 (firstsym (and listbeg
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
171 (save-excursion
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
172 (goto-char listbeg)
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
173 (and (looking-at "([ \t\n]*\\(\\(\\sw\\|\\s_\\)+\\)")
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
174 (match-string 1)))))
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
175 (docelt (and firstsym (get (intern-soft firstsym)
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
176 lisp-doc-string-elt-property))))
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
177 (if (and docelt
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
178 ;; It's a string in a form that can have a docstring.
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
179 ;; Check whether it's in docstring position.
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
180 (save-excursion
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
181 (when (functionp docelt)
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
182 (goto-char (match-end 1))
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
183 (setq docelt (funcall docelt)))
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
184 (goto-char listbeg)
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
185 (forward-char 1)
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
186 (condition-case nil
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
187 (while (and (> docelt 0) (< (point) startpos)
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
188 (progn (forward-sexp 1) t))
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
189 (setq docelt (1- docelt)))
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
190 (error nil))
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
191 (and (zerop docelt) (<= (point) startpos)
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
192 (progn (forward-comment (point-max)) t)
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
193 (= (point) (nth 8 state)))))
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
194 font-lock-doc-face
4b5af439906f (lisp-mode-syntax-table): Move the nesting bit from # to |.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65851
diff changeset
195 font-lock-string-face))))
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
196 font-lock-comment-face))
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
197
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
198 ;; 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
199 ;; (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
200 (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
201 (when lisp-syntax
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
202 (set-syntax-table lisp-mode-syntax-table))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
203 (setq local-abbrev-table lisp-mode-abbrev-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
204 (make-local-variable 'paragraph-ignore-fill-prefix)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
205 (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
206 (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
207 (setq fill-paragraph-function 'lisp-fill-paragraph)
64088
6b665a797211 (lisp-mode-variables): Prevent adaptive
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
208 ;; Adaptive fill mode gets the fill wrong for a one-line paragraph made of
6b665a797211 (lisp-mode-variables): Prevent adaptive
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
209 ;; a single docstring. Let's fix it here.
6b665a797211 (lisp-mode-variables): Prevent adaptive
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
210 (set (make-local-variable 'adaptive-fill-function)
6b665a797211 (lisp-mode-variables): Prevent adaptive
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
211 (lambda () (if (looking-at "\\s-+\"[^\n\"]+\"\\s-*$") "")))
14495
fc4be3d538e0 (lisp-mode-variables): Locally clear adaptive-fill-mode.
Richard M. Stallman <rms@gnu.org>
parents: 14379
diff changeset
212 ;; 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
213 ;; 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
214 ;; 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
215 ;; 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
216 ;;(set (make-local-variable 'adaptive-fill-mode) nil)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
217 (make-local-variable 'indent-line-function)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
218 (setq indent-line-function 'lisp-indent-line)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
219 (make-local-variable 'indent-region-function)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
220 (setq indent-region-function 'lisp-indent-region)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
221 (make-local-variable 'parse-sexp-ignore-comments)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
222 (setq parse-sexp-ignore-comments t)
6076
4f76564fc2cd (lisp-mode-variables): Set outline-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 5103
diff changeset
223 (make-local-variable 'outline-regexp)
60074
65b1f2f4ce8f (lisp-mode-variables): Add ;;;###autoload to `outline-regexp'.
Lute Kamstra <lute@gnu.org>
parents: 59848
diff changeset
224 (setq outline-regexp ";;;\\(;* [^ \t\n]\\|###autoload\\)\\|(")
26682
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
225 (make-local-variable 'outline-level)
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
226 (setq outline-level 'lisp-outline-level)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
227 (make-local-variable 'comment-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
228 (setq comment-start ";")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
229 (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
230 ;; 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
231 ;; 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
232 (setq comment-start-skip "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *")
62363
6a0ab1c93beb (lisp-mode-variables): Set font-lock-comment-start-skip.
Richard M. Stallman <rms@gnu.org>
parents: 60874
diff changeset
233 (make-local-variable 'font-lock-comment-start-skip)
6a0ab1c93beb (lisp-mode-variables): Set font-lock-comment-start-skip.
Richard M. Stallman <rms@gnu.org>
parents: 60874
diff changeset
234 ;; Font lock mode uses this only when it KNOWS a comment is starting.
63108
a19780959d63 (defstruct): Set 'doc-string-elt property.
Juanma Barranquero <lekktu@gmail.com>
parents: 62363
diff changeset
235 (setq font-lock-comment-start-skip ";+ *")
28994
0388cb689633 (lisp-mode-variables): Set comment-add.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28324
diff changeset
236 (make-local-variable 'comment-add)
0388cb689633 (lisp-mode-variables): Set comment-add.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28324
diff changeset
237 (setq comment-add 1) ;default to `;;' in comment-region
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
238 (make-local-variable 'comment-column)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
239 (setq comment-column 40)
54315
cad9b29a5224 (lisp-mode-variables): Set it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53922
diff changeset
240 ;; Don't get confused by `;' in doc strings when paragraph-filling.
cad9b29a5224 (lisp-mode-variables): Set it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53922
diff changeset
241 (set (make-local-variable 'comment-use-global-state) t)
12701
c50826e44362 (lisp-imenu-generic-expression): Var defined.
Karl Heuer <kwzh@gnu.org>
parents: 12682
diff changeset
242 (make-local-variable 'imenu-generic-expression)
27814
f2abbe1d6b47 Don't change syntax of multibyte
Kenichi Handa <handa@m17n.org>
parents: 27809
diff changeset
243 (setq imenu-generic-expression lisp-imenu-generic-expression)
f2abbe1d6b47 Don't change syntax of multibyte
Kenichi Handa <handa@m17n.org>
parents: 27809
diff changeset
244 (make-local-variable 'multibyte-syntax-as-symbol)
33467
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
245 (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
246 (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
247 (setq font-lock-defaults
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
248 '((lisp-font-lock-keywords
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
249 lisp-font-lock-keywords-1 lisp-font-lock-keywords-2)
60738
7b87c7b7cc11 (lisp-mode-variables): Recognize `@' in function names.
Eli Zaretskii <eliz@gnu.org>
parents: 60074
diff changeset
250 nil nil (("+-*/.<>=!?$%_&~^:@" . "w")) nil
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
251 (font-lock-mark-block-function . mark-defun)
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
252 (font-lock-syntactic-face-function
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
253 . lisp-font-lock-syntactic-face-function))))
26682
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
254
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
255 (defun lisp-outline-level ()
57098e9f96e8 (lisp-mode-variables): Change
Gerd Moellmann <gerd@gnu.org>
parents: 25723
diff changeset
256 "Lisp mode `outline-level' function."
60074
65b1f2f4ce8f (lisp-mode-variables): Add ;;;###autoload to `outline-regexp'.
Lute Kamstra <lute@gnu.org>
parents: 59848
diff changeset
257 (let ((len (- (match-end 0) (match-beginning 0))))
65b1f2f4ce8f (lisp-mode-variables): Add ;;;###autoload to `outline-regexp'.
Lute Kamstra <lute@gnu.org>
parents: 59848
diff changeset
258 (if (looking-at "(\\|;;;###autoload")
65b1f2f4ce8f (lisp-mode-variables): Add ;;;###autoload to `outline-regexp'.
Lute Kamstra <lute@gnu.org>
parents: 59848
diff changeset
259 1000
65b1f2f4ce8f (lisp-mode-variables): Add ;;;###autoload to `outline-regexp'.
Lute Kamstra <lute@gnu.org>
parents: 59848
diff changeset
260 len)))
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
261
33467
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
262 (defvar lisp-mode-shared-map
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
263 (let ((map (make-sparse-keymap)))
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
264 (define-key map "\e\C-q" 'indent-sexp)
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
265 (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
266 ;; 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
267 ;; 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
268 ;; 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
269 ;;;(define-key map [backspace] 'backward-delete-char-untabify)
33467
09da172d93be (lisp-mode-variables):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33238
diff changeset
270 map)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
271 "Keymap for commands shared by all sorts of Lisp modes.")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
272
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
273 (defvar emacs-lisp-mode-map
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
274 (let ((map (make-sparse-keymap "Emacs-Lisp"))
92937
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
275 (menu-map (make-sparse-keymap "Emacs-Lisp"))
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
276 (prof-map (make-sparse-keymap)))
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
277 (set-keymap-parent map lisp-mode-shared-map)
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
278 (define-key map "\e\t" 'lisp-complete-symbol)
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
279 (define-key map "\e\C-x" 'eval-defun)
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
280 (define-key map "\e\C-q" 'indent-pp-sexp)
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
281 (define-key map [menu-bar emacs-lisp] (cons "Emacs-Lisp" menu-map))
93034
a155e008f7c7 (emacs-lisp-mode-map): Add menu entries for eldoc and ielm.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93008
diff changeset
282 (define-key menu-map [eldoc]
a155e008f7c7 (emacs-lisp-mode-map): Add menu entries for eldoc and ielm.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93008
diff changeset
283 '(menu-item "Auto-Display Documentation Strings" eldoc-mode
a155e008f7c7 (emacs-lisp-mode-map): Add menu entries for eldoc and ielm.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93008
diff changeset
284 :button (:toggle . eldoc-mode)
a155e008f7c7 (emacs-lisp-mode-map): Add menu entries for eldoc and ielm.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93008
diff changeset
285 :help "Display the documentation string for the item under cursor"))
a155e008f7c7 (emacs-lisp-mode-map): Add menu entries for eldoc and ielm.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93008
diff changeset
286 (define-key menu-map [checkdoc]
a155e008f7c7 (emacs-lisp-mode-map): Add menu entries for eldoc and ielm.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93008
diff changeset
287 '(menu-item "Check Documentation Strings" checkdoc
a155e008f7c7 (emacs-lisp-mode-map): Add menu entries for eldoc and ielm.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93008
diff changeset
288 :help "Check documentation strings for style requirements"))
92937
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
289 (define-key menu-map [profiling] (cons "Profiling" prof-map))
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
290 (define-key prof-map [prof-restall]
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
291 '(menu-item "Remove Instrumentation for All Functions" elp-restore-all
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
292 :help "Restore the original definitions of all functions being profiled"))
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
293 (define-key prof-map [prof-restfunc]
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
294 '(menu-item "Remove Instrumentation for Function" elp-restore-function
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
295 :help "Restore an instrumented function to its original definition"))
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
296
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
297 (define-key prof-map [sep-rem] '("--"))
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
298 (define-key prof-map [prof-resall]
93008
d90ba9c4c093 Fix typos.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92937
diff changeset
299 '(menu-item "Reset Counters for All Functions" elp-reset-all
92937
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
300 :help "Reset the profiling information for all functions being profiled"))
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
301 (define-key prof-map [prof-resfunc]
93008
d90ba9c4c093 Fix typos.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92937
diff changeset
302 '(menu-item "Reset Counters for Function" elp-reset-function
92937
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
303 :help "Reset the profiling information for a function"))
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
304 (define-key prof-map [prof-res]
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
305 '(menu-item "Show Profiling Results" elp-results
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
306 :help "Display current profiling results"))
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
307 (define-key prof-map [prof-pack]
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
308 '(menu-item "Instrument Package" elp-instrument-package
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
309 :help "Instrument for profiling all function that start with a prefix"))
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
310 (define-key prof-map [prof-func]
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
311 '(menu-item "Instrument Function" elp-instrument-function
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
312 :help "Instrument a function for profiling"))
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
313 (define-key menu-map [edebug-defun]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
314 '(menu-item "Instrument Function for Debugging" edebug-defun
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
315 :help "Evaluate the top level form point is in, stepping through with Edebug"
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
316 :keys "C-u C-M-x"))
92937
9b852833cd26 (emacs-lisp-mode-map): Add menu entries
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92736
diff changeset
317 (define-key menu-map [separator-byte] '("--"))
93120
ade33d67202c (emacs-lisp-mode-map): Add menu entry for disassemble.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93034
diff changeset
318 (define-key menu-map [disas]
ade33d67202c (emacs-lisp-mode-map): Add menu entry for disassemble.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93034
diff changeset
319 '(menu-item "Disassemble byte compiled object" disassemble
ade33d67202c (emacs-lisp-mode-map): Add menu entry for disassemble.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93034
diff changeset
320 :help "Print disassembled code for OBJECT in a buffer"))
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
321 (define-key menu-map [byte-recompile]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
322 '(menu-item "Byte-recompile Directory..." byte-recompile-directory
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
323 :help "Recompile every `.el' file in DIRECTORY that needs recompilation"))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
324 (define-key menu-map [emacs-byte-compile-and-load]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
325 '(menu-item "Byte-compile And Load" emacs-lisp-byte-compile-and-load
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
326 :help "Byte-compile the current file (if it has changed), then load compiled code"))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
327 (define-key menu-map [byte-compile]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
328 '(menu-item "Byte-compile This File" emacs-lisp-byte-compile
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
329 :help "Byte compile the file containing the current buffer"))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
330 (define-key menu-map [separator-eval] '("--"))
93034
a155e008f7c7 (emacs-lisp-mode-map): Add menu entries for eldoc and ielm.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93008
diff changeset
331 (define-key menu-map [ielm]
a155e008f7c7 (emacs-lisp-mode-map): Add menu entries for eldoc and ielm.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93008
diff changeset
332 '(menu-item "Interactive Expression Evaluation" ielm
a155e008f7c7 (emacs-lisp-mode-map): Add menu entries for eldoc and ielm.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93008
diff changeset
333 :help "Interactively evaluate Emacs Lisp expressions"))
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
334 (define-key menu-map [eval-buffer]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
335 '(menu-item "Evaluate Buffer" eval-buffer
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
336 :help "Execute the current buffer as Lisp code"))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
337 (define-key menu-map [eval-region]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
338 '(menu-item "Evaluate Region" eval-region
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
339 :help "Execute the region as Lisp code"
92534
cdc0b4ed6c22 * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Bugfix: replaced
Bastien Guerry <bzg@altern.org>
parents: 92493
diff changeset
340 :enable mark-active))
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
341 (define-key menu-map [eval-sexp]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
342 '(menu-item "Evaluate Last S-expression" eval-last-sexp
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
343 :help "Evaluate sexp before point; print value in minibuffer"))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
344 (define-key menu-map [separator-format] '("--"))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
345 (define-key menu-map [comment-region]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
346 '(menu-item "Comment Out Region" comment-region
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
347 :help "Comment or uncomment each line in the region"
92534
cdc0b4ed6c22 * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Bugfix: replaced
Bastien Guerry <bzg@altern.org>
parents: 92493
diff changeset
348 :enable mark-active))
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
349 (define-key menu-map [indent-region]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
350 '(menu-item "Indent Region" indent-region
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
351 :help "Indent each nonblank line in the region"
92534
cdc0b4ed6c22 * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Bugfix: replaced
Bastien Guerry <bzg@altern.org>
parents: 92493
diff changeset
352 :enable mark-active))
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
353 (define-key menu-map [indent-line] '("Indent Line" . lisp-indent-line))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
354 map)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
355 "Keymap for Emacs Lisp mode.
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
356 All commands in `lisp-mode-shared-map' are inherited by this map.")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
357
12035
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
358 (defun emacs-lisp-byte-compile ()
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
359 "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
360 (interactive)
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
361 (if buffer-file-name
c3747e64cff0 (emacs-lisp-mode-map): Add a menu.
Karl Heuer <kwzh@gnu.org>
parents: 10968
diff changeset
362 (byte-compile-file buffer-file-name)
14116
5f985037b64f (emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents: 13802
diff changeset
363 (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
364
14719
d477c6f756df Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents: 14628
diff changeset
365 (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
366 "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
367 (interactive)
5f985037b64f (emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents: 13802
diff changeset
368 (or buffer-file-name
5f985037b64f (emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents: 13802
diff changeset
369 (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
370 (require 'bytecomp)
5f985037b64f (emacs-lisp-byte-compile): Fix error message.
Karl Heuer <kwzh@gnu.org>
parents: 13802
diff changeset
371 ;; 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
372 (if (and (buffer-modified-p)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
373 (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
374 (save-buffer))
d477c6f756df Save if reqd in emacs-lisp-byte-compile-and-load.
Simon Marshall <simon@gnu.org>
parents: 14628
diff changeset
375 (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
376 (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
377 (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
378 (byte-compile-file buffer-file-name t))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
379
25630
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
380 (defcustom emacs-lisp-mode-hook nil
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
381 "Hook run when entering Emacs Lisp mode."
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
382 :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
383 :type 'hook
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
384 :group 'lisp)
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
385
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
386 (defcustom lisp-mode-hook nil
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
387 "Hook run when entering Lisp mode."
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
388 :options '(imenu-add-menubar-index)
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
389 :type 'hook
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
390 :group 'lisp)
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
391
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
392 (defcustom lisp-interaction-mode-hook nil
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
393 "Hook run when entering Lisp Interaction mode."
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
394 :options '(turn-on-eldoc-mode)
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
395 :type 'hook
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
396 :group 'lisp)
4feb8ce584a5 (lisp-imenu-generic-expression): Recognize define-widget.
Dave Love <fx@gnu.org>
parents: 25434
diff changeset
397
41332
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
398 (defun emacs-lisp-mode ()
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
399 "Major mode for editing Lisp code to run in Emacs.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
400 Commands:
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
401 Delete converts tabs to spaces as it moves back.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
402 Blank lines separate paragraphs. Semicolons start comments.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
403 \\{emacs-lisp-mode-map}
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
404 Entry to this mode calls the value of `emacs-lisp-mode-hook'
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
405 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
406 (interactive)
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
407 (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
408 (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
409 (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
410 (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
411 (setq mode-name "Emacs-Lisp")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
412 (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
413 (setq imenu-case-fold-search nil)
51981
e363b422bcd4 (emacs-lisp-mode): Use run-mode-hooks.
Richard M. Stallman <rms@gnu.org>
parents: 51439
diff changeset
414 (run-mode-hooks 'emacs-lisp-mode-hook))
51261
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
415 (put 'emacs-lisp-mode 'custom-mode-group 'lisp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
416
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
417 (defvar lisp-mode-map
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
418 (let ((map (make-sparse-keymap)))
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
419 (set-keymap-parent map lisp-mode-shared-map)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
420 (define-key map "\e\C-x" 'lisp-eval-defun)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
421 (define-key map "\C-c\C-z" 'run-lisp)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
422 map)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
423 "Keymap for ordinary Lisp mode.
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
424 All commands in `lisp-mode-shared-map' are inherited by this map.")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
425
41332
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
426 (defun lisp-mode ()
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
427 "Major mode for editing Lisp code for Lisps other than GNU Emacs Lisp.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
428 Commands:
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
429 Delete converts tabs to spaces as it moves back.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
430 Blank lines separate paragraphs. Semicolons start comments.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
431 \\{lisp-mode-map}
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
432 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
433 or to switch back to an existing one.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
434
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
435 Entry to this mode calls the value of `lisp-mode-hook'
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
436 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
437 (interactive)
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
438 (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
439 (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
440 (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
441 (setq mode-name "Lisp")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
442 (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
443 (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
444 (setq comment-start-skip
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
445 "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")
41332
15d7e3180dcf (lisp-mode, emacs-lisp-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41310
diff changeset
446 (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
447 (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
448 (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
449 (set-syntax-table lisp-mode-syntax-table)
51981
e363b422bcd4 (emacs-lisp-mode): Use run-mode-hooks.
Richard M. Stallman <rms@gnu.org>
parents: 51439
diff changeset
450 (run-mode-hooks 'lisp-mode-hook))
55773
6010b740e1d0 (lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents: 55521
diff changeset
451 (put 'lisp-mode 'find-tag-default-function 'lisp-find-tag-default)
6010b740e1d0 (lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents: 55521
diff changeset
452
6010b740e1d0 (lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents: 55521
diff changeset
453 (defun lisp-find-tag-default ()
6010b740e1d0 (lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents: 55521
diff changeset
454 (let ((default (find-tag-default)))
6010b740e1d0 (lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents: 55521
diff changeset
455 (when (stringp default)
6010b740e1d0 (lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents: 55521
diff changeset
456 (if (string-match ":+" default)
6010b740e1d0 (lisp-find-tag-default): Strip the package prefix from the symbol name, if any.
Sam Steingold <sds@gnu.org>
parents: 55521
diff changeset
457 (substring default (match-end 0))
56829
ff83c10bdcf0 Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 56825
diff changeset
458 default))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
459
52288
c701c5555888 (common-lisp-mode): New.
Dave Love <fx@gnu.org>
parents: 52208
diff changeset
460 ;; Used in old LispM code.
c701c5555888 (common-lisp-mode): New.
Dave Love <fx@gnu.org>
parents: 52208
diff changeset
461 (defalias 'common-lisp-mode 'lisp-mode)
c701c5555888 (common-lisp-mode): New.
Dave Love <fx@gnu.org>
parents: 52208
diff changeset
462
28324
979a905864ab (lisp-eval-defun): Make arglist compatible with inf-lisp version.
Dave Love <fx@gnu.org>
parents: 27934
diff changeset
463 ;; 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
464 (defun lisp-eval-defun (&optional and-go)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
465 "Send the current defun to the Lisp process made by \\[run-lisp]."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
466 (interactive)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
467 (error "Process lisp does not exist"))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
468
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
469 (defvar lisp-interaction-mode-map
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
470 (let ((map (make-sparse-keymap))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
471 (menu-map (make-sparse-keymap "Lisp-Interaction")))
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
472 (set-keymap-parent map lisp-mode-shared-map)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
473 (define-key map "\e\C-x" 'eval-defun)
55805
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
474 (define-key map "\e\C-q" 'indent-pp-sexp)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
475 (define-key map "\e\t" 'lisp-complete-symbol)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
476 (define-key map "\n" 'eval-print-last-sexp)
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
477 (define-key map [menu-bar lisp-interaction] (cons "Lisp-Interaction" menu-map))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
478 (define-key menu-map [eval-defun]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
479 '(menu-item "Evaluate Defun" eval-defun
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
480 :help "Evaluate the top-level form containing point, or after point"))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
481 (define-key menu-map [eval-print-last-sexp]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
482 '(menu-item "Evaluate and print" eval-print-last-sexp
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
483 :help "Evaluate sexp before point; print value into current buffer"))
92736
48d82b59381a (lisp-interaction-mode-map): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92534
diff changeset
484 (define-key menu-map [edebug-defun-lisp-interaction]
92493
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
485 '(menu-item "Instrument Function for Debugging" edebug-defun
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
486 :help "Evaluate the top level form point is in, stepping through with Edebug"
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
487 :keys "C-u C-M-x"))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
488 (define-key menu-map [indent-pp-sexp]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
489 '(menu-item "Indent or Pretty-Print" indent-pp-sexp
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
490 :help "Indent each line of the list starting just after point, or prettyprint it"))
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
491 (define-key menu-map [lisp-complete-symbol]
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
492 '(menu-item "Complete Lisp Symbol" lisp-complete-symbol
402ee2cfca27 * bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
493 :help "Perform completion on Lisp symbol preceding point"))
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
494 map)
23738
2ef2813414b6 (lisp-interaction-mode-map): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23723
diff changeset
495 "Keymap for Lisp Interaction mode.
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
496 All commands in `lisp-mode-shared-map' are inherited by this map.")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
497
41512
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
498 (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
499 (define-derived-mode lisp-interaction-mode emacs-lisp-mode "Lisp Interaction"
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
500 "Major mode for typing and evaluating Lisp forms.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
501 Like Lisp mode except that \\[eval-print-last-sexp] evals the Lisp expression
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
502 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
503 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
504 and `eval-expression-print-level'.
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
505
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
506 Commands:
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
507 Delete converts tabs to spaces as it moves back.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
508 Paragraphs are separated only by blank lines.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
509 Semicolons start comments.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
510 \\{lisp-interaction-mode-map}
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
511 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
512 if that value is non-nil.")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
513
248
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
514 (defun eval-print-last-sexp ()
38560
df8cff64f0f3 (eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
515 "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
516
69851
169719af1b5e (eval-print-last-sexp, eval-last-sexp, eval-defun): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 68648
diff changeset
517 If `eval-expression-debug-on-error' is non-nil, which is the default,
169719af1b5e (eval-print-last-sexp, eval-last-sexp, eval-defun): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 68648
diff changeset
518 this command arranges for all errors to enter the debugger.
169719af1b5e (eval-print-last-sexp, eval-last-sexp, eval-defun): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 68648
diff changeset
519
38560
df8cff64f0f3 (eval-print-last-sexp, eval-defun):
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
520 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
521 `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
522 which see."
248
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
523 (interactive)
422
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
524 (let ((standard-output (current-buffer)))
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
525 (terpri)
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
526 (eval-last-sexp t)
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
527 (terpri)))
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
528
38572
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
529
38585
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
530 (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
531 "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
532 BEG and END are the start and end of the output in current-buffer.
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49522
diff changeset
533 VALUE is the Lisp value printed, ALT1 and ALT2 are strings for the
38585
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
534 alternative printed representations that can be displayed."
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
535 (let ((map (make-sparse-keymap)))
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
536 (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
537 (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
538 (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
539 (add-text-properties
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49522
diff changeset
540 beg end
38585
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
541 `(printed-value (,value ,alt1 ,alt2)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49522
diff changeset
542 mouse-face highlight
38585
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
543 keymap ,map
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
544 help-echo "RET, mouse-2: toggle abbreviated display"
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
545 rear-nonsticky (mouse-face keymap help-echo
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
546 printed-value)))))
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
547
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
548
50503
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
549 (defun last-sexp-toggle-display (&optional arg)
38585
f2c0f6df43ab (last-sexp-setup-props): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38578
diff changeset
550 "Toggle between abbreviated and unabbreviated printed representations."
50503
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
551 (interactive "P")
51290
0e0d3c3dca7f (last-sexp-toggle-display):
Richard M. Stallman <rms@gnu.org>
parents: 51261
diff changeset
552 (save-restriction
0e0d3c3dca7f (last-sexp-toggle-display):
Richard M. Stallman <rms@gnu.org>
parents: 51261
diff changeset
553 (widen)
50503
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
554 (let ((value (get-text-property (point) 'printed-value)))
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
555 (when value
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
556 (let ((beg (or (previous-single-property-change (min (point-max) (1+ (point)))
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
557 'printed-value)
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
558 (point)))
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
559 (end (or (next-single-char-property-change (point) 'printed-value) (point)))
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
560 (standard-output (current-buffer))
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
561 (point (point)))
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
562 (delete-region beg end)
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
563 (insert (nth 1 value))
75302
45c72f1f789d (last-sexp-toggle-display): Fixed cursor position when toggle abbreviated
Eli Zaretskii <eliz@gnu.org>
parents: 71626
diff changeset
564 (or (= beg point)
45c72f1f789d (last-sexp-toggle-display): Fixed cursor position when toggle abbreviated
Eli Zaretskii <eliz@gnu.org>
parents: 71626
diff changeset
565 (setq point (1- (point))))
50503
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
566 (last-sexp-setup-props beg (point)
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
567 (nth 0 value)
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
568 (nth 2 value)
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
569 (nth 1 value))
7c83c5770cb6 (last-sexp-toggle-display): At end of buffer, just call `newline'.
Richard M. Stallman <rms@gnu.org>
parents: 50463
diff changeset
570 (goto-char (min (point-max) point)))))))
38572
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
571
51261
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
572 (defun prin1-char (char)
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
573 "Return a string representing CHAR as a character rather than as an integer.
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
574 If CHAR is not a character, return nil."
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
575 (and (integerp char)
55521
ea0f46cadeb2 (prin1-char): Use eventp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54501
diff changeset
576 (eventp char)
56825
dcd7b1b4690d (prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents: 56686
diff changeset
577 (let ((c (event-basic-type char))
56840
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
578 (mods (event-modifiers char))
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
579 string)
56825
dcd7b1b4690d (prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents: 56686
diff changeset
580 ;; Prevent ?A from turning into ?\S-a.
dcd7b1b4690d (prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents: 56686
diff changeset
581 (if (and (memq 'shift mods)
56840
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
582 (zerop (logand char ?\S-\^@))
56825
dcd7b1b4690d (prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents: 56686
diff changeset
583 (not (let ((case-fold-search nil))
dcd7b1b4690d (prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents: 56686
diff changeset
584 (char-equal c (upcase c)))))
dcd7b1b4690d (prin1-char): Put `shift' modifier into the basic character,
Richard M. Stallman <rms@gnu.org>
parents: 56686
diff changeset
585 (setq c (upcase c) mods nil))
56840
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
586 ;; What string are we considering using?
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
587 (condition-case nil
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
588 (setq string
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
589 (concat
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
590 "?"
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
591 (mapconcat
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
592 (lambda (modif)
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
593 (cond ((eq modif 'super) "\\s-")
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
594 (t (string ?\\ (upcase (aref (symbol-name modif) 0)) ?-))))
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
595 mods "")
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
596 (cond
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
597 ((memq c '(?\; ?\( ?\) ?\{ ?\} ?\[ ?\] ?\" ?\' ?\\)) (string ?\\ c))
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
598 ((eq c 127) "\\C-?")
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
599 (t
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
600 (string c)))))
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
601 (error nil))
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
602 ;; Verify the string reads a CHAR, not to some other character.
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
603 ;; If it doesn't, return nil instead.
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
604 (and string
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
605 (= (car (read-from-string string)) char)
14c8ead25d14 (prin1-char): Don't turn S-a into A.
Richard M. Stallman <rms@gnu.org>
parents: 56829
diff changeset
606 string))))
56996
5418c6e288fc (define-compilation-mode): Specify `doc-string-elt' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 56840
diff changeset
607
51261
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
608
78597
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
609 (defun preceding-sexp ()
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
610 "Return sexp before the point."
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
611 (let ((opoint (point))
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
612 ignore-quotes
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
613 expr)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
614 (save-excursion
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
615 (with-syntax-table emacs-lisp-mode-syntax-table
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
616 ;; If this sexp appears to be enclosed in `...'
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
617 ;; then ignore the surrounding quotes.
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
618 (setq ignore-quotes
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
619 (or (eq (following-char) ?\')
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
620 (eq (preceding-char) ?\')))
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
621 (forward-sexp -1)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
622 ;; If we were after `?\e' (or similar case),
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
623 ;; use the whole thing, not just the `e'.
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
624 (when (eq (preceding-char) ?\\)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
625 (forward-char -1)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
626 (when (eq (preceding-char) ??)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
627 (forward-char -1)))
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
628
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
629 ;; Skip over `#N='s.
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
630 (when (eq (preceding-char) ?=)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
631 (let (labeled-p)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
632 (save-excursion
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
633 (skip-chars-backward "0-9#=")
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
634 (setq labeled-p (looking-at "\\(#[0-9]+=\\)+")))
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
635 (when labeled-p
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
636 (forward-sexp -1))))
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
637
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
638 (save-restriction
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
639 ;; vladimir@cs.ualberta.ca 30-Jul-1997: skip ` in
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
640 ;; `variable' so that the value is returned, not the
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
641 ;; name
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
642 (if (and ignore-quotes
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
643 (eq (following-char) ?`))
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
644 (forward-char))
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
645 (narrow-to-region (point-min) opoint)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
646 (setq expr (read (current-buffer)))
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
647 ;; If it's an (interactive ...) form, it's more
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
648 ;; useful to show how an interactive call would
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
649 ;; use it.
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
650 (and (consp expr)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
651 (eq (car expr) 'interactive)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
652 (setq expr
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
653 (list 'call-interactively
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
654 (list 'quote
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
655 (list 'lambda
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
656 '(&rest args)
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
657 expr
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
658 'args)))))
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
659 expr)))))
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
660
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
661
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
662 (defun eval-last-sexp-1 (eval-last-sexp-arg-internal)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
663 "Evaluate sexp before point; print value in minibuffer.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
664 With argument, print output into current buffer."
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
665 (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t)))
78597
06f0300fda43 preceding-sexp
Vinicius Jose Latorre <viniciusjl@ig.com.br>
parents: 78217
diff changeset
666 (eval-last-sexp-print-value (eval (preceding-sexp)))))
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
667
52208
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
668
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
669 (defun eval-last-sexp-print-value (value)
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
670 (let ((unabbreviated (let ((print-length nil) (print-level nil))
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
671 (prin1-to-string value)))
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
672 (print-length eval-expression-print-length)
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
673 (print-level eval-expression-print-level)
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
674 (beg (point))
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
675 end)
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
676 (prog1
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
677 (prin1 value)
55829
fcd2e17daffa (prin1-char): Catch errors from `string'.
Richard M. Stallman <rms@gnu.org>
parents: 55805
diff changeset
678 (let ((str (eval-expression-print-format value)))
fcd2e17daffa (prin1-char): Catch errors from `string'.
Richard M. Stallman <rms@gnu.org>
parents: 55805
diff changeset
679 (if str (princ str)))
52208
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
680 (setq end (point))
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
681 (when (and (bufferp standard-output)
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
682 (or (not (null print-length))
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
683 (not (null print-level)))
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
684 (not (string= unabbreviated
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
685 (buffer-substring-no-properties beg end))))
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
686 (last-sexp-setup-props beg end value
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
687 unabbreviated
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
688 (buffer-substring-no-properties beg end))
4a7f0e1b3678 (eval-last-sexp-print-value): New subroutine, broken out of eval-last-sexp-1.
Richard M. Stallman <rms@gnu.org>
parents: 51981
diff changeset
689 ))))
38572
107f826252d2 (last-sexp-print): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 38566
diff changeset
690
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
691
56686
c28ce21eb5ae (eval-last-sexp): Don't cons a new symbol each time.
Richard M. Stallman <rms@gnu.org>
parents: 56003
diff changeset
692 (defvar eval-last-sexp-fake-value (make-symbol "t"))
c28ce21eb5ae (eval-last-sexp): Don't cons a new symbol each time.
Richard M. Stallman <rms@gnu.org>
parents: 56003
diff changeset
693
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
694 (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
695 "Evaluate sexp before point; print value in minibuffer.
69851
169719af1b5e (eval-print-last-sexp, eval-last-sexp, eval-defun): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 68648
diff changeset
696 Interactively, with prefix argument, print output into current buffer.
169719af1b5e (eval-print-last-sexp, eval-last-sexp, eval-defun): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 68648
diff changeset
697
169719af1b5e (eval-print-last-sexp, eval-last-sexp, eval-defun): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 68648
diff changeset
698 If `eval-expression-debug-on-error' is non-nil, which is the default,
169719af1b5e (eval-print-last-sexp, eval-last-sexp, eval-defun): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 68648
diff changeset
699 this command arranges for all errors to enter the debugger."
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
700 (interactive "P")
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
701 (if (null eval-expression-debug-on-error)
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
702 (eval-last-sexp-1 eval-last-sexp-arg-internal)
78073
36ddacf0d44b (eval-last-sexp): Avoid introducing any
Andreas Schwab <schwab@suse.de>
parents: 76880
diff changeset
703 (let ((value
36ddacf0d44b (eval-last-sexp): Avoid introducing any
Andreas Schwab <schwab@suse.de>
parents: 76880
diff changeset
704 (let ((debug-on-error eval-last-sexp-fake-value))
36ddacf0d44b (eval-last-sexp): Avoid introducing any
Andreas Schwab <schwab@suse.de>
parents: 76880
diff changeset
705 (cons (eval-last-sexp-1 eval-last-sexp-arg-internal)
36ddacf0d44b (eval-last-sexp): Avoid introducing any
Andreas Schwab <schwab@suse.de>
parents: 76880
diff changeset
706 debug-on-error))))
36ddacf0d44b (eval-last-sexp): Avoid introducing any
Andreas Schwab <schwab@suse.de>
parents: 76880
diff changeset
707 (unless (eq (cdr value) eval-last-sexp-fake-value)
36ddacf0d44b (eval-last-sexp): Avoid introducing any
Andreas Schwab <schwab@suse.de>
parents: 76880
diff changeset
708 (setq debug-on-error (cdr value)))
36ddacf0d44b (eval-last-sexp): Avoid introducing any
Andreas Schwab <schwab@suse.de>
parents: 76880
diff changeset
709 (car value))))
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
710
25434
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
711 (defun eval-defun-1 (form)
56003
9650d55ad73d (eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 55829
diff changeset
712 "Treat some expressions specially.
9650d55ad73d (eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 55829
diff changeset
713 Reset the `defvar' and `defcustom' variables to the initial value.
9650d55ad73d (eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 55829
diff changeset
714 Reinitialize the face according to the `defface' specification."
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
715 ;; 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
716 ;; the same, since this gets a macroexpended form.
42235
103ed59cfd30 (eval-defun-1): Cope with atoms as args.
Richard M. Stallman <rms@gnu.org>
parents: 41812
diff changeset
717 (cond ((not (listp form))
103ed59cfd30 (eval-defun-1): Cope with atoms as args.
Richard M. Stallman <rms@gnu.org>
parents: 41812
diff changeset
718 form)
103ed59cfd30 (eval-defun-1): Cope with atoms as args.
Richard M. Stallman <rms@gnu.org>
parents: 41812
diff changeset
719 ((and (eq (car form) 'defvar)
51261
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
720 (cdr-safe (cdr-safe form))
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
721 (boundp (cadr form)))
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
722 ;; Force variable to be re-set.
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
723 `(progn (defvar ,(nth 1 form) nil ,@(nthcdr 3 form))
59755
c4bcae7d90b4 (eval-defun-1): Make sure `defvar' always sets the default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59571
diff changeset
724 (setq-default ,(nth 1 form) ,(nth 2 form))))
28324
979a905864ab (lisp-eval-defun): Make arglist compatible with inf-lisp version.
Dave Love <fx@gnu.org>
parents: 27934
diff changeset
725 ;; `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
726 ;; `custom-declare-variable' with a quoted value arg.
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
727 ((and (eq (car form) 'custom-declare-variable)
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
728 (default-boundp (eval (nth 1 form))))
25434
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
729 ;; 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
730 (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
731 form)
56003
9650d55ad73d (eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 55829
diff changeset
732 ;; `defface' is macroexpanded to `custom-declare-face'.
9650d55ad73d (eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 55829
diff changeset
733 ((eq (car form) 'custom-declare-face)
9650d55ad73d (eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 55829
diff changeset
734 ;; Reset the face.
9650d55ad73d (eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 55829
diff changeset
735 (setq face-new-frame-defaults
9650d55ad73d (eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 55829
diff changeset
736 (assq-delete-all (eval (nth 1 form)) face-new-frame-defaults))
63638
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
737 (put (eval (nth 1 form)) 'face-defface-spec nil)
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
738 ;; Setting `customized-face' to the new spec after calling
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
739 ;; the form, but preserving the old saved spec in `saved-face',
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
740 ;; imitates the situation when the new face spec is set
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
741 ;; temporarily for the current session in the customize
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
742 ;; buffer, thus allowing `face-user-default-spec' to use the
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
743 ;; new customized spec instead of the saved spec.
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
744 ;; Resetting `saved-face' temporarily to nil is needed to let
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
745 ;; `defface' change the spec, regardless of a saved spec.
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
746 (prog1 `(prog1 ,form
63988
7f1acc9f0399 (eval-defun-1): Remove unnecessary quotes.
Juri Linkov <juri@jurta.org>
parents: 63764
diff changeset
747 (put ,(nth 1 form) 'saved-face
63638
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
748 ',(get (eval (nth 1 form)) 'saved-face))
63988
7f1acc9f0399 (eval-defun-1): Remove unnecessary quotes.
Juri Linkov <juri@jurta.org>
parents: 63764
diff changeset
749 (put ,(nth 1 form) 'customized-face
7f1acc9f0399 (eval-defun-1): Remove unnecessary quotes.
Juri Linkov <juri@jurta.org>
parents: 63764
diff changeset
750 ,(nth 2 form)))
63638
83144542b6da (eval-defun-1):
Juri Linkov <juri@jurta.org>
parents: 63108
diff changeset
751 (put (eval (nth 1 form)) 'saved-face nil)))
25434
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
752 ((eq (car form) 'progn)
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
753 (cons 'progn (mapcar 'eval-defun-1 (cdr form))))
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
754 (t form)))
9a7891b32d1a (eval-defun): Expand macros,
Richard M. Stallman <rms@gnu.org>
parents: 25109
diff changeset
755
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
756 (defun eval-defun-2 ()
248
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
757 "Evaluate defun that point is in or before.
24895
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
758 The value is displayed in the minibuffer.
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
759 If the current defun is actually a call to `defvar',
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
760 then reset the variable using the initial value expression
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
761 even if the variable already has some other value.
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
762 \(Normally `defvar' does not change the variable's value
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
763 if it already has a value.\)
485668a57232 (eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23738
diff changeset
764
23388
8aa1f99efb66 (eval-defun): Return the evaluation result.
Karl Heuer <kwzh@gnu.org>
parents: 23191
diff changeset
765 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
766 Return the result of evaluation."
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
767 (interactive "P")
25703
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
768 (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
769 (print-length eval-expression-print-length)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
770 (print-level eval-expression-print-level))
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
771 (save-excursion
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
772 ;; 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
773 ;; 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
774 ;; variable. Re-written using `apply' to avoid capturing
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
775 ;; variables like `end'.
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
776 (apply
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
777 #'eval-region
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
778 (let ((standard-output t)
25703
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
779 beg end form)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
780 ;; 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
781 (save-excursion
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
782 (end-of-defun)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
783 (beginning-of-defun)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
784 (setq beg (point))
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
785 (setq form (read (current-buffer)))
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
786 (setq end (point)))
56003
9650d55ad73d (eval-defun-1): Add `defface'. Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 55829
diff changeset
787 ;; Alter the form if necessary.
25703
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
788 (setq form (eval-defun-1 (macroexpand form)))
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
789 (list beg end standard-output
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
790 `(lambda (ignore)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
791 ;; Skipping to the end of the specified region
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
792 ;; will make eval-region return.
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
793 (goto-char ,end)
00b4eac00979 (eval-defun, eval-last-sexp):
Richard M. Stallman <rms@gnu.org>
parents: 25642
diff changeset
794 ',form))))))
25107
2aa414a532f2 (eval-defun): Re-written to avoid
Dave Love <fx@gnu.org>
parents: 24895
diff changeset
795 ;; 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
796 (car values))
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
797
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
798 (defun eval-defun (edebug-it)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
799 "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
800
40409
216728b10960 (eval-defun): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 39564
diff changeset
801 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
802 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
803 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
804 \(Normally `defvar' and `defcustom' do not alter the value if there
78096
8e308ce2d884 (eval-defun): Explain special handling of `defface'.
Richard M. Stallman <rms@gnu.org>
parents: 78073
diff changeset
805 already is one.) In an analogous way, evaluating a `defface'
8e308ce2d884 (eval-defun): Explain special handling of `defface'.
Richard M. Stallman <rms@gnu.org>
parents: 78073
diff changeset
806 overrides any customizations of the face, so that it becomes
8e308ce2d884 (eval-defun): Explain special handling of `defface'.
Richard M. Stallman <rms@gnu.org>
parents: 78073
diff changeset
807 defined exactly as the `defface' expression says.
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
808
69851
169719af1b5e (eval-print-last-sexp, eval-last-sexp, eval-defun): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 68648
diff changeset
809 If `eval-expression-debug-on-error' is non-nil, which is the default,
169719af1b5e (eval-print-last-sexp, eval-last-sexp, eval-defun): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 68648
diff changeset
810 this command arranges for all errors to enter the debugger.
169719af1b5e (eval-print-last-sexp, eval-last-sexp, eval-defun): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 68648
diff changeset
811
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
812 With a prefix argument, instrument the code for Edebug.
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
813
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
814 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
815 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
816 instrumented, just FUNCTION is printed.
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
817
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
818 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
819 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
820 `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
821 which see."
27303
6af9b684a1a0 (eval-last-sexp-1): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 27300
diff changeset
822 (interactive "P")
30055
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
823 (cond (edebug-it
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
824 (require 'edebug)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
825 (eval-defun (not edebug-all-defs)))
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
826 (t
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
827 (if (null eval-expression-debug-on-error)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
828 (eval-defun-2)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
829 (let ((old-value (make-symbol "t")) new-value value)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
830 (let ((debug-on-error old-value))
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
831 (setq value (eval-defun-2))
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
832 (setq new-value debug-on-error))
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
833 (unless (eq old-value new-value)
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
834 (setq debug-on-error new-value))
16e560dd4ab8 (eval-defun-2): Remove parameter
Gerd Moellmann <gerd@gnu.org>
parents: 28994
diff changeset
835 value)))))
66747
d7776140d845 (lisp-mode-variables): Don't set comment-indent-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66404
diff changeset
836
d7776140d845 (lisp-mode-variables): Don't set comment-indent-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66404
diff changeset
837 ;; May still be used by some external Lisp-mode variant.
d7776140d845 (lisp-mode-variables): Don't set comment-indent-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66404
diff changeset
838 (define-obsolete-function-alias 'lisp-comment-indent 'comment-indent-default)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
839
40790
3b3c00fa282a (lisp-imenu-generic-expression): Paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40759
diff changeset
840 ;; 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
841 ;; 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
842 ;; taking a `;' inside a string started on another line for a comment starter.
54501
96f7b2598aa3 (lisp-mode-variables): Don't set
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54315
diff changeset
843 ;; Note: `newcomment' gets it right now since we set comment-use-global-state
96f7b2598aa3 (lisp-mode-variables): Don't set
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54315
diff changeset
844 ;; 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
845 (defun lisp-mode-auto-fill ()
3627bd4b83d9 (lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20013
diff changeset
846 (if (> (current-column) (current-fill-column))
3627bd4b83d9 (lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20013
diff changeset
847 (if (save-excursion
41512
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
848 (nth 4 (syntax-ppss (point))))
20333
3627bd4b83d9 (lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20013
diff changeset
849 (do-auto-fill)
41512
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
850 (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
851 comment-auto-fill-only-comments)
4f4835967793 (lisp-mode-variables): Set syntax-begin-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41509
diff changeset
852 (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
853 (do-auto-fill))))))
20333
3627bd4b83d9 (lisp-mode-auto-fill): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20013
diff changeset
854
78730
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
855 (defcustom lisp-indent-offset nil
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
856 "If non-nil, indent second line of expressions that many more columns."
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
857 :group 'lisp
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
858 :type '(choice nil integer))
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
859 (put 'lisp-body-indent 'safe-local-variable
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
860 (lambda (x) (or (null x) (integerp x))))
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
861
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
862 (defvar lisp-indent-function 'lisp-indent-function)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
863
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
864 (defun lisp-indent-line (&optional whole-exp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
865 "Indent current line as Lisp code.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
866 With argument, indent any additional lines of the same expression
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
867 rigidly along with this one."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
868 (interactive "P")
39564
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
869 (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
870 (pos (- (point-max) (point)))
0e059993ad95 (lisp-imenu-generic-expression): Use regexp-opt.
Gerd Moellmann <gerd@gnu.org>
parents: 38585
diff changeset
871 (beg (progn (beginning-of-line) (point))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
872 (skip-chars-forward " \t")
17308
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
873 (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
874 ;; 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
875 ;; or a line that starts in a string.
677
7a9b4ea68565 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 659
diff changeset
876 (goto-char (- (point-max) pos))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
877 (if (and (looking-at "\\s<") (not (looking-at "\\s<\\s<")))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
878 ;; Single-semicolon comment lines should be indented
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
879 ;; as comment lines, not as code.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
880 (progn (indent-for-comment) (forward-char -1))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
881 (if (listp indent) (setq indent (car indent)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
882 (setq shift-amt (- indent (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
883 (if (zerop shift-amt)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
884 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
885 (delete-region beg (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
886 (indent-to indent)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
887 ;; If initial point was within line's indentation,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
888 ;; position after the indentation. Else stay at same point in text.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
889 (if (> (- (point-max) pos) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
890 (goto-char (- (point-max) pos)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
891 ;; If desired, shift remaining lines of expression the same amount.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
892 (and whole-exp (not (zerop shift-amt))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
893 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
894 (goto-char beg)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
895 (forward-sexp 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
896 (setq end (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
897 (goto-char beg)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
898 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
899 (setq beg (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
900 (> end beg))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
901 (indent-code-rigidly beg end shift-amt)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
902
9424
738999b0296f Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9423
diff changeset
903 (defvar calculate-lisp-indent-last-sexp)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
904
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
905 (defun calculate-lisp-indent (&optional parse-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
906 "Return appropriate indentation for current line as Lisp code.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
907 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
908 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
909 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
910
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
911 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
912 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
913 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
914 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
915 is the buffer position of the start of the containing expression."
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
916 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
917 (beginning-of-line)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
918 (let ((indent-point (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
919 state paren-depth
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
920 ;; setting this to a number inhibits calling hook
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
921 (desired-indent nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
922 (retry t)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
923 calculate-lisp-indent-last-sexp containing-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
924 (if parse-start
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
925 (goto-char parse-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
926 (beginning-of-defun))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
927 ;; Find outermost containing sexp
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
928 (while (< (point) indent-point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
929 (setq state (parse-partial-sexp (point) indent-point 0)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
930 ;; Find innermost containing sexp
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
931 (while (and retry
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
932 state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
933 (> (setq paren-depth (elt state 0)) 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
934 (setq retry nil)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
935 (setq calculate-lisp-indent-last-sexp (elt state 2))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
936 (setq containing-sexp (elt state 1))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
937 ;; Position following last unclosed open.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
938 (goto-char (1+ containing-sexp))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
939 ;; Is there a complete sexp since then?
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
940 (if (and calculate-lisp-indent-last-sexp
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
941 (> calculate-lisp-indent-last-sexp (point)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
942 ;; 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
943 (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
944 indent-point 0)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
945 (if (setq retry (car (cdr peek))) (setq state peek)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
946 (if retry
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
947 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
948 ;; Innermost containing sexp found
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
949 (goto-char (1+ containing-sexp))
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
950 (if (not calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
951 ;; indent-point immediately follows open paren.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
952 ;; Don't call hook.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
953 (setq desired-indent (current-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
954 ;; 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
955 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
956 (cond ((looking-at "\\s(")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
957 ;; First element of containing sexp is a list.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
958 ;; Indent under that list.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
959 )
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
960 ((> (save-excursion (forward-line 1) (point))
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
961 calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
962 ;; This is the first line to start within the containing sexp.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
963 ;; It's almost certainly a function call.
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
964 (if (= (point) calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
965 ;; Containing sexp has nothing before this line
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
966 ;; except the first element. Indent under that element.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
967 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
968 ;; Skip the first element, find start of second (the first
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
969 ;; argument of the function call) and indent under.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
970 (progn (forward-sexp 1)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
971 (parse-partial-sexp (point)
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
972 calculate-lisp-indent-last-sexp
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
973 0 t)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
974 (backward-prefix-chars))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
975 (t
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
976 ;; Indent beneath first sexp on same line as
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
977 ;; `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
978 ;; almost certainly a function call.
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
979 (goto-char calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
980 (beginning-of-line)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
981 (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
982 0 t)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
983 (backward-prefix-chars)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
984 ;; 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
985 ;; Call indentation hook except when overridden by lisp-indent-offset
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
986 ;; or if the desired indentation has already been computed.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
987 (let ((normal-indent (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
988 (cond ((elt state 3)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
989 ;; 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
990 nil)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
991 ((and (integerp lisp-indent-offset) containing-sexp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
992 ;; Indent by constant offset
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
993 (goto-char containing-sexp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
994 (+ (current-column) lisp-indent-offset))
76324
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
995 ;; in this case calculate-lisp-indent-last-sexp is not nil
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
996 (calculate-lisp-indent-last-sexp
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
997 (or
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
998 ;; try to align the parameters of a known function
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
999 (and lisp-indent-function
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1000 (not retry)
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1001 (funcall lisp-indent-function indent-point state))
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1002 ;; If the function has no special alignment
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1003 ;; or it does not apply to this argument,
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1004 ;; try to align a constant-symbol under the last
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1005 ;; preceding constant symbol, if there is such one of
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1006 ;; the last 2 preceding symbols, in the previous
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1007 ;; uncommented line.
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1008 (and (save-excursion
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1009 (goto-char indent-point)
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1010 (skip-chars-forward " \t")
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1011 (looking-at ":"))
78180
b22beb3e496f (calculate-lisp-indent): In the
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78096
diff changeset
1012 ;; The last sexp may not be at the indentation
b22beb3e496f (calculate-lisp-indent): In the
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78096
diff changeset
1013 ;; where it begins, so find that one, instead.
b22beb3e496f (calculate-lisp-indent): In the
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78096
diff changeset
1014 (save-excursion
b22beb3e496f (calculate-lisp-indent): In the
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78096
diff changeset
1015 (goto-char calculate-lisp-indent-last-sexp)
b22beb3e496f (calculate-lisp-indent): In the
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78096
diff changeset
1016 (while (and (not (looking-back "^[ \t]*"))
b22beb3e496f (calculate-lisp-indent): In the
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78096
diff changeset
1017 (or (not containing-sexp)
b22beb3e496f (calculate-lisp-indent): In the
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78096
diff changeset
1018 (< (1+ containing-sexp) (point))))
b22beb3e496f (calculate-lisp-indent): In the
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78096
diff changeset
1019 (forward-sexp -1)
b22beb3e496f (calculate-lisp-indent): In the
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78096
diff changeset
1020 (backward-prefix-chars))
b22beb3e496f (calculate-lisp-indent): In the
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78096
diff changeset
1021 (setq calculate-lisp-indent-last-sexp (point)))
76324
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1022 (> calculate-lisp-indent-last-sexp
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1023 (save-excursion
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1024 (goto-char (1+ containing-sexp))
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1025 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1026 (point)))
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1027 (let ((parse-sexp-ignore-comments t)
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1028 indent)
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1029 (goto-char calculate-lisp-indent-last-sexp)
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1030 (or (and (looking-at ":")
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1031 (setq indent (current-column)))
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1032 (and (< (save-excursion (beginning-of-line) (point))
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1033 (prog2 (backward-sexp) (point)))
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1034 (looking-at ":")
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1035 (setq indent (current-column))))
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1036 indent))
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1037 ;; another symbols or constants not preceded by a constant
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1038 ;; as defined above.
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1039 normal-indent))
b72eb510e3d7 (calculate-lisp-indent): Redo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 75977
diff changeset
1040 ;; in this case calculate-lisp-indent-last-sexp is nil
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1041 (desired-indent)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1042 (t
214
a1430f8459e5 *** empty log message ***
Brian Preble <rassilon@gnu.org>
parents: 213
diff changeset
1043 normal-indent))))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1044
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1045 (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
1046 "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
1047 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
1048 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
1049
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
1050 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
1051 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
1052 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
1053
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
1054 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
1055 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
1056 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
1057 * `defun', meaning indent `defun'-style;
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
1058 * an integer N, meaning indent the first N arguments specially
59846
e760650016fc (lisp-indent-function): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 59755
diff changeset
1059 like ordinary function arguments and then indent any further
e760650016fc (lisp-indent-function): Doc fix.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 59755
diff changeset
1060 arguments like a body;
41509
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
1061 * a function to call just as this function was called.
59848
d992bb330d29 (lisp-indent-function): Fix bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 59846
diff changeset
1062 If that function returns nil, that means it doesn't specify
d992bb330d29 (lisp-indent-function): Fix bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 59846
diff changeset
1063 the indentation.
41509
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
1064
aeb0c4a140d2 (lisp-indent-function): Add doc string.
Richard M. Stallman <rms@gnu.org>
parents: 41334
diff changeset
1065 This function also returns nil meaning don't specify the indentation."
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1066 (let ((normal-indent (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1067 (goto-char (1+ (elt state 1)))
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
1068 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1069 (if (and (elt state 2)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1070 (not (looking-at "\\sw\\|\\s_")))
46159
bd315b9fa3f0 Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 42699
diff changeset
1071 ;; car of form doesn't seem to be a symbol
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1072 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1073 (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
1074 calculate-lisp-indent-last-sexp))
51261
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
1075 (progn (goto-char calculate-lisp-indent-last-sexp)
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
1076 (beginning-of-line)
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
1077 (parse-partial-sexp (point)
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
1078 calculate-lisp-indent-last-sexp 0 t)))
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
1079 ;; Indent under the list or under the first sexp on the same
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
1080 ;; line as calculate-lisp-indent-last-sexp. Note that first
a3a1d78e827e (lisp-font-lock-syntactic-face-function): Don't infinite lop at bob.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50677
diff changeset
1081 ;; thing on that line has to be complete sexp since we are
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
1082 ;; inside the innermost containing sexp.
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1083 (backward-prefix-chars)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1084 (current-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1085 (let ((function (buffer-substring (point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1086 (progn (forward-sexp 1) (point))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1087 method)
3638
45169f86d3a4 (lisp-indent-function): Look for either
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
1088 (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
1089 (get (intern-soft function) 'lisp-indent-hook)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1090 (cond ((or (eq method 'defun)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1091 (and (null method)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1092 (> (length function) 3)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1093 (string-match "\\`def" function)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1094 (lisp-indent-defform state indent-point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1095 ((integerp method)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1096 (lisp-indent-specform method state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1097 indent-point normal-indent))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1098 (method
59848
d992bb330d29 (lisp-indent-function): Fix bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 59846
diff changeset
1099 (funcall method indent-point state)))))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1100
78730
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
1101 (defcustom lisp-body-indent 2
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
1102 "Number of columns to indent the second line of a `(def...)' form."
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
1103 :group 'lisp
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
1104 :type 'integer)
7191ad0f348d (lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.
Richard M. Stallman <rms@gnu.org>
parents: 78597
diff changeset
1105 (put 'lisp-body-indent 'safe-local-variable 'integerp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1106
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1107 (defun lisp-indent-specform (count state indent-point normal-indent)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1108 (let ((containing-form-start (elt state 1))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1109 (i count)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1110 body-indent containing-form-column)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1111 ;; Move to the start of containing form, calculate indentation
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1112 ;; to use for non-distinguished forms (> count), and move past the
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1113 ;; function symbol. lisp-indent-function guarantees that there is at
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1114 ;; least one word or symbol character following open paren of containing
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1115 ;; form.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1116 (goto-char containing-form-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1117 (setq containing-form-column (current-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1118 (setq body-indent (+ lisp-body-indent containing-form-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1119 (forward-char 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1120 (forward-sexp 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1121 ;; Now find the start of the last form.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1122 (parse-partial-sexp (point) indent-point 1 t)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1123 (while (and (< (point) indent-point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1124 (condition-case ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1125 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1126 (setq count (1- count))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1127 (forward-sexp 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1128 (parse-partial-sexp (point) indent-point 1 t))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1129 (error nil))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1130 ;; Point is sitting on first character of last (or count) sexp.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1131 (if (> count 0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1132 ;; A distinguished form. If it is the first or second form use double
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1133 ;; lisp-body-indent, else normal indent. With lisp-body-indent bound
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1134 ;; 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
1135 ;; the older code, but it makes unwind-protect, condition-case,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1136 ;; with-output-to-temp-buffer, et. al. much more tasteful. The older,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1137 ;; less hacked, behavior can be obtained by replacing below with
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1138 ;; (list normal-indent containing-form-start).
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1139 (if (<= (- i count) 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1140 (list (+ containing-form-column (* 2 lisp-body-indent))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1141 containing-form-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1142 (list normal-indent containing-form-start))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1143 ;; A non-distinguished form. Use body-indent if there are no
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1144 ;; distinguished forms and this is the first undistinguished form,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1145 ;; or if this is the first undistinguished form and the preceding
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1146 ;; distinguished form has indentation at least as great as body-indent.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1147 (if (or (and (= i 0) (= count 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1148 (and (= count 0) (<= body-indent normal-indent)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1149 body-indent
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1150 normal-indent))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1151
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1152 (defun lisp-indent-defform (state indent-point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1153 (goto-char (car (cdr state)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1154 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1155 (if (> (point) (car (cdr (cdr state))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1156 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1157 (goto-char (car (cdr state)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1158 (+ lisp-body-indent (current-column)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1159
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
1160
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1161 ;; (put 'progn 'lisp-indent-function 0), say, causes progn to be indented
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1162 ;; like defun if the first form is placed on the next line, otherwise
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1163 ;; 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
1164
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1165 (put 'lambda 'lisp-indent-function 'defun)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1166 (put 'autoload 'lisp-indent-function 'defun)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1167 (put 'progn 'lisp-indent-function 0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1168 (put 'prog1 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1169 (put 'prog2 'lisp-indent-function 2)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1170 (put 'save-excursion 'lisp-indent-function 0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1171 (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
1172 (put 'save-selected-window 'lisp-indent-function 0)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1173 (put 'save-restriction 'lisp-indent-function 0)
1163
c205d560cc22 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 878
diff changeset
1174 (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
1175 (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
1176 (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
1177 (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
1178 (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
1179 (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
1180 (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
1181 (put 'with-temp-message 'lisp-indent-function 1)
27300
baffb2de5ce9 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 26682
diff changeset
1182 (put 'with-syntax-table 'lisp-indent-function 1)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1183 (put 'let 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1184 (put 'let* 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1185 (put 'while 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1186 (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
1187 (put 'read-if 'lisp-indent-function 2)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1188 (put 'catch 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1189 (put 'condition-case 'lisp-indent-function 2)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1190 (put 'unwind-protect 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1191 (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
1192 (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
1193 (put 'dolist 'lisp-indent-function 1)
a681b4de47a1 Add indent specs for dolist, dotimes, when, unless.
Dave Love <fx@gnu.org>
parents: 27303
diff changeset
1194 (put 'dotimes 'lisp-indent-function 1)
a681b4de47a1 Add indent specs for dolist, dotimes, when, unless.
Dave Love <fx@gnu.org>
parents: 27303
diff changeset
1195 (put 'when 'lisp-indent-function 1)
a681b4de47a1 Add indent specs for dolist, dotimes, when, unless.
Dave Love <fx@gnu.org>
parents: 27303
diff changeset
1196 (put 'unless 'lisp-indent-function 1)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1197
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1198 (defun indent-sexp (&optional endpos)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1199 "Indent each line of the list starting just after point.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1200 If optional arg ENDPOS is given, indent each line, stopping when
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1201 ENDPOS is encountered."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1202 (interactive)
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1203 (let ((indent-stack (list nil))
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1204 (next-depth 0)
10594
aadef46f00f7 (lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents: 9424
diff changeset
1205 ;; 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
1206 ;; 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
1207 ;; 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
1208 ;; 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
1209 ;; 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
1210 (starting-point (if endpos nil (point)))
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1211 (last-point (point))
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1212 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
1213 (or endpos
aadef46f00f7 (lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents: 9424
diff changeset
1214 ;; 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
1215 (save-excursion (forward-sexp 1)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1216 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1217 (setq outer-loop-done nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1218 (while (if endpos (< (point) endpos)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1219 (not outer-loop-done))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1220 (setq last-depth next-depth
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1221 inner-loop-done nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1222 ;; Parse this line so we can learn the state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1223 ;; to indent the next line.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1224 ;; This inner loop goes through only once
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1225 ;; unless a line ends inside a string.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1226 (while (and (not inner-loop-done)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1227 (not (setq outer-loop-done (eobp))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1228 (setq state (parse-partial-sexp (point) (progn (end-of-line) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1229 nil nil state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1230 (setq next-depth (car state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1231 ;; If the line contains a comment other than the sort
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1232 ;; that is indented like code,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1233 ;; indent it now with indent-for-comment.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1234 ;; Comments indented like code are right already.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1235 ;; In any case clear the in-comment flag in the state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1236 ;; because parse-partial-sexp never sees the newlines.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1237 (if (car (nthcdr 4 state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1238 (progn (indent-for-comment)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1239 (end-of-line)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1240 (setcar (nthcdr 4 state) nil)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1241 ;; If this line ends inside a string,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1242 ;; go straight to next line, remaining within the inner loop,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1243 ;; and turn off the \-flag.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1244 (if (car (nthcdr 3 state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1245 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1246 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1247 (setcar (nthcdr 5 state) nil))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1248 (setq inner-loop-done t)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1249 (and endpos
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1250 (<= next-depth 0)
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1251 (progn
32294
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
1252 (setq indent-stack (nconc indent-stack
a6eff9b566ae (lisp-imenu-generic-expression): Don't
Dave Love <fx@gnu.org>
parents: 30666
diff changeset
1253 (make-list (- next-depth) nil))
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1254 last-depth (- last-depth next-depth)
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1255 next-depth 0)))
75798
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1256 (forward-line 1)
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1257 ;; Decide whether to exit.
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1258 (if endpos
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1259 ;; If we have already reached the specified end,
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1260 ;; give up and do not reindent this line.
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1261 (if (<= endpos (point))
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1262 (setq outer-loop-done t))
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1263 ;; If no specified end, we are done if we have finished one sexp.
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1264 (if (<= next-depth 0)
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1265 (setq outer-loop-done t)))
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1266 (unless outer-loop-done
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1267 (while (> last-depth next-depth)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1268 (setq indent-stack (cdr indent-stack)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1269 last-depth (1- last-depth)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1270 (while (< last-depth next-depth)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1271 (setq indent-stack (cons nil indent-stack)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1272 last-depth (1+ last-depth)))
75798
8496bd7b062a (indent-sexp): Clean up termination condition -- don't fail to stop at endpos.
Richard M. Stallman <rms@gnu.org>
parents: 75641
diff changeset
1273 ;; Now indent the next line according
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1274 ;; to what we learned from parsing the previous one.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1275 (setq bol (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1276 (skip-chars-forward " \t")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1277 ;; But not if the line is blank, or just a comment
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1278 ;; (except for double-semi comments; indent them as usual).
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1279 (if (or (eobp) (looking-at "\\s<\\|\n"))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1280 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1281 (if (and (car indent-stack)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1282 (>= (car indent-stack) 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1283 (setq this-indent (car indent-stack))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1284 (let ((val (calculate-lisp-indent
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1285 (if (car indent-stack) (- (car indent-stack))
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
1286 starting-point))))
17308
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1287 (if (null val)
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1288 (setq this-indent val)
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1289 (if (integerp val)
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1290 (setcar indent-stack
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1291 (setq this-indent val))
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1292 (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
1293 (setq this-indent (car val))))))
e52fa60d97e8 (indent-sexp): If calculate-lisp-indent returns nil,
Richard M. Stallman <rms@gnu.org>
parents: 17144
diff changeset
1294 (if (and this-indent (/= (current-column) this-indent))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1295 (progn (delete-region bol (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1296 (indent-to this-indent)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1297 (or outer-loop-done
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1298 (setq outer-loop-done (= (point) last-point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1299 (setq last-point (point)))))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1300
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1301 (defun lisp-indent-region (start end)
27809
46468edab05e (emacs-lisp-mode-syntax-table)
Dave Love <fx@gnu.org>
parents: 27484
diff changeset
1302 "Indent every line whose first char is between START and END inclusive."
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1303 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1304 (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
1305 (goto-char start)
aadef46f00f7 (lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents: 9424
diff changeset
1306 (and (bolp) (not (eolp))
aadef46f00f7 (lisp-indent-region): Set endmark before indenting first line.
Richard M. Stallman <rms@gnu.org>
parents: 9424
diff changeset
1307 (lisp-indent-line))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1308 (indent-sexp endmark)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1309 (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
1310
55805
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1311 (defun indent-pp-sexp (&optional arg)
59571
04043e03826a (indent-pp-sexp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57401
diff changeset
1312 "Indent each line of the list starting just after point, or prettyprint it.
04043e03826a (indent-pp-sexp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57401
diff changeset
1313 A prefix argument specifies pretty-printing."
55805
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1314 (interactive "P")
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1315 (if arg
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1316 (save-excursion
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1317 (save-restriction
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1318 (narrow-to-region (point) (progn (forward-sexp 1) (point)))
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1319 (pp-buffer)
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1320 (goto-char (point-max))
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1321 (if (eq (char-before) ?\n)
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1322 (delete-char -1)))))
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1323 (indent-sexp))
a4c5317be59a * emacs-lisp/lisp-mode.el (indent-pp-sexp): New fun.
Juri Linkov <juri@jurta.org>
parents: 55773
diff changeset
1324
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1325 ;;;; Lisp paragraph filling commands.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1326
50001
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1327 (defcustom emacs-lisp-docstring-fill-column 65
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1328 "Value of `fill-column' to use when filling a docstring.
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1329 Any non-integer value means do not use a different value of
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1330 `fill-column' when filling docstrings."
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1331 :type '(choice (integer)
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1332 (const :tag "Use the current `fill-column'" t))
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1333 :group 'lisp)
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1334
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1335 (defun lisp-fill-paragraph (&optional justify)
50001
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1336 "Like \\[fill-paragraph], but handle Emacs Lisp comments and docstrings.
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1337 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
1338 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
1339 and initial semicolons."
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
1340 (interactive "P")
48127
ebfdb0351da6 (lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48119
diff changeset
1341 (or (fill-comment-paragraph justify)
57401
b1bdc11085c9 (lisp-fill-paragraph): Fix backslashes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57393
diff changeset
1342 ;; Since fill-comment-paragraph returned nil, that means we're not in
b1bdc11085c9 (lisp-fill-paragraph): Fix backslashes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57393
diff changeset
1343 ;; a comment: Point is on a program line; we are interested
50001
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1344 ;; particularly in docstring lines.
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1345 ;;
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1346 ;; We bind `paragraph-start' and `paragraph-separate' temporarily. They
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1347 ;; are buffer-local, but we avoid changing them so that they can be set
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1348 ;; to make `forward-paragraph' and friends do something the user wants.
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1349 ;;
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1350 ;; `paragraph-start': The `(' in the character alternative and the
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1351 ;; left-singlequote plus `(' sequence after the \\| alternative prevent
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1352 ;; sexps and backquoted sexps that follow a docstring from being filled
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1353 ;; with the docstring. This setting has the consequence of inhibiting
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1354 ;; filling many program lines that are not docstrings, which is sensible,
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1355 ;; because the user probably asked to fill program lines by accident, or
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1356 ;; expecting indentation (perhaps we should try to do indenting in that
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1357 ;; case). The `;' and `:' stop the paragraph being filled at following
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1358 ;; comment lines and at keywords (e.g., in `defcustom'). Left parens are
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1359 ;; escaped to keep font-locking, filling, & paren matching in the source
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1360 ;; file happy.
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1361 ;;
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1362 ;; `paragraph-separate': A clever regexp distinguishes the first line of
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1363 ;; a docstring and identifies it as a paragraph separator, so that it
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1364 ;; won't be filled. (Since the first line of documentation stands alone
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1365 ;; in some contexts, filling should not alter the contents the author has
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1366 ;; chosen.) Only the first line of a docstring begins with whitespace
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1367 ;; and a quotation mark and ends with a period or (rarely) a comma.
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1368 ;;
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1369 ;; The `fill-column' is temporarily bound to
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1370 ;; `emacs-lisp-docstring-fill-column' if that value is an integer.
48127
ebfdb0351da6 (lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48119
diff changeset
1371 (let ((paragraph-start (concat paragraph-start
57401
b1bdc11085c9 (lisp-fill-paragraph): Fix backslashes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57393
diff changeset
1372 "\\|\\s-*\\([(;:\"]\\|`(\\|#'(\\)"))
48127
ebfdb0351da6 (lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48119
diff changeset
1373 (paragraph-separate
50001
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1374 (concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
76880
def0f242e449 (lisp-fill-paragraph): Only obey emacs-lisp-docstring-fill-column in
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 76324
diff changeset
1375 (fill-column (if (and (integerp emacs-lisp-docstring-fill-column)
def0f242e449 (lisp-fill-paragraph): Only obey emacs-lisp-docstring-fill-column in
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 76324
diff changeset
1376 (derived-mode-p 'emacs-lisp-mode))
50001
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1377 emacs-lisp-docstring-fill-column
745c2428aae8 (emacs-lisp-docstring-fill-column): New custom variable.
Matthew Swift <swift@alum.mit.edu>
parents: 49598
diff changeset
1378 fill-column)))
48127
ebfdb0351da6 (lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48119
diff changeset
1379 (fill-paragraph justify))
ebfdb0351da6 (lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48119
diff changeset
1380 ;; Never return nil.
ebfdb0351da6 (lisp-fill-paragraph): Use fill-comment-paragraph.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48119
diff changeset
1381 t))
35279
139991123d49 (lisp-mode-shared-map): Bind `backspace' to `backward-delete-char-untabify'.
Sam Steingold <sds@gnu.org>
parents: 34366
diff changeset
1382
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1383 (defun indent-code-rigidly (start end arg &optional nochange-regexp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1384 "Indent all lines of code, starting in the region, sideways by ARG columns.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1385 Does not affect lines starting inside comments or strings, assuming that
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1386 the start of the region is not inside them.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1387
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1388 Called from a program, takes args START, END, COLUMNS and NOCHANGE-REGEXP.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1389 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
1390 means don't indent that line."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1391 (interactive "r\np")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1392 (let (state)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1393 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1394 (goto-char end)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1395 (setq end (point-marker))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1396 (goto-char start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1397 (or (bolp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1398 (setq state (parse-partial-sexp (point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1399 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1400 (forward-line 1) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1401 nil nil state)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1402 (while (< (point) end)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1403 (or (car (nthcdr 3 state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1404 (and nochange-regexp
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1405 (looking-at nochange-regexp))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1406 ;; If line does not start in string, indent it
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1407 (let ((indent (current-indentation)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1408 (delete-region (point) (progn (skip-chars-forward " \t") (point)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1409 (or (eolp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1410 (indent-to (max 0 (+ indent arg)) 0))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1411 (setq state (parse-partial-sexp (point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1412 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1413 (forward-line 1) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
1414 nil nil state))))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 422
diff changeset
1415
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 422
diff changeset
1416 (provide 'lisp-mode)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 422
diff changeset
1417
57401
b1bdc11085c9 (lisp-fill-paragraph): Fix backslashes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57393
diff changeset
1418 ;; arch-tag: 414c7f93-c245-4b77-8ed5-ed05ef7ff1bf
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 584
diff changeset
1419 ;;; lisp-mode.el ends here