annotate lisp/emacs-lisp/lisp-mode.el @ 9623:fe1c170fa35a

(facemenu-get-face): Don't add to menu here. (facemenu-face-menu, facemenu-foreground-menu, facemenu-background-menu): New or renamed variables for submenus.(facemenu-color-alist): Renamed from facemenu-colors. (facemenu-add-new-face): New function. (facemenu-update): Don't redo top-level menu; nothing should change. Move menu setup to defvars. Use facemenu-add-new-face. Changed global binding to C-down-mouse-3. (facemenu-menu): "Update" item removed; should no longer be needed interactively. (facemenu-complete-face-list): Just return faces, not keybindings.
author Boris Goldowsky <boris@gnu.org>
date Thu, 20 Oct 1994 18:15:25 +0000
parents 738999b0296f
children aadef46f00f7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 584
diff changeset
1 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands.
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 584
diff changeset
2
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 811
diff changeset
3 ;; Copyright (C) 1985 Free Software Foundation, Inc.
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 811
diff changeset
4
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 727
diff changeset
5 ;; Maintainer: FSF
811
e694e0879463 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
6 ;; Keywords: lisp, languages
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 727
diff changeset
7
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
9
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 727
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
13 ;; any later version.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
14
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
19
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
22 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
23
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
24 ;;; Commentary:
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
25
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
26 ;; The base major mode for editing Lisp code (used also for Emacs Lisp).
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
27 ;; This mode is documented in the Emacs manual
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
28
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
29 ;;; Code:
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
30
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
31 (defvar lisp-mode-syntax-table nil "")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
32 (defvar emacs-lisp-mode-syntax-table nil "")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
33 (defvar lisp-mode-abbrev-table nil "")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
34
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
35 (if (not emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
36 (let ((i 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
37 (setq emacs-lisp-mode-syntax-table (make-syntax-table))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
38 (while (< i ?0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
39 (modify-syntax-entry i "_ " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
40 (setq i (1+ i)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
41 (setq i (1+ ?9))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
42 (while (< i ?A)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
43 (modify-syntax-entry i "_ " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
44 (setq i (1+ i)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
45 (setq i (1+ ?Z))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
46 (while (< i ?a)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
47 (modify-syntax-entry i "_ " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
48 (setq i (1+ i)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
49 (setq i (1+ ?z))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
50 (while (< i 128)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
51 (modify-syntax-entry i "_ " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
52 (setq i (1+ i)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
53 (modify-syntax-entry ? " " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
54 (modify-syntax-entry ?\t " " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
55 (modify-syntax-entry ?\n "> " emacs-lisp-mode-syntax-table)
8325
2c8b3c988b10 (emacs-lisp-mode-syntax-table): Give RET the same syntax as newline.
Richard M. Stallman <rms@gnu.org>
parents: 7301
diff changeset
56 ;; Give CR the same syntax as newline, for selective-display.
2c8b3c988b10 (emacs-lisp-mode-syntax-table): Give RET the same syntax as newline.
Richard M. Stallman <rms@gnu.org>
parents: 7301
diff changeset
57 (modify-syntax-entry ?\^m "> " emacs-lisp-mode-syntax-table)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
58 (modify-syntax-entry ?\; "< " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
59 (modify-syntax-entry ?` "' " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
60 (modify-syntax-entry ?' "' " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
61 (modify-syntax-entry ?, "' " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
62 ;; Used to be singlequote; changed for flonums.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
63 (modify-syntax-entry ?. "_ " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
64 (modify-syntax-entry ?# "' " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
65 (modify-syntax-entry ?\" "\" " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
66 (modify-syntax-entry ?\\ "\\ " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
67 (modify-syntax-entry ?\( "() " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
68 (modify-syntax-entry ?\) ")( " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
69 (modify-syntax-entry ?\[ "(] " emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
70 (modify-syntax-entry ?\] ")[ " emacs-lisp-mode-syntax-table)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
71
285
adb31fcccc2b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 255
diff changeset
72 (if (not lisp-mode-syntax-table)
adb31fcccc2b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 255
diff changeset
73 (progn (setq lisp-mode-syntax-table
adb31fcccc2b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 255
diff changeset
74 (copy-syntax-table emacs-lisp-mode-syntax-table))
adb31fcccc2b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 255
diff changeset
75 (modify-syntax-entry ?\| "\" " lisp-mode-syntax-table)
adb31fcccc2b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 255
diff changeset
76 (modify-syntax-entry ?\[ "_ " lisp-mode-syntax-table)
adb31fcccc2b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 255
diff changeset
77 (modify-syntax-entry ?\] "_ " lisp-mode-syntax-table)))
adb31fcccc2b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 255
diff changeset
78
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
79 (define-abbrev-table 'lisp-mode-abbrev-table ())
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
80
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
81 (defun lisp-mode-variables (lisp-syntax)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
82 (cond (lisp-syntax
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
83 (set-syntax-table lisp-mode-syntax-table)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
84 (setq local-abbrev-table lisp-mode-abbrev-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
85 (make-local-variable 'paragraph-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
86 (setq paragraph-start (concat "^$\\|" page-delimiter))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
87 (make-local-variable 'paragraph-separate)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
88 (setq paragraph-separate paragraph-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
89 (make-local-variable 'paragraph-ignore-fill-prefix)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
90 (setq paragraph-ignore-fill-prefix t)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
91 (make-local-variable 'indent-line-function)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
92 (setq indent-line-function 'lisp-indent-line)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
93 (make-local-variable 'indent-region-function)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
94 (setq indent-region-function 'lisp-indent-region)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
95 (make-local-variable 'parse-sexp-ignore-comments)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
96 (setq parse-sexp-ignore-comments t)
6076
4f76564fc2cd (lisp-mode-variables): Set outline-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 5103
diff changeset
97 (make-local-variable 'outline-regexp)
7301
edad1db699ab (lisp-mode-variables): Added missing backslash to outline-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 7170
diff changeset
98 (setq outline-regexp ";;; \\|(....")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
99 (make-local-variable 'comment-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
100 (setq comment-start ";")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
101 (make-local-variable 'comment-start-skip)
7170
3b452d97f111 (lisp-mode-variables): Undo previous change.
Karl Heuer <kwzh@gnu.org>
parents: 7079
diff changeset
102 (setq comment-start-skip ";+ *")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
103 (make-local-variable 'comment-column)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
104 (setq comment-column 40)
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
105 (make-local-variable 'comment-indent-function)
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
106 (setq comment-indent-function 'lisp-comment-indent))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
107
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
108 (defvar shared-lisp-mode-map ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
109 "Keymap for commands shared by all sorts of Lisp modes.")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
110
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
111 (if shared-lisp-mode-map
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
112 ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
113 (setq shared-lisp-mode-map (make-sparse-keymap))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
114 (define-key shared-lisp-mode-map "\e\C-q" 'indent-sexp)
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
115 (define-key shared-lisp-mode-map "\M-q" 'lisp-fill-paragraph)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
116 (define-key shared-lisp-mode-map "\177" 'backward-delete-char-untabify)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
117 (define-key shared-lisp-mode-map "\t" 'lisp-indent-line))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
118
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
119 (defvar emacs-lisp-mode-map ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
120 "Keymap for Emacs Lisp mode.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
121 All commands in shared-lisp-mode-map are inherited by this map.")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
122
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
123 (if emacs-lisp-mode-map
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
124 ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
125 (setq emacs-lisp-mode-map
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
126 (nconc (make-sparse-keymap) shared-lisp-mode-map))
878
5b1c5b4286e7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
127 (define-key emacs-lisp-mode-map "\e\t" 'lisp-complete-symbol)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
128 (define-key emacs-lisp-mode-map "\e\C-x" 'eval-defun))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
129
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
130 (defun emacs-lisp-mode ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
131 "Major mode for editing Lisp code to run in Emacs.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
132 Commands:
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
133 Delete converts tabs to spaces as it moves back.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
134 Blank lines separate paragraphs. Semicolons start comments.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
135 \\{emacs-lisp-mode-map}
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
136 Entry to this mode calls the value of `emacs-lisp-mode-hook'
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
137 if that value is non-nil."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
138 (interactive)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
139 (kill-all-local-variables)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
140 (use-local-map emacs-lisp-mode-map)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
141 (set-syntax-table emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
142 (setq major-mode 'emacs-lisp-mode)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
143 (setq mode-name "Emacs-Lisp")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
144 (lisp-mode-variables nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
145 (run-hooks 'emacs-lisp-mode-hook))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
146
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
147 (defvar lisp-mode-map ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
148 "Keymap for ordinary Lisp mode.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
149 All commands in `shared-lisp-mode-map' are inherited by this map.")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
150
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
151 (if lisp-mode-map
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
152 ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
153 (setq lisp-mode-map
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
154 (nconc (make-sparse-keymap) shared-lisp-mode-map))
5103
40b068fb4c37 (lisp-eval-defun): Renamed from lisp-send-defun.
Richard M. Stallman <rms@gnu.org>
parents: 3638
diff changeset
155 (define-key lisp-mode-map "\e\C-x" 'lisp-eval-defun)
40b068fb4c37 (lisp-eval-defun): Renamed from lisp-send-defun.
Richard M. Stallman <rms@gnu.org>
parents: 3638
diff changeset
156 (define-key lisp-mode-map "\C-c\C-z" 'run-lisp))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
157
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
158 (defun lisp-mode ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
159 "Major mode for editing Lisp code for Lisps other than GNU Emacs Lisp.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
160 Commands:
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
161 Delete converts tabs to spaces as it moves back.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
162 Blank lines separate paragraphs. Semicolons start comments.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
163 \\{lisp-mode-map}
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
164 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
165 or to switch back to an existing one.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
166
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
167 Entry to this mode calls the value of `lisp-mode-hook'
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
168 if that value is non-nil."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
169 (interactive)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
170 (kill-all-local-variables)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
171 (use-local-map lisp-mode-map)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
172 (setq major-mode 'lisp-mode)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
173 (setq mode-name "Lisp")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
174 (lisp-mode-variables t)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
175 (set-syntax-table lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
176 (run-hooks 'lisp-mode-hook))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
177
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
178 ;; This will do unless shell.el is loaded.
5103
40b068fb4c37 (lisp-eval-defun): Renamed from lisp-send-defun.
Richard M. Stallman <rms@gnu.org>
parents: 3638
diff changeset
179 (defun lisp-eval-defun nil
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
180 "Send the current defun to the Lisp process made by \\[run-lisp]."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
181 (interactive)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
182 (error "Process lisp does not exist"))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
183
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
184 (defvar lisp-interaction-mode-map ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
185 "Keymap for Lisp Interaction moe.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
186 All commands in `shared-lisp-mode-map' are inherited by this map.")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
187
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
188 (if lisp-interaction-mode-map
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
189 ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
190 (setq lisp-interaction-mode-map
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
191 (nconc (make-sparse-keymap) shared-lisp-mode-map))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
192 (define-key lisp-interaction-mode-map "\e\C-x" 'eval-defun)
878
5b1c5b4286e7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
193 (define-key lisp-interaction-mode-map "\e\t" 'lisp-complete-symbol)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
194 (define-key lisp-interaction-mode-map "\n" 'eval-print-last-sexp))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
195
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
196 (defun lisp-interaction-mode ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
197 "Major mode for typing and evaluating Lisp forms.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
198 Like Lisp mode except that \\[eval-print-last-sexp] evals the Lisp expression
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
199 before point, and prints its value into the buffer, advancing point.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
200
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
201 Commands:
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
202 Delete converts tabs to spaces as it moves back.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
203 Paragraphs are separated only by blank lines.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
204 Semicolons start comments.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
205 \\{lisp-interaction-mode-map}
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
206 Entry to this mode calls the value of `lisp-interaction-mode-hook'
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
207 if that value is non-nil."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
208 (interactive)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
209 (kill-all-local-variables)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
210 (use-local-map lisp-interaction-mode-map)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
211 (setq major-mode 'lisp-interaction-mode)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
212 (setq mode-name "Lisp Interaction")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
213 (set-syntax-table emacs-lisp-mode-syntax-table)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
214 (lisp-mode-variables nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
215 (run-hooks 'lisp-interaction-mode-hook))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
216
248
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
217 (defun eval-print-last-sexp ()
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
218 "Evaluate sexp before point; print value into current buffer."
248
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
219 (interactive)
422
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
220 (let ((standard-output (current-buffer)))
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
221 (terpri)
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
222 (eval-last-sexp t)
5abb8aac7c6b *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 285
diff changeset
223 (terpri)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
224
2450
17d258d8e8e4 (eval-defun): Rename argument to avoid collision.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
225 (defun eval-last-sexp (eval-last-sexp-arg-internal)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
226 "Evaluate sexp before point; print value in minibuffer.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
227 With argument, print output into current buffer."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
228 (interactive "P")
2450
17d258d8e8e4 (eval-defun): Rename argument to avoid collision.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
229 (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t))
1163
c205d560cc22 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 878
diff changeset
230 (opoint (point)))
249
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
231 (prin1 (let ((stab (syntax-table)))
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
232 (eval (unwind-protect
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
233 (save-excursion
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
234 (set-syntax-table emacs-lisp-mode-syntax-table)
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
235 (forward-sexp -1)
1163
c205d560cc22 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 878
diff changeset
236 (save-restriction
c205d560cc22 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 878
diff changeset
237 (narrow-to-region (point-min) opoint)
c205d560cc22 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 878
diff changeset
238 (read (current-buffer))))
249
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
239 (set-syntax-table stab)))))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
240
2450
17d258d8e8e4 (eval-defun): Rename argument to avoid collision.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
241 (defun eval-defun (eval-defun-arg-internal)
248
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
242 "Evaluate defun that point is in or before.
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
243 Print value in minibuffer.
287cf3ae183a *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 214
diff changeset
244 With argument, insert value in current buffer after the defun."
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
245 (interactive "P")
2450
17d258d8e8e4 (eval-defun): Rename argument to avoid collision.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
246 (let ((standard-output (if eval-defun-arg-internal (current-buffer) t)))
249
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
247 (prin1 (eval (save-excursion
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
248 (end-of-defun)
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
249 (beginning-of-defun)
43cdaf2db624 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 248
diff changeset
250 (read (current-buffer)))))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
251
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
252 (defun lisp-comment-indent ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
253 (if (looking-at "\\s<\\s<\\s<")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
254 (current-column)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
255 (if (looking-at "\\s<\\s<")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
256 (let ((tem (calculate-lisp-indent)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
257 (if (listp tem) (car tem) tem))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
258 (skip-chars-backward " \t")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
259 (max (if (bolp) 0 (1+ (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
260 comment-column))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
261
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
262 (defconst lisp-indent-offset nil "")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
263 (defconst lisp-indent-function 'lisp-indent-function "")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
264
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
265 (defun lisp-indent-line (&optional whole-exp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
266 "Indent current line as Lisp code.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
267 With argument, indent any additional lines of the same expression
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
268 rigidly along with this one."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
269 (interactive "P")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
270 (let ((indent (calculate-lisp-indent)) shift-amt beg end
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
271 (pos (- (point-max) (point))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
272 (beginning-of-line)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
273 (setq beg (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
274 (skip-chars-forward " \t")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
275 (if (looking-at "\\s<\\s<\\s<")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
276 ;; Don't alter indentation of a ;;; comment line.
677
7a9b4ea68565 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 659
diff changeset
277 (goto-char (- (point-max) pos))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
278 (if (and (looking-at "\\s<") (not (looking-at "\\s<\\s<")))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
279 ;; Single-semicolon comment lines should be indented
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
280 ;; as comment lines, not as code.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
281 (progn (indent-for-comment) (forward-char -1))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
282 (if (listp indent) (setq indent (car indent)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
283 (setq shift-amt (- indent (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
284 (if (zerop shift-amt)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
285 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
286 (delete-region beg (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
287 (indent-to indent)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
288 ;; If initial point was within line's indentation,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
289 ;; position after the indentation. Else stay at same point in text.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
290 (if (> (- (point-max) pos) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
291 (goto-char (- (point-max) pos)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
292 ;; If desired, shift remaining lines of expression the same amount.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
293 (and whole-exp (not (zerop shift-amt))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
294 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
295 (goto-char beg)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
296 (forward-sexp 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
297 (setq end (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
298 (goto-char beg)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
299 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
300 (setq beg (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
301 (> end beg))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
302 (indent-code-rigidly beg end shift-amt)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
303
9424
738999b0296f Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 9423
diff changeset
304 (defvar calculate-lisp-indent-last-sexp)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
305
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
306 (defun calculate-lisp-indent (&optional parse-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
307 "Return appropriate indentation for current line as Lisp code.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
308 In usual case returns an integer: the column to indent to.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
309 Can instead return a list, whose car is the column to indent to.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
310 This means that following lines at the same level of indentation
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
311 should not necessarily be indented the same way.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
312 The second element of the list is the buffer position
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
313 of the start of the containing expression."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
314 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
315 (beginning-of-line)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
316 (let ((indent-point (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
317 state paren-depth
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
318 ;; setting this to a number inhibits calling hook
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
319 (desired-indent nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
320 (retry t)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
321 calculate-lisp-indent-last-sexp containing-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
322 (if parse-start
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
323 (goto-char parse-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
324 (beginning-of-defun))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
325 ;; Find outermost containing sexp
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
326 (while (< (point) indent-point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
327 (setq state (parse-partial-sexp (point) indent-point 0)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
328 ;; Find innermost containing sexp
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
329 (while (and retry
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
330 state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
331 (> (setq paren-depth (elt state 0)) 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
332 (setq retry nil)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
333 (setq calculate-lisp-indent-last-sexp (elt state 2))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
334 (setq containing-sexp (elt state 1))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
335 ;; Position following last unclosed open.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
336 (goto-char (1+ containing-sexp))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
337 ;; Is there a complete sexp since then?
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
338 (if (and calculate-lisp-indent-last-sexp
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
339 (> calculate-lisp-indent-last-sexp (point)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
340 ;; 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
341 (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
342 indent-point 0)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
343 (if (setq retry (car (cdr peek))) (setq state peek)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
344 (if retry
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
345 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
346 ;; Innermost containing sexp found
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
347 (goto-char (1+ containing-sexp))
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
348 (if (not calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
349 ;; indent-point immediately follows open paren.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
350 ;; Don't call hook.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
351 (setq desired-indent (current-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
352 ;; 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
353 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
354 (cond ((looking-at "\\s(")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
355 ;; First element of containing sexp is a list.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
356 ;; Indent under that list.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
357 )
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
358 ((> (save-excursion (forward-line 1) (point))
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
359 calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
360 ;; This is the first line to start within the containing sexp.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
361 ;; It's almost certainly a function call.
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
362 (if (= (point) calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
363 ;; Containing sexp has nothing before this line
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
364 ;; except the first element. Indent under that element.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
365 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
366 ;; Skip the first element, find start of second (the first
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
367 ;; argument of the function call) and indent under.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
368 (progn (forward-sexp 1)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
369 (parse-partial-sexp (point)
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
370 calculate-lisp-indent-last-sexp
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
371 0 t)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
372 (backward-prefix-chars))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
373 (t
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
374 ;; Indent beneath first sexp on same line as
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
375 ;; calculate-lisp-indent-last-sexp. Again, it's
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
376 ;; almost certainly a function call.
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
377 (goto-char calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
378 (beginning-of-line)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
379 (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
380 0 t)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
381 (backward-prefix-chars)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
382 ;; 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
383 ;; Call indentation hook except when overridden by lisp-indent-offset
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
384 ;; or if the desired indentation has already been computed.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
385 (let ((normal-indent (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
386 (cond ((elt state 3)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
387 ;; Inside a string, don't change indentation.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
388 (goto-char indent-point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
389 (skip-chars-forward " \t")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
390 (current-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
391 ((and (integerp lisp-indent-offset) containing-sexp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
392 ;; Indent by constant offset
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
393 (goto-char containing-sexp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
394 (+ (current-column) lisp-indent-offset))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
395 (desired-indent)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
396 ((and (boundp 'lisp-indent-function)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
397 lisp-indent-function
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
398 (not retry))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
399 (or (funcall lisp-indent-function indent-point state)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
400 normal-indent))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
401 (t
214
a1430f8459e5 *** empty log message ***
Brian Preble <rassilon@gnu.org>
parents: 213
diff changeset
402 normal-indent))))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
403
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
404 (defun lisp-indent-function (indent-point state)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
405 (let ((normal-indent (current-column)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
406 (goto-char (1+ (elt state 1)))
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
407 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
408 (if (and (elt state 2)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
409 (not (looking-at "\\sw\\|\\s_")))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
410 ;; car of form doesn't seem to be a a symbol
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
411 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
412 (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
413 calculate-lisp-indent-last-sexp))
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
414 (progn (goto-char calculate-lisp-indent-last-sexp)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
415 (beginning-of-line)
9423
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
416 (parse-partial-sexp (point)
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
417 calculate-lisp-indent-last-sexp 0 t)))
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
418 ;; Indent under the list or under the first sexp on the same
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
419 ;; line as calculate-lisp-indent-last-sexp. Note that first
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
420 ;; thing on that line has to be complete sexp since we are
9076245a9fed (calculate-lisp-indent): Local var
Richard M. Stallman <rms@gnu.org>
parents: 9415
diff changeset
421 ;; inside the innermost containing sexp.
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
422 (backward-prefix-chars)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
423 (current-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
424 (let ((function (buffer-substring (point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
425 (progn (forward-sexp 1) (point))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
426 method)
3638
45169f86d3a4 (lisp-indent-function): Look for either
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
427 (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
428 (get (intern-soft function) 'lisp-indent-hook)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
429 (cond ((or (eq method 'defun)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
430 (and (null method)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
431 (> (length function) 3)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
432 (string-match "\\`def" function)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
433 (lisp-indent-defform state indent-point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
434 ((integerp method)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
435 (lisp-indent-specform method state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
436 indent-point normal-indent))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
437 (method
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
438 (funcall method state indent-point)))))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
439
2933
420dfaaacfc5 (lisp-body-indent): Add doc.
Richard M. Stallman <rms@gnu.org>
parents: 2450
diff changeset
440 (defconst lisp-body-indent 2
420dfaaacfc5 (lisp-body-indent): Add doc.
Richard M. Stallman <rms@gnu.org>
parents: 2450
diff changeset
441 "Number of columns to indent the second line of a `(def...)' form.")
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
442
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
443 (defun lisp-indent-specform (count state indent-point normal-indent)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
444 (let ((containing-form-start (elt state 1))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
445 (i count)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
446 body-indent containing-form-column)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
447 ;; Move to the start of containing form, calculate indentation
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
448 ;; to use for non-distinguished forms (> count), and move past the
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
449 ;; function symbol. lisp-indent-function guarantees that there is at
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
450 ;; least one word or symbol character following open paren of containing
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
451 ;; form.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
452 (goto-char containing-form-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
453 (setq containing-form-column (current-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
454 (setq body-indent (+ lisp-body-indent containing-form-column))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
455 (forward-char 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
456 (forward-sexp 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
457 ;; Now find the start of the last form.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
458 (parse-partial-sexp (point) indent-point 1 t)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
459 (while (and (< (point) indent-point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
460 (condition-case ()
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
461 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
462 (setq count (1- count))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
463 (forward-sexp 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
464 (parse-partial-sexp (point) indent-point 1 t))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
465 (error nil))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
466 ;; Point is sitting on first character of last (or count) sexp.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
467 (if (> count 0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
468 ;; A distinguished form. If it is the first or second form use double
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
469 ;; lisp-body-indent, else normal indent. With lisp-body-indent bound
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
470 ;; 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
471 ;; the older code, but it makes unwind-protect, condition-case,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
472 ;; with-output-to-temp-buffer, et. al. much more tasteful. The older,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
473 ;; less hacked, behavior can be obtained by replacing below with
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
474 ;; (list normal-indent containing-form-start).
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
475 (if (<= (- i count) 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
476 (list (+ containing-form-column (* 2 lisp-body-indent))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
477 containing-form-start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
478 (list normal-indent containing-form-start))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
479 ;; A non-distinguished form. Use body-indent if there are no
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
480 ;; distinguished forms and this is the first undistinguished form,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
481 ;; or if this is the first undistinguished form and the preceding
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
482 ;; distinguished form has indentation at least as great as body-indent.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
483 (if (or (and (= i 0) (= count 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
484 (and (= count 0) (<= body-indent normal-indent)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
485 body-indent
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
486 normal-indent))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
487
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
488 (defun lisp-indent-defform (state indent-point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
489 (goto-char (car (cdr state)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
490 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
491 (if (> (point) (car (cdr (cdr state))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
492 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
493 (goto-char (car (cdr state)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
494 (+ lisp-body-indent (current-column)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
495
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
496
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
497 ;; (put 'progn 'lisp-indent-function 0), say, causes progn to be indented
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
498 ;; like defun if the first form is placed on the next line, otherwise
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
499 ;; 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
500
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
501 (put 'lambda 'lisp-indent-function 'defun)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
502 (put 'autoload 'lisp-indent-function 'defun)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
503 (put 'progn 'lisp-indent-function 0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
504 (put 'prog1 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
505 (put 'prog2 'lisp-indent-function 2)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
506 (put 'save-excursion 'lisp-indent-function 0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
507 (put 'save-window-excursion 'lisp-indent-function 0)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
508 (put 'save-restriction 'lisp-indent-function 0)
1163
c205d560cc22 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 878
diff changeset
509 (put 'save-match-data 'lisp-indent-function 0)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
510 (put 'let 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
511 (put 'let* 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
512 (put 'while 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
513 (put 'if 'lisp-indent-function 2)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
514 (put 'catch 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
515 (put 'condition-case 'lisp-indent-function 2)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
516 (put 'unwind-protect 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
517 (put 'with-output-to-temp-buffer 'lisp-indent-function 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
518
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
519 (defun indent-sexp (&optional endpos)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
520 "Indent each line of the list starting just after point.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
521 If optional arg ENDPOS is given, indent each line, stopping when
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
522 ENDPOS is encountered."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
523 (interactive)
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
524 (let ((indent-stack (list nil))
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
525 (next-depth 0)
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
526 (starting-point (point))
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
527 (last-point (point))
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
528 last-depth bol outer-loop-done inner-loop-done state this-indent)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
529 ;; Get error now if we don't have a complete sexp after point.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
530 (save-excursion (forward-sexp 1))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
531 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
532 (setq outer-loop-done nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
533 (while (if endpos (< (point) endpos)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
534 (not outer-loop-done))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
535 (setq last-depth next-depth
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
536 inner-loop-done nil)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
537 ;; Parse this line so we can learn the state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
538 ;; to indent the next line.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
539 ;; This inner loop goes through only once
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
540 ;; unless a line ends inside a string.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
541 (while (and (not inner-loop-done)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
542 (not (setq outer-loop-done (eobp))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
543 (setq state (parse-partial-sexp (point) (progn (end-of-line) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
544 nil nil state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
545 (setq next-depth (car state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
546 ;; If the line contains a comment other than the sort
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
547 ;; that is indented like code,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
548 ;; indent it now with indent-for-comment.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
549 ;; Comments indented like code are right already.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
550 ;; In any case clear the in-comment flag in the state
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
551 ;; because parse-partial-sexp never sees the newlines.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
552 (if (car (nthcdr 4 state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
553 (progn (indent-for-comment)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
554 (end-of-line)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
555 (setcar (nthcdr 4 state) nil)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
556 ;; If this line ends inside a string,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
557 ;; go straight to next line, remaining within the inner loop,
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
558 ;; and turn off the \-flag.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
559 (if (car (nthcdr 3 state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
560 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
561 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
562 (setcar (nthcdr 5 state) nil))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
563 (setq inner-loop-done t)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
564 (and endpos
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
565 (<= next-depth 0)
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
566 (progn
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
567 (setq indent-stack (append indent-stack
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
568 (make-list (- next-depth) nil))
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
569 last-depth (- last-depth next-depth)
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
570 next-depth 0)))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
571 (or outer-loop-done
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
572 (setq outer-loop-done (<= next-depth 0)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
573 (if outer-loop-done
3241
6c9b5f6dca70 (indent-sexp): Even if outer-loop-done is t, still move down one line.
Richard M. Stallman <rms@gnu.org>
parents: 2933
diff changeset
574 (forward-line 1)
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
575 (while (> last-depth next-depth)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
576 (setq indent-stack (cdr indent-stack)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
577 last-depth (1- last-depth)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
578 (while (< last-depth next-depth)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
579 (setq indent-stack (cons nil indent-stack)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
580 last-depth (1+ last-depth)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
581 ;; Now go to the next line and indent it according
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
582 ;; to what we learned from parsing the previous one.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
583 (forward-line 1)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
584 (setq bol (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
585 (skip-chars-forward " \t")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
586 ;; But not if the line is blank, or just a comment
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
587 ;; (except for double-semi comments; indent them as usual).
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
588 (if (or (eobp) (looking-at "\\s<\\|\n"))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
589 nil
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
590 (if (and (car indent-stack)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
591 (>= (car indent-stack) 0))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
592 (setq this-indent (car indent-stack))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
593 (let ((val (calculate-lisp-indent
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
594 (if (car indent-stack) (- (car indent-stack))
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 677
diff changeset
595 starting-point))))
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
596 (if (integerp val)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
597 (setcar indent-stack
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
598 (setq this-indent val))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
599 (setcar indent-stack (- (car (cdr val))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
600 (setq this-indent (car val)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
601 (if (/= (current-column) this-indent)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
602 (progn (delete-region bol (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
603 (indent-to this-indent)))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
604 (or outer-loop-done
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
605 (setq outer-loop-done (= (point) last-point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
606 (setq last-point (point)))))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
607
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
608 ;; Indent every line whose first char is between START and END inclusive.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
609 (defun lisp-indent-region (start end)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
610 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
611 (goto-char start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
612 (and (bolp) (not (eolp))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
613 (lisp-indent-line))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
614 (let ((endmark (copy-marker end)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
615 (indent-sexp endmark)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
616 (set-marker endmark nil))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
617
1865
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
618 ;;;; Lisp paragraph filling commands.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
619
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
620 (defun lisp-fill-paragraph (&optional justify)
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
621 "Like \\[fill-paragraph], but handle Emacs Lisp comments.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
622 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
623 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
624 and initial semicolons."
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
625 (interactive "P")
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
626 (let (
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
627 ;; Non-nil if the current line contains a comment.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
628 has-comment
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
629
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
630 ;; If has-comment, the appropriate fill-prefix for the comment.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
631 comment-fill-prefix
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
632 )
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
633
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
634 ;; Figure out what kind of comment we are looking at.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
635 (save-excursion
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
636 (beginning-of-line)
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
637 (cond
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
638
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
639 ;; A line with nothing but a comment on it?
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
640 ((looking-at "[ \t]*;[; \t]*")
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
641 (setq has-comment t
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
642 comment-fill-prefix (buffer-substring (match-beginning 0)
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
643 (match-end 0))))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
644
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
645 ;; A line with some code, followed by a comment? Remember that the
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
646 ;; semi which starts the comment shouldn't be part of a string or
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
647 ;; character.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
648 ((progn
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
649 (while (not (looking-at ";\\|$"))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
650 (skip-chars-forward "^;\n\"\\\\?")
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
651 (cond
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
652 ((eq (char-after (point)) ?\\) (forward-char 2))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
653 ((memq (char-after (point)) '(?\" ??)) (forward-sexp 1))))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
654 (looking-at ";+[\t ]*"))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
655 (setq has-comment t)
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
656 (setq comment-fill-prefix
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
657 (concat (make-string (current-column) ? )
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
658 (buffer-substring (match-beginning 0) (match-end 0)))))))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
659
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
660 (if (not has-comment)
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
661 (fill-paragraph justify)
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
662
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
663 ;; Narrow to include only the comment, and then fill the region.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
664 (save-restriction
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
665 (narrow-to-region
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
666 ;; Find the first line we should include in the region to fill.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
667 (save-excursion
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
668 (while (and (zerop (forward-line -1))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
669 (looking-at "^[ \t]*;")))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
670 ;; We may have gone to far. Go forward again.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
671 (or (looking-at "^[ \t]*;")
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
672 (forward-line 1))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
673 (point))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
674 ;; Find the beginning of the first line past the region to fill.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
675 (save-excursion
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
676 (while (progn (forward-line 1)
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
677 (looking-at "^[ \t]*;")))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
678 (point)))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
679
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
680 ;; Lines with only semicolons on them can be paragraph boundaries.
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
681 (let ((paragraph-start (concat paragraph-start "\\|^[ \t;]*$"))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
682 (paragraph-separate (concat paragraph-start "\\|^[ \t;]*$"))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
683 (fill-prefix comment-fill-prefix))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
684 (fill-paragraph justify))))))
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
685
05be3e0c082f * lisp-mode.el (lisp-fill-paragraph): New function.
Jim Blandy <jimb@redhat.com>
parents: 1163
diff changeset
686
213
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
687 (defun indent-code-rigidly (start end arg &optional nochange-regexp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
688 "Indent all lines of code, starting in the region, sideways by ARG columns.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
689 Does not affect lines starting inside comments or strings, assuming that
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
690 the start of the region is not inside them.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
691
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
692 Called from a program, takes args START, END, COLUMNS and NOCHANGE-REGEXP.
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
693 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
694 means don't indent that line."
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
695 (interactive "r\np")
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
696 (let (state)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
697 (save-excursion
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
698 (goto-char end)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
699 (setq end (point-marker))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
700 (goto-char start)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
701 (or (bolp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
702 (setq state (parse-partial-sexp (point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
703 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
704 (forward-line 1) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
705 nil nil state)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
706 (while (< (point) end)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
707 (or (car (nthcdr 3 state))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
708 (and nochange-regexp
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
709 (looking-at nochange-regexp))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
710 ;; If line does not start in string, indent it
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
711 (let ((indent (current-indentation)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
712 (delete-region (point) (progn (skip-chars-forward " \t") (point)))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
713 (or (eolp)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
714 (indent-to (max 0 (+ indent arg)) 0))))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
715 (setq state (parse-partial-sexp (point)
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
716 (progn
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
717 (forward-line 1) (point))
9fa9f6071bc1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
718 nil nil state))))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 422
diff changeset
719
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 422
diff changeset
720 (provide 'lisp-mode)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 422
diff changeset
721
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 584
diff changeset
722 ;;; lisp-mode.el ends here