annotate lisp/emacs-lisp/lisp.el @ 8050:bef2c11470f8

(show-paren-command-hook): Use matching-paren. Call overlay-put once for each overlay. Wait .1 sec to see if any input comes in.
author Richard M. Stallman <rms@gnu.org>
date Sat, 25 Jun 1994 01:20:11 +0000
parents 6f6b61216b0b
children f9e57f3ecc9d
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: 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
7300
cc7cd83ccf3f Update copyright.
Karl Heuer <kwzh@gnu.org>
parents: 6973
diff changeset
3 ;; Copyright (C) 1985, 1986, 1994 Free Software Foundation, Inc.
845
213978acbc1e entered into RCS
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: 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
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
9
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
225a5c57fe64 Initial revision
root <root>
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: 659
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
13 ;; any later version.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
14
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
18 ;; GNU General Public License for more details.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
19
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
22 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
23
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2247
diff changeset
24 ;;; Commentary:
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2247
diff changeset
25
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 2823
diff changeset
26 ;; 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
27
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 659
diff changeset
28 ;;; Code:
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
29
6369
881009b034b3 (defun-prompt-regexp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6004
diff changeset
30 ;; Note that this variable is used by non-lisp modes too.
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
31 (defvar defun-prompt-regexp nil
6369
881009b034b3 (defun-prompt-regexp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6004
diff changeset
32 "*Non-nil => regexp to ignore, before the character that starts a defun.
881009b034b3 (defun-prompt-regexp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6004
diff changeset
33 This is only necessary if the opening paren or brace is not in column 0.
881009b034b3 (defun-prompt-regexp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6004
diff changeset
34 See `beginning-of-defun'.")
6973
7aa70fb3afa8 (defun-prompt-regexp): Make this variable buffer-local.
Karl Heuer <kwzh@gnu.org>
parents: 6420
diff changeset
35 (make-variable-buffer-local 'defun-prompt-regexp)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
36
3758
e212a0863773 (parens-require-spaces): Var renamed and sense changed.
Richard M. Stallman <rms@gnu.org>
parents: 3733
diff changeset
37 (defvar parens-require-spaces t
e212a0863773 (parens-require-spaces): Var renamed and sense changed.
Richard M. Stallman <rms@gnu.org>
parents: 3733
diff changeset
38 "Non-nil => `insert-parentheses' should insert whitespace as needed.")
3733
c1c105ffdd0c (parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
39
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
40 (defun forward-sexp (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
41 "Move forward across one balanced expression (sexp).
215
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
42 With argument, do it that many times. Negative arg -N means
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
43 move backward across N balanced expressions."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
44 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
45 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
46 (goto-char (or (scan-sexps (point) arg) (buffer-end arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
47 (if (< arg 0) (backward-prefix-chars)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
48
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
49 (defun backward-sexp (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
50 "Move backward across one balanced expression (sexp).
215
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
51 With argument, do it that many times. Negative arg -N means
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
52 move forward across N balanced expressions."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
53 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
54 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
55 (forward-sexp (- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
56
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
57 (defun mark-sexp (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
58 "Set mark ARG sexps from point.
215
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
59 The place mark goes is the same place \\[forward-sexp] would
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
60 move to with the same argument."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
61 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
62 (push-mark
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
63 (save-excursion
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
64 (forward-sexp arg)
2823
8ab0e280fbf0 (mark-sexp, mark-defun): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
65 (point))
8ab0e280fbf0 (mark-sexp, mark-defun): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
66 nil t))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
67
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
68 (defun forward-list (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
69 "Move forward across one balanced group of parentheses.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
70 With argument, do it that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
71 Negative arg -N means move backward across N groups of parentheses."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
72 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
73 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
74 (goto-char (or (scan-lists (point) arg 0) (buffer-end arg))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
75
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
76 (defun backward-list (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
77 "Move backward across one balanced group of parentheses.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
78 With argument, do it that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
79 Negative arg -N means move forward across N groups of parentheses."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
80 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
81 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
82 (forward-list (- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
83
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
84 (defun down-list (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
85 "Move forward down one level of parentheses.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
86 With argument, do this that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
87 A negative argument means move backward but still go down a level.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
88 In Lisp programs, an argument is required."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
89 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
90 (let ((inc (if (> arg 0) 1 -1)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
91 (while (/= arg 0)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
92 (goto-char (or (scan-lists (point) inc -1) (buffer-end arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
93 (setq arg (- arg inc)))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
94
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
95 (defun backward-up-list (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
96 "Move backward out of one level of parentheses.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
97 With argument, do this that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
98 A negative argument means move forward but still to a less deep spot.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
99 In Lisp programs, an argument is required."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
100 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
101 (up-list (- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
102
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
103 (defun up-list (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
104 "Move forward out of one level of parentheses.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
105 With argument, do this that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
106 A negative argument means move backward but still to a less deep spot.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
107 In Lisp programs, an argument is required."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
108 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
109 (let ((inc (if (> arg 0) 1 -1)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
110 (while (/= arg 0)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
111 (goto-char (or (scan-lists (point) inc 1) (buffer-end arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
112 (setq arg (- arg inc)))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
113
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
114 (defun kill-sexp (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
115 "Kill the sexp (balanced expression) following the cursor.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
116 With argument, kill that many sexps after the cursor.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
117 Negative arg -N means kill N sexps before the cursor."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
118 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
119 (let ((opoint (point)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
120 (forward-sexp arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
121 (kill-region opoint (point))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
122
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
123 (defun backward-kill-sexp (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
124 "Kill the sexp (balanced expression) preceding the cursor.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
125 With argument, kill that many sexps before the cursor.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
126 Negative arg -N means kill N sexps after the cursor."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
127 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
128 (kill-sexp (- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
129
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
130 (defun beginning-of-defun (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
131 "Move backward to the beginning of a defun.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
132 With argument, do it that many times. Negative arg -N
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
133 means move forward to Nth following beginning of defun.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
134 Returns t unless search stops due to beginning or end of buffer.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
135
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
136 Normally a defun starts when there is an char with open-parenthesis
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
137 syntax at the beginning of a line. If `defun-prompt-regexp' is
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
138 non-nil, then a string which matches that regexp may precede the
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
139 open-parenthesis, and point ends up at the beginning of the line."
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
140 (interactive "p")
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
141 (and (beginning-of-defun-raw arg)
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
142 (progn (beginning-of-line) t)))
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
143
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
144 (defun beginning-of-defun-raw (&optional arg)
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
145 "Move point to the character that starts a defun.
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
146 This is identical to beginning-of-defun, except that point does not move
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
147 to the beginning of the line when `defun-prompt-regexp' is non-nil."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
148 (interactive "p")
6420
09fadfc6384e (beginning-of-defun-raw): Don't err when called at end of buffer.
Karl Heuer <kwzh@gnu.org>
parents: 6397
diff changeset
149 (and arg (< arg 0) (not (eobp)) (forward-char 1))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
150 (and (re-search-backward (if defun-prompt-regexp
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
151 (concat "^\\s(\\|"
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
152 "\\(" defun-prompt-regexp "\\)\\s(")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
153 "^\\s(")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
154 nil 'move (or arg 1))
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
155 (progn (goto-char (1- (match-end 0)))) t))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
156
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
157 (defun buffer-end (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
158 (if (> arg 0) (point-max) (point-min)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
159
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
160 (defun end-of-defun (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
161 "Move forward to next end of defun. With argument, do it that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
162 Negative argument -N means move back to Nth preceding end of defun.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
163
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
164 An end of a defun occurs right after the close-parenthesis that matches
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
165 the open-parenthesis that starts a defun; see `beginning-of-defun'."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
166 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
167 (if (or (null arg) (= arg 0)) (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
168 (let ((first t))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
169 (while (and (> arg 0) (< (point) (point-max)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
170 (let ((pos (point)) npos)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
171 (while (progn
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
172 (if (and first
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
173 (progn
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
174 (end-of-line 1)
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
175 (beginning-of-defun-raw 1)))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
176 nil
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
177 (or (bobp) (forward-char -1))
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
178 (beginning-of-defun-raw -1))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
179 (setq first nil)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
180 (forward-list 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
181 (skip-chars-forward " \t")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
182 (if (looking-at "\\s<\\|\n")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
183 (forward-line 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
184 (<= (point) pos))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
185 (setq arg (1- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
186 (while (< arg 0)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
187 (let ((pos (point)))
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
188 (beginning-of-defun-raw 1)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
189 (forward-sexp 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
190 (forward-line 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
191 (if (>= (point) pos)
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
192 (if (beginning-of-defun-raw 2)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
193 (progn
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
194 (forward-list 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
195 (skip-chars-forward " \t")
6396
1740ec160ff8 (end-of-defun): Fix check for trailing comment.
Karl Heuer <kwzh@gnu.org>
parents: 6369
diff changeset
196 (if (looking-at "\\s<\\|\n")
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
197 (forward-line 1)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
198 (goto-char (point-min)))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
199 (setq arg (1+ arg)))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
200
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
201 (defun mark-defun ()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
202 "Put mark at end of this defun, point at beginning.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
203 The defun marked is the one that contains point or follows point."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
204 (interactive)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
205 (push-mark (point))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
206 (end-of-defun)
2823
8ab0e280fbf0 (mark-sexp, mark-defun): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
207 (push-mark (point) nil t)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
208 (beginning-of-defun)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
209 (re-search-backward "^\n" (- (point) 1) t))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
210
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
211 (defun insert-parentheses (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
212 "Put parentheses around next ARG sexps. Leave point after open-paren.
3733
c1c105ffdd0c (parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
213 No argument is equivalent to zero: just insert `()' and leave point between.
5838
1f201e9b48ff (insert-parentheses): Doc mod.
Karl Heuer <kwzh@gnu.org>
parents: 3758
diff changeset
214 If `parens-require-spaces' is non-nil, this command also inserts a space
1f201e9b48ff (insert-parentheses): Doc mod.
Karl Heuer <kwzh@gnu.org>
parents: 3758
diff changeset
215 before and after, depending on the surrounding characters."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
216 (interactive "P")
133
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
217 (if arg (setq arg (prefix-numeric-value arg))
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
218 (setq arg 0))
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
219 (or (eq arg 0) (skip-chars-forward " \t"))
3758
e212a0863773 (parens-require-spaces): Var renamed and sense changed.
Richard M. Stallman <rms@gnu.org>
parents: 3733
diff changeset
220 (and parens-require-spaces
3733
c1c105ffdd0c (parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
221 (memq (char-syntax (preceding-char)) '(?w ?_ ?\) ))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
222 (insert " "))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
223 (insert ?\()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
224 (save-excursion
133
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
225 (or (eq arg 0) (forward-sexp arg))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
226 (insert ?\))
3758
e212a0863773 (parens-require-spaces): Var renamed and sense changed.
Richard M. Stallman <rms@gnu.org>
parents: 3733
diff changeset
227 (and parens-require-spaces
3733
c1c105ffdd0c (parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
228 (memq (char-syntax (following-char)) '(?w ?_ ?\( ))
133
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
229 (insert " "))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
230
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
231 (defun move-past-close-and-reindent ()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
232 "Move past next `)', delete indentation before it, then indent after it."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
233 (interactive)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
234 (up-list 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
235 (forward-char -1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
236 (while (save-excursion ; this is my contribution
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
237 (let ((before-paren (point)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
238 (back-to-indentation)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
239 (= (point) before-paren)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
240 (delete-indentation))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
241 (forward-char 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
242 (newline-and-indent))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
243
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
244 (defun lisp-complete-symbol ()
6004
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
245 "Perform completion on Lisp symbol preceding point.
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
246 Compare that symbol against the known Lisp symbols.
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
247
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
248 The context determines which symbols are considered.
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
249 If the symbol starts just after an open-parenthesis, only symbols
215
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
250 with function definitions are considered. Otherwise, all symbols with
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
251 function definitions, values or properties are considered."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
252 (interactive)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
253 (let* ((end (point))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
254 (buffer-syntax (syntax-table))
119
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
255 (beg (unwind-protect
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
256 (save-excursion
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
257 (set-syntax-table emacs-lisp-mode-syntax-table)
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
258 (backward-sexp 1)
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
259 (while (= (char-syntax (following-char)) ?\')
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
260 (forward-char 1))
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
261 (point))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
262 (set-syntax-table buffer-syntax)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
263 (pattern (buffer-substring beg end))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
264 (predicate
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
265 (if (eq (char-after (1- beg)) ?\()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
266 'fboundp
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
267 (function (lambda (sym)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
268 (or (boundp sym) (fboundp sym)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
269 (symbol-plist sym))))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
270 (completion (try-completion pattern obarray predicate)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
271 (cond ((eq completion t))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
272 ((null completion)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
273 (message "Can't find completion for \"%s\"" pattern)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
274 (ding))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
275 ((not (string= pattern completion))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
276 (delete-region beg end)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
277 (insert completion))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
278 (t
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
279 (message "Making completion list...")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
280 (let ((list (all-completions pattern obarray predicate)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
281 (or (eq predicate 'fboundp)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
282 (let (new)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
283 (while list
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
284 (setq new (cons (if (fboundp (intern (car list)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
285 (list (car list) " <f>")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
286 (car list))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
287 new))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
288 (setq list (cdr list)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
289 (setq list (nreverse new))))
7845
6f6b61216b0b (lisp-complete-symbol): Likewise.
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
290 (with-output-to-temp-buffer "*Completions*"
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
291 (display-completion-list list)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
292 (message "Making completion list...%s" "done")))))
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 215
diff changeset
293
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 215
diff changeset
294 ;;; lisp.el ends here