Mercurial > emacs
annotate lisp/emacs-lisp/lisp.el @ 27934:8c28c1c31e9b
(lisp-mode-syntax-table): Fix syntax of |.
author | Dave Love <fx@gnu.org> |
---|---|
date | Wed, 01 Mar 2000 20:59:07 +0000 |
parents | 59243c413664 |
children | ed528bfe1b9e |
rev | line source |
---|---|
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
215
diff
changeset
|
1 ;;; lisp.el --- Lisp editing commands for Emacs |
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
215
diff
changeset
|
2 |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
3 ;; Copyright (C) 1985, 1986, 1994, 2000 Free Software Foundation, Inc. |
845 | 4 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
5 ;; Maintainer: FSF |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
6 ;; Keywords: lisp, languages |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
7 |
84 | 8 ;; This file is part of GNU Emacs. |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
84 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
23 ;; Boston, MA 02111-1307, USA. | |
84 | 24 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
25 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
26 |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
2823
diff
changeset
|
27 ;; Lisp editing commands to go with Lisp major mode. |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
28 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
29 ;;; Code: |
84 | 30 |
6369 | 31 ;; Note that this variable is used by non-lisp modes too. |
17665 | 32 (defcustom defun-prompt-regexp nil |
6369 | 33 "*Non-nil => regexp to ignore, before the character that starts a defun. |
34 This is only necessary if the opening paren or brace is not in column 0. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
35 See function `beginning-of-defun'." |
19831
a517c846d04e
(defun-prompt-regexp): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19781
diff
changeset
|
36 :type '(choice (const nil) |
a517c846d04e
(defun-prompt-regexp): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19781
diff
changeset
|
37 regexp) |
17665 | 38 :group 'lisp) |
6973
7aa70fb3afa8
(defun-prompt-regexp): Make this variable buffer-local.
Karl Heuer <kwzh@gnu.org>
parents:
6420
diff
changeset
|
39 (make-variable-buffer-local 'defun-prompt-regexp) |
84 | 40 |
17665 | 41 (defcustom parens-require-spaces t |
42 "Non-nil => `insert-parentheses' should insert whitespace as needed." | |
43 :type 'boolean | |
44 :group 'lisp) | |
3733
c1c105ffdd0c
(parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
45 |
84 | 46 (defun forward-sexp (&optional arg) |
47 "Move forward across one balanced expression (sexp). | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
48 With ARG, do it that many times. Negative arg -N means |
215 | 49 move backward across N balanced expressions." |
84 | 50 (interactive "p") |
51 (or arg (setq arg 1)) | |
52 (goto-char (or (scan-sexps (point) arg) (buffer-end arg))) | |
53 (if (< arg 0) (backward-prefix-chars))) | |
54 | |
55 (defun backward-sexp (&optional arg) | |
56 "Move backward across one balanced expression (sexp). | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
57 With ARG, do it that many times. Negative arg -N means |
215 | 58 move forward across N balanced expressions." |
84 | 59 (interactive "p") |
60 (or arg (setq arg 1)) | |
61 (forward-sexp (- arg))) | |
62 | |
63 (defun mark-sexp (arg) | |
64 "Set mark ARG sexps from point. | |
215 | 65 The place mark goes is the same place \\[forward-sexp] would |
66 move to with the same argument." | |
84 | 67 (interactive "p") |
68 (push-mark | |
69 (save-excursion | |
70 (forward-sexp arg) | |
2823
8ab0e280fbf0
(mark-sexp, mark-defun): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
71 (point)) |
8ab0e280fbf0
(mark-sexp, mark-defun): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
72 nil t)) |
84 | 73 |
74 (defun forward-list (&optional arg) | |
75 "Move forward across one balanced group of parentheses. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
76 With ARG, do it that many times. |
84 | 77 Negative arg -N means move backward across N groups of parentheses." |
78 (interactive "p") | |
79 (or arg (setq arg 1)) | |
80 (goto-char (or (scan-lists (point) arg 0) (buffer-end arg)))) | |
81 | |
82 (defun backward-list (&optional arg) | |
83 "Move backward across one balanced group of parentheses. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
84 With ARG, do it that many times. |
84 | 85 Negative arg -N means move forward across N groups of parentheses." |
86 (interactive "p") | |
87 (or arg (setq arg 1)) | |
88 (forward-list (- arg))) | |
89 | |
90 (defun down-list (arg) | |
91 "Move forward down one level of parentheses. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
92 With ARG, do this that many times. |
84 | 93 A negative argument means move backward but still go down a level. |
94 In Lisp programs, an argument is required." | |
95 (interactive "p") | |
96 (let ((inc (if (> arg 0) 1 -1))) | |
97 (while (/= arg 0) | |
98 (goto-char (or (scan-lists (point) inc -1) (buffer-end arg))) | |
99 (setq arg (- arg inc))))) | |
100 | |
101 (defun backward-up-list (arg) | |
102 "Move backward out of one level of parentheses. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
103 With ARG, do this that many times. |
84 | 104 A negative argument means move forward but still to a less deep spot. |
105 In Lisp programs, an argument is required." | |
106 (interactive "p") | |
107 (up-list (- arg))) | |
108 | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
109 (defun up-list (arg) |
84 | 110 "Move forward out of one level of parentheses. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
111 With ARG, do this that many times. |
84 | 112 A negative argument means move backward but still to a less deep spot. |
113 In Lisp programs, an argument is required." | |
114 (interactive "p") | |
115 (let ((inc (if (> arg 0) 1 -1))) | |
116 (while (/= arg 0) | |
117 (goto-char (or (scan-lists (point) inc 1) (buffer-end arg))) | |
118 (setq arg (- arg inc))))) | |
119 | |
120 (defun kill-sexp (arg) | |
121 "Kill the sexp (balanced expression) following the cursor. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
122 With ARG, kill that many sexps after the cursor. |
84 | 123 Negative arg -N means kill N sexps before the cursor." |
124 (interactive "p") | |
125 (let ((opoint (point))) | |
126 (forward-sexp arg) | |
127 (kill-region opoint (point)))) | |
128 | |
129 (defun backward-kill-sexp (arg) | |
130 "Kill the sexp (balanced expression) preceding the cursor. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
131 With ARG, kill that many sexps before the cursor. |
84 | 132 Negative arg -N means kill N sexps after the cursor." |
133 (interactive "p") | |
134 (kill-sexp (- arg))) | |
135 | |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
136 (defvar beginning-of-defun-function nil |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
137 "If non-nil, function for `beginning-of-defun-raw' to call. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
138 This is used to find the beginning of the defun instead of using the |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
139 normal recipe (see `beginning-of-defun'). Major modes can define this |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
140 if defining `defun-prompt-regexp' is not sufficient to handle the mode's |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
141 needs. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
142 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
143 The function should go to the line on which the current defun starts, |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
144 and return non-nil, or should return nil if it can't find the beginning.") |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
145 |
84 | 146 (defun beginning-of-defun (&optional arg) |
147 "Move backward to the beginning of a defun. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
148 With ARG, do it that many times. Negative arg -N |
84 | 149 means move forward to Nth following beginning of defun. |
150 Returns t unless search stops due to beginning or end of buffer. | |
151 | |
152 Normally a defun starts when there is an char with open-parenthesis | |
153 syntax at the beginning of a line. If `defun-prompt-regexp' is | |
154 non-nil, then a string which matches that regexp may precede the | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
155 open-parenthesis, and point ends up at the beginning of the line. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
156 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
157 If variable `beginning-of-defun-function' is non-nil, its value |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
158 is called as a function to find the defun's beginning." |
6397
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
159 (interactive "p") |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
160 (and (beginning-of-defun-raw arg) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
161 (progn (beginning-of-line) t))) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
162 |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
163 (defun beginning-of-defun-raw (&optional arg) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
164 "Move point to the character that starts a defun. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
165 This is identical to function `beginning-of-defun', except that point |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
166 does not move to the beginning of the line when `defun-prompt-regexp' |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
167 is non-nil. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
168 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
169 If variable `beginning-of-defun-function' is non-nil, its value |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
170 is called as a function to find the defun's beginning." |
84 | 171 (interactive "p") |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
172 (if beginning-of-defun-function |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
173 (funcall beginning-of-defun-function) |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
174 (and arg (< arg 0) (not (eobp)) (forward-char 1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
175 (and (re-search-backward (if defun-prompt-regexp |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
176 (concat "^\\s(\\|" |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
177 "\\(" defun-prompt-regexp "\\)\\s(") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
178 "^\\s(") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
179 nil 'move (or arg 1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
180 (progn (goto-char (1- (match-end 0)))) t))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
181 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
182 (defvar end-of-defun-function nil |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
183 "If non-nil, function for function `end-of-defun' to call. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
184 This is used to find the end of the defun instead of using the normal |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
185 recipe (see `end-of-defun'). Major modes can define this if the |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
186 normal method is not appropriate.") |
84 | 187 |
188 (defun buffer-end (arg) | |
189 (if (> arg 0) (point-max) (point-min))) | |
190 | |
191 (defun end-of-defun (&optional arg) | |
192 "Move forward to next end of defun. With argument, do it that many times. | |
193 Negative argument -N means move back to Nth preceding end of defun. | |
194 | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
195 An end of a defun occurs right after the close-parenthesis that |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
196 matches the open-parenthesis that starts a defun; see function |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
197 `beginning-of-defun'. |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
198 |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
199 If variable `end-of-defun-function' is non-nil, its value |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
200 is called as a function to find the defun's end." |
84 | 201 (interactive "p") |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
202 (if end-of-defun-function |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
203 (funcall end-of-defun-function) |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
204 (if (or (null arg) (= arg 0)) (setq arg 1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
205 (let ((first t)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
206 (while (and (> arg 0) (< (point) (point-max))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
207 (let ((pos (point)) npos) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
208 (while (progn |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
209 (if (and first |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
210 (progn |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
211 (end-of-line 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
212 (beginning-of-defun-raw 1))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
213 nil |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
214 (or (bobp) (forward-char -1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
215 (beginning-of-defun-raw -1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
216 (setq first nil) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
217 (forward-list 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
218 (skip-chars-forward " \t") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
219 (if (looking-at "\\s<\\|\n") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
220 (forward-line 1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
221 (<= (point) pos)))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
222 (setq arg (1- arg))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
223 (while (< arg 0) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
224 (let ((pos (point))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
225 (beginning-of-defun-raw 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
226 (forward-sexp 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
227 (forward-line 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
228 (if (>= (point) pos) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
229 (if (beginning-of-defun-raw 2) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
230 (progn |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
231 (forward-list 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
232 (skip-chars-forward " \t") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
233 (if (looking-at "\\s<\\|\n") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
234 (forward-line 1))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
235 (goto-char (point-min))))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
236 (setq arg (1+ arg)))))) |
84 | 237 |
238 (defun mark-defun () | |
239 "Put mark at end of this defun, point at beginning. | |
240 The defun marked is the one that contains point or follows point." | |
241 (interactive) | |
242 (push-mark (point)) | |
243 (end-of-defun) | |
2823
8ab0e280fbf0
(mark-sexp, mark-defun): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
244 (push-mark (point) nil t) |
84 | 245 (beginning-of-defun) |
246 (re-search-backward "^\n" (- (point) 1) t)) | |
247 | |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
248 (defun narrow-to-defun (&optional arg) |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
249 "Make text outside current defun invisible. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
250 The defun visible is the one that contains point or follows point. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
251 Optional ARG is ignored." |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
252 (interactive) |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
253 (save-excursion |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
254 (widen) |
16410
454a13718b1f
(narrow-to-defun): Narrow to the same defun that `mark-defun' would make
Erik Naggum <erik@naggum.no>
parents:
15971
diff
changeset
|
255 (end-of-defun) |
454a13718b1f
(narrow-to-defun): Narrow to the same defun that `mark-defun' would make
Erik Naggum <erik@naggum.no>
parents:
15971
diff
changeset
|
256 (let ((end (point))) |
454a13718b1f
(narrow-to-defun): Narrow to the same defun that `mark-defun' would make
Erik Naggum <erik@naggum.no>
parents:
15971
diff
changeset
|
257 (beginning-of-defun) |
454a13718b1f
(narrow-to-defun): Narrow to the same defun that `mark-defun' would make
Erik Naggum <erik@naggum.no>
parents:
15971
diff
changeset
|
258 (narrow-to-region (point) end)))) |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
259 |
84 | 260 (defun insert-parentheses (arg) |
16410
454a13718b1f
(narrow-to-defun): Narrow to the same defun that `mark-defun' would make
Erik Naggum <erik@naggum.no>
parents:
15971
diff
changeset
|
261 "Enclose following ARG sexps in parentheses. Leave point after open-paren. |
454a13718b1f
(narrow-to-defun): Narrow to the same defun that `mark-defun' would make
Erik Naggum <erik@naggum.no>
parents:
15971
diff
changeset
|
262 A negative ARG encloses the preceding ARG sexps instead. |
3733
c1c105ffdd0c
(parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
263 No argument is equivalent to zero: just insert `()' and leave point between. |
5838 | 264 If `parens-require-spaces' is non-nil, this command also inserts a space |
265 before and after, depending on the surrounding characters." | |
84 | 266 (interactive "P") |
133
2f5b3f50773d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
119
diff
changeset
|
267 (if arg (setq arg (prefix-numeric-value arg)) |
2f5b3f50773d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
119
diff
changeset
|
268 (setq arg 0)) |
16410
454a13718b1f
(narrow-to-defun): Narrow to the same defun that `mark-defun' would make
Erik Naggum <erik@naggum.no>
parents:
15971
diff
changeset
|
269 (cond ((> arg 0) (skip-chars-forward " \t")) |
454a13718b1f
(narrow-to-defun): Narrow to the same defun that `mark-defun' would make
Erik Naggum <erik@naggum.no>
parents:
15971
diff
changeset
|
270 ((< arg 0) (forward-sexp arg) (setq arg (- arg)))) |
3758
e212a0863773
(parens-require-spaces): Var renamed and sense changed.
Richard M. Stallman <rms@gnu.org>
parents:
3733
diff
changeset
|
271 (and parens-require-spaces |
8996
06a5ceb0fb21
(insert-parentheses): Don't insert spaces at beginning and end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
8205
diff
changeset
|
272 (not (bobp)) |
3733
c1c105ffdd0c
(parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
273 (memq (char-syntax (preceding-char)) '(?w ?_ ?\) )) |
84 | 274 (insert " ")) |
275 (insert ?\() | |
276 (save-excursion | |
133
2f5b3f50773d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
119
diff
changeset
|
277 (or (eq arg 0) (forward-sexp arg)) |
84 | 278 (insert ?\)) |
3758
e212a0863773
(parens-require-spaces): Var renamed and sense changed.
Richard M. Stallman <rms@gnu.org>
parents:
3733
diff
changeset
|
279 (and parens-require-spaces |
8996
06a5ceb0fb21
(insert-parentheses): Don't insert spaces at beginning and end of buffer.
Richard M. Stallman <rms@gnu.org>
parents:
8205
diff
changeset
|
280 (not (eobp)) |
3733
c1c105ffdd0c
(parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
281 (memq (char-syntax (following-char)) '(?w ?_ ?\( )) |
133
2f5b3f50773d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
119
diff
changeset
|
282 (insert " ")))) |
84 | 283 |
284 (defun move-past-close-and-reindent () | |
285 "Move past next `)', delete indentation before it, then indent after it." | |
286 (interactive) | |
287 (up-list 1) | |
288 (forward-char -1) | |
289 (while (save-excursion ; this is my contribution | |
290 (let ((before-paren (point))) | |
291 (back-to-indentation) | |
19781
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
292 (and (= (point) before-paren) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
293 (progn |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
294 ;; Move to end of previous line. |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
295 (beginning-of-line) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
296 (forward-char -1) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
297 ;; Verify it doesn't end within a string or comment. |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
298 (let ((end (point)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
299 state) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
300 (beginning-of-line) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
301 ;; Get state at start of line. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
302 (setq state (list 0 nil nil |
19781
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
303 (null (calculate-lisp-indent)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
304 nil nil nil nil |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
305 nil)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
306 ;; Parse state across the line to get state at end. |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
307 (setq state (parse-partial-sexp (point) end nil nil |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
308 state)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
309 ;; Check not in string or comment. |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
310 (and (not (elt state 3)) (not (elt state 4)))))))) |
84 | 311 (delete-indentation)) |
312 (forward-char 1) | |
313 (newline-and-indent)) | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
314 |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
315 (defun check-parens () ; lame name? |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
316 "Check for unbalanced parentheses in the current buffer. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
317 More accurately, check the narrowed part of the buffer for unbalanced |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
318 expressions (\"sexps\") in general. This is done according to the |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
319 current syntax table and will find unbalanced brackets or quotes as |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
320 appropriate. (See Info node `(emacs)Lists and Sexps'.) If imbalance |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
321 is found, an error is signalled and point is left at the first |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
322 unbalanced character." |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
323 (interactive) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
324 (condition-case data |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
325 ;; Buffer can't have more than (point-max) sexps. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
326 (scan-sexps (point-min) (point-max)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
327 (scan-error (goto-char (nth 2 data)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
328 ;; Could print (nth 1 data), which is either |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
329 ;; "Containing expression ends prematurely" or |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
330 ;; "Unbalanced parentheses", but those may not be so |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
331 ;; accurate/helpful, e.g. quotes may actually be |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
332 ;; mismatched. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
333 (error "Unmatched bracket or quote")) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
334 (error (cond ((eq 'scan-error (car data)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
335 (goto-char (nth 2 data)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
336 (error "Unmatched bracket or quote")) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
337 (t (signal (car data) (cdr data))))))) |
84 | 338 |
339 (defun lisp-complete-symbol () | |
6004
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
340 "Perform completion on Lisp symbol preceding point. |
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
341 Compare that symbol against the known Lisp symbols. |
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
342 |
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
343 The context determines which symbols are considered. |
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
344 If the symbol starts just after an open-parenthesis, only symbols |
215 | 345 with function definitions are considered. Otherwise, all symbols with |
346 function definitions, values or properties are considered." | |
84 | 347 (interactive) |
348 (let* ((end (point)) | |
349 (buffer-syntax (syntax-table)) | |
119 | 350 (beg (unwind-protect |
351 (save-excursion | |
352 (set-syntax-table emacs-lisp-mode-syntax-table) | |
353 (backward-sexp 1) | |
354 (while (= (char-syntax (following-char)) ?\') | |
355 (forward-char 1)) | |
356 (point)) | |
84 | 357 (set-syntax-table buffer-syntax))) |
358 (pattern (buffer-substring beg end)) | |
359 (predicate | |
360 (if (eq (char-after (1- beg)) ?\() | |
361 'fboundp | |
362 (function (lambda (sym) | |
363 (or (boundp sym) (fboundp sym) | |
364 (symbol-plist sym)))))) | |
365 (completion (try-completion pattern obarray predicate))) | |
366 (cond ((eq completion t)) | |
367 ((null completion) | |
368 (message "Can't find completion for \"%s\"" pattern) | |
369 (ding)) | |
370 ((not (string= pattern completion)) | |
371 (delete-region beg end) | |
372 (insert completion)) | |
373 (t | |
374 (message "Making completion list...") | |
23451
4b8c40cf1931
(lisp-complete-symbol): Don't bind completion-fixup-function.
Richard M. Stallman <rms@gnu.org>
parents:
19831
diff
changeset
|
375 (let ((list (all-completions pattern obarray predicate))) |
16494
3f971c7163fb
(lisp-complete-symbol): Sort the list.
Richard M. Stallman <rms@gnu.org>
parents:
16410
diff
changeset
|
376 (setq list (sort list 'string<)) |
84 | 377 (or (eq predicate 'fboundp) |
378 (let (new) | |
379 (while list | |
380 (setq new (cons (if (fboundp (intern (car list))) | |
381 (list (car list) " <f>") | |
382 (car list)) | |
383 new)) | |
384 (setq list (cdr list))) | |
385 (setq list (nreverse new)))) | |
7845
6f6b61216b0b
(lisp-complete-symbol): Likewise.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
386 (with-output-to-temp-buffer "*Completions*" |
84 | 387 (display-completion-list list))) |
388 (message "Making completion list...%s" "done"))))) | |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
215
diff
changeset
|
389 |
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
215
diff
changeset
|
390 ;;; lisp.el ends here |