annotate lisp/emacs-lisp/lisp.el @ 41291:b75e56ea3973

(mark-sexp): Mark more if repeated.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 19 Nov 2001 22:06:10 +0000
parents 0d7e64a107e6
children c45e40c77be6
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
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
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
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 8996
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 8996
diff changeset
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 8996
diff changeset
23 ;; Boston, MA 02111-1307, USA.
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
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
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
27 ;; Lisp editing commands to go with Lisp major mode. More-or-less
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
28 ;; applicable in other modes too.
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2247
diff changeset
29
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 659
diff changeset
30 ;;; Code:
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
31
6369
881009b034b3 (defun-prompt-regexp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6004
diff changeset
32 ;; Note that this variable is used by non-lisp modes too.
17665
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
33 (defcustom defun-prompt-regexp nil
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
34 "*If non-nil, a regexp to ignore before the character that starts a defun.
6369
881009b034b3 (defun-prompt-regexp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6004
diff changeset
35 This is only necessary if the opening paren or brace is not in column 0.
32814
0d7e64a107e6 (defun-prompt-regexp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 32456
diff changeset
36 See function `beginning-of-defun'.
0d7e64a107e6 (defun-prompt-regexp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 32456
diff changeset
37
0d7e64a107e6 (defun-prompt-regexp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 32456
diff changeset
38 Setting this variable automatically makes it local to the current buffer."
19831
a517c846d04e (defun-prompt-regexp): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19781
diff changeset
39 :type '(choice (const nil)
a517c846d04e (defun-prompt-regexp): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents: 19781
diff changeset
40 regexp)
17665
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
41 :group 'lisp)
6973
7aa70fb3afa8 (defun-prompt-regexp): Make this variable buffer-local.
Karl Heuer <kwzh@gnu.org>
parents: 6420
diff changeset
42 (make-variable-buffer-local 'defun-prompt-regexp)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
43
17665
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
44 (defcustom parens-require-spaces t
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
45 "Non-nil means `insert-parentheses' should insert whitespace as needed."
17665
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
46 :type 'boolean
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
47 :group 'lisp)
3733
c1c105ffdd0c (parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
48
31982
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
49 (defvar forward-sexp-function nil
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
50 "If non-nil, `forward-sexp' delegates to this function.
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
51 Should take the same arguments and behave similarly to `forward-sexp'.")
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
52
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
53 (defun forward-sexp (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
54 "Move forward across one balanced expression (sexp).
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
55 With ARG, do it that many times. Negative arg -N means
215
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
56 move backward across N balanced expressions."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
57 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
58 (or arg (setq arg 1))
31982
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
59 (if forward-sexp-function
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
60 (funcall forward-sexp-function arg)
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
61 (goto-char (or (scan-sexps (point) arg) (buffer-end arg)))
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
62 (if (< arg 0) (backward-prefix-chars))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
63
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
64 (defun backward-sexp (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
65 "Move backward across one balanced expression (sexp).
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
66 With ARG, do it that many times. Negative arg -N means
215
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
67 move forward across N balanced expressions."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
68 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
69 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
70 (forward-sexp (- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
71
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
72 (defun mark-sexp (&optional arg)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
73 "Set mark ARG sexps from point.
215
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
74 The place mark goes is the same place \\[forward-sexp] would
41291
b75e56ea3973 (mark-sexp): Mark more if repeated.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32814
diff changeset
75 move to with the same argument.
b75e56ea3973 (mark-sexp): Mark more if repeated.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32814
diff changeset
76 If this command is repeated, it marks the next ARG sexps after the ones
b75e56ea3973 (mark-sexp): Mark more if repeated.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32814
diff changeset
77 already marked."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
78 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
79 (push-mark
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
80 (save-excursion
41291
b75e56ea3973 (mark-sexp): Mark more if repeated.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32814
diff changeset
81 (if (and (eq last-command this-command) (mark t))
b75e56ea3973 (mark-sexp): Mark more if repeated.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32814
diff changeset
82 (goto-char (mark)))
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
83 (forward-sexp (or arg 1))
2823
8ab0e280fbf0 (mark-sexp, mark-defun): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
84 (point))
8ab0e280fbf0 (mark-sexp, mark-defun): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
85 nil t))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
86
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
87 (defun forward-list (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
88 "Move forward across one balanced group of parentheses.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
89 With ARG, do it that many times.
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
90 Negative arg -N means move backward across N groups of parentheses."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
91 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
92 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
93 (goto-char (or (scan-lists (point) arg 0) (buffer-end arg))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
94
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
95 (defun backward-list (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
96 "Move backward across one balanced group of parentheses.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
97 With ARG, do it that many times.
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
98 Negative arg -N means move forward across N groups of parentheses."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
99 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
100 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
101 (forward-list (- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
102
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
103 (defun down-list (&optional arg)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
104 "Move forward down one level of parentheses.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
105 With ARG, do this that many times.
32456
ec203cfd2e41 (down-list, backward-up-list, up-list): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 32047
diff changeset
106 A negative argument means move backward but still go down a level."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
107 (interactive "p")
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
108 (or arg (setq arg 1))
84
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
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
114 (defun backward-up-list (&optional arg)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
115 "Move backward out of one level of parentheses.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
116 With ARG, do this that many times.
32456
ec203cfd2e41 (down-list, backward-up-list, up-list): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 32047
diff changeset
117 A negative argument means move forward but still to a less deep spot."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
118 (interactive "p")
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
119 (up-list (- (or arg 1))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
120
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
121 (defun up-list (&optional arg)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
122 "Move forward out of one level of parentheses.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
123 With ARG, do this that many times.
32456
ec203cfd2e41 (down-list, backward-up-list, up-list): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 32047
diff changeset
124 A negative argument means move backward but still to a less deep spot."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
125 (interactive "p")
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
126 (or arg (setq arg 1))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
127 (let ((inc (if (> arg 0) 1 -1)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
128 (while (/= arg 0)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
129 (goto-char (or (scan-lists (point) inc 1) (buffer-end arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
130 (setq arg (- arg inc)))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
131
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
132 (defun kill-sexp (&optional arg)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
133 "Kill the sexp (balanced expression) following the cursor.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
134 With ARG, kill that many sexps after the cursor.
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
135 Negative arg -N means kill N sexps before the cursor."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
136 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
137 (let ((opoint (point)))
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
138 (forward-sexp (or arg 1))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
139 (kill-region opoint (point))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
140
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
141 (defun backward-kill-sexp (&optional arg)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
142 "Kill the sexp (balanced expression) preceding the cursor.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
143 With ARG, kill that many sexps before the cursor.
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
144 Negative arg -N means kill N sexps after the cursor."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
145 (interactive "p")
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
146 (kill-sexp (- (or arg 1))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
147
27380
59243c413664 (beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents: 27190
diff changeset
148 (defvar beginning-of-defun-function nil
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
149 "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
150 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
151 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
152 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
153 needs.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
154
27380
59243c413664 (beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents: 27190
diff changeset
155 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
156 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
157
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
158 (defun beginning-of-defun (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
159 "Move backward to the beginning of a defun.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
160 With ARG, do it that many times. Negative arg -N
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
161 means move forward to Nth following beginning of defun.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
162 Returns t unless search stops due to beginning or end of buffer.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
163
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
164 Normally a defun starts when there is an char with open-parenthesis
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
165 syntax at the beginning of a line. If `defun-prompt-regexp' is
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
166 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
167 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
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."
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
171 (interactive "p")
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
172 (and (beginning-of-defun-raw arg)
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
173 (progn (beginning-of-line) t)))
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
174
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
175 (defun beginning-of-defun-raw (&optional arg)
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
176 "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
177 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
178 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
179 is non-nil.
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
180
27380
59243c413664 (beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents: 27190
diff changeset
181 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
182 is called as a function to find the defun's beginning."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
183 (interactive "p")
27380
59243c413664 (beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents: 27190
diff changeset
184 (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
185 (funcall beginning-of-defun-function)
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
186 (and arg (< arg 0) (not (eobp)) (forward-char 1))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
187 (and (re-search-backward (if defun-prompt-regexp
28299
ed528bfe1b9e (beginning-of-defun-raw): Add regexp
Gerd Moellmann <gerd@gnu.org>
parents: 27380
diff changeset
188 (concat (if open-paren-in-column-0-is-defun-start
ed528bfe1b9e (beginning-of-defun-raw): Add regexp
Gerd Moellmann <gerd@gnu.org>
parents: 27380
diff changeset
189 "^\\s(\\|" "")
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
190 "\\(" defun-prompt-regexp "\\)\\s(")
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
191 "^\\s(")
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
192 nil 'move (or arg 1))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
193 (progn (goto-char (1- (match-end 0)))) t)))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
194
27380
59243c413664 (beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents: 27190
diff changeset
195 (defvar end-of-defun-function nil
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
196 "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
197 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
198 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
199 normal method is not appropriate.")
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
200
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
201 (defun buffer-end (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
202 (if (> arg 0) (point-max) (point-min)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
203
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
204 (defun end-of-defun (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
205 "Move forward to next end of defun. With argument, do it that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
206 Negative argument -N means move back to Nth preceding end of defun.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
207
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
208 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
209 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
210 `beginning-of-defun'.
59243c413664 (beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents: 27190
diff changeset
211
59243c413664 (beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents: 27190
diff changeset
212 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
213 is called as a function to find the defun's end."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
214 (interactive "p")
27380
59243c413664 (beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents: 27190
diff changeset
215 (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
216 (funcall end-of-defun-function)
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
217 (if (or (null arg) (= arg 0)) (setq arg 1))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
218 (let ((first t))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
219 (while (and (> arg 0) (< (point) (point-max)))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
220 (let ((pos (point)) npos)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
221 (while (progn
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
222 (if (and first
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
223 (progn
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
224 (end-of-line 1)
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 nil
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
227 (or (bobp) (forward-char -1))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
228 (beginning-of-defun-raw -1))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
229 (setq first nil)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
230 (forward-list 1)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
231 (skip-chars-forward " \t")
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
232 (if (looking-at "\\s<\\|\n")
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
233 (forward-line 1))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
234 (<= (point) pos))))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
235 (setq arg (1- arg)))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
236 (while (< arg 0)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
237 (let ((pos (point)))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
238 (beginning-of-defun-raw 1)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
239 (forward-sexp 1)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
240 (forward-line 1)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
241 (if (>= (point) pos)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
242 (if (beginning-of-defun-raw 2)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
243 (progn
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
244 (forward-list 1)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
245 (skip-chars-forward " \t")
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
246 (if (looking-at "\\s<\\|\n")
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
247 (forward-line 1)))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
248 (goto-char (point-min)))))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
249 (setq arg (1+ arg))))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
250
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
251 (defun mark-defun ()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
252 "Put mark at end of this defun, point at beginning.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
253 The defun marked is the one that contains point or follows point."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
254 (interactive)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
255 (push-mark (point))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
256 (end-of-defun)
2823
8ab0e280fbf0 (mark-sexp, mark-defun): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
257 (push-mark (point) nil t)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
258 (beginning-of-defun)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
259 (re-search-backward "^\n" (- (point) 1) t))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
260
15971
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
261 (defun narrow-to-defun (&optional arg)
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
262 "Make text outside current defun invisible.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
263 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
264 Optional ARG is ignored."
15971
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
265 (interactive)
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
266 (save-excursion
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
267 (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
268 (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
269 (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
270 (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
271 (narrow-to-region (point) end))))
15971
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
272
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
273 (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
274 "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
275 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
276 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
277 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
278 before and after, depending on the surrounding characters."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
279 (interactive "P")
133
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
280 (if arg (setq arg (prefix-numeric-value arg))
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
281 (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
282 (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
283 ((< 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
284 (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
285 (not (bobp))
3733
c1c105ffdd0c (parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
286 (memq (char-syntax (preceding-char)) '(?w ?_ ?\) ))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
287 (insert " "))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
288 (insert ?\()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
289 (save-excursion
133
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
290 (or (eq arg 0) (forward-sexp arg))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
291 (insert ?\))
3758
e212a0863773 (parens-require-spaces): Var renamed and sense changed.
Richard M. Stallman <rms@gnu.org>
parents: 3733
diff changeset
292 (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
293 (not (eobp))
3733
c1c105ffdd0c (parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
294 (memq (char-syntax (following-char)) '(?w ?_ ?\( ))
133
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
295 (insert " "))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
296
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
297 (defun move-past-close-and-reindent ()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
298 "Move past next `)', delete indentation before it, then indent after it."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
299 (interactive)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
300 (up-list 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
301 (forward-char -1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
302 (while (save-excursion ; this is my contribution
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
303 (let ((before-paren (point)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
304 (back-to-indentation)
19781
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
305 (and (= (point) before-paren)
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
306 (progn
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
307 ;; Move to end of previous line.
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
308 (beginning-of-line)
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
309 (forward-char -1)
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
310 ;; 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
311 (let ((end (point))
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
312 state)
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
313 (beginning-of-line)
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
314 ;; Get state at start of line.
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
315 (setq state (list 0 nil nil
19781
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
316 (null (calculate-lisp-indent))
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
317 nil nil nil nil
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
318 nil))
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
319 ;; 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
320 (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
321 state))
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
322 ;; Check not in string or comment.
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
323 (and (not (elt state 3)) (not (elt state 4))))))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
324 (delete-indentation))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
325 (forward-char 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
326 (newline-and-indent))
27190
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
327
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
328 (defun check-parens () ; lame name?
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
329 "Check for unbalanced parentheses in the current buffer.
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
330 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
331 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
332 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
333 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
334 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
335 unbalanced character."
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
336 (interactive)
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
337 (condition-case data
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
338 ;; Buffer can't have more than (point-max) sexps.
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
339 (scan-sexps (point-min) (point-max))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
340 (scan-error (goto-char (nth 2 data))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
341 ;; Could print (nth 1 data), which is either
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
342 ;; "Containing expression ends prematurely" or
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
343 ;; "Unbalanced parentheses", but those may not be so
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
344 ;; accurate/helpful, e.g. quotes may actually be
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
345 ;; mismatched.
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
346 (error "Unmatched bracket or quote"))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
347 (error (cond ((eq 'scan-error (car data))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
348 (goto-char (nth 2 data))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
349 (error "Unmatched bracket or quote"))
f132d890985a (beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents: 23451
diff changeset
350 (t (signal (car data) (cdr data)))))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
351
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
352 (defun lisp-complete-symbol (&optional predicate)
6004
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
353 "Perform completion on Lisp symbol preceding point.
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
354 Compare that symbol against the known Lisp symbols.
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
355
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
356 When called from a program, optional arg PREDICATE is a predicate
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
357 determining which symbols are considered, e.g. `commandp'.
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
358 If PREDICATE is nil, the context determines which symbols are
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
359 considered. If the symbol starts just after an open-parenthesis, only
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
360 symbols with function definitions are considered. Otherwise, all
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
361 symbols with function definitions, values or properties are
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
362 considered."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
363 (interactive)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
364 (let* ((end (point))
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
365 (beg (with-syntax-table emacs-lisp-mode-syntax-table
31982
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
366 (save-excursion
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
367 (backward-sexp 1)
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
368 (while (= (char-syntax (following-char)) ?\')
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
369 (forward-char 1))
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
370 (point))))
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
371 (pattern (buffer-substring-no-properties beg end))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
372 (predicate
30979
72284d9d7a11 (defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents: 28299
diff changeset
373 (or predicate
31982
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
374 (save-excursion
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
375 (goto-char beg)
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
376 (if (not (eq (char-before) ?\())
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
377 (lambda (sym) ;why not just nil ? -sm
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
378 (or (boundp sym) (fboundp sym)
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
379 (symbol-plist sym)))
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
380 ;; Looks like a funcall position. Let's double check.
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
381 (if (condition-case nil
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
382 (progn (up-list -2) (forward-char 1)
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
383 (eq (char-after) ?\())
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
384 (error nil))
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
385 ;; If the first element of the parent list is an open
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
386 ;; parenthesis we are probably not in a funcall position.
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
387 ;; Maybe a `let' varlist or something.
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
388 nil
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
389 ;; Else, we assume that a function name is expected.
ed0ed1c70495 (lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30979
diff changeset
390 'fboundp)))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
391 (completion (try-completion pattern obarray predicate)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
392 (cond ((eq completion t))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
393 ((null completion)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
394 (message "Can't find completion for \"%s\"" pattern)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
395 (ding))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
396 ((not (string= pattern completion))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
397 (delete-region beg end)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
398 (insert completion))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
399 (t
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
400 (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
401 (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
402 (setq list (sort list 'string<))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
403 (or (eq predicate 'fboundp)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
404 (let (new)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
405 (while list
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
406 (setq new (cons (if (fboundp (intern (car list)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
407 (list (car list) " <f>")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
408 (car list))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
409 new))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
410 (setq list (cdr list)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
411 (setq list (nreverse new))))
7845
6f6b61216b0b (lisp-complete-symbol): Likewise.
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
412 (with-output-to-temp-buffer "*Completions*"
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
413 (display-completion-list list)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
414 (message "Making completion list...%s" "done")))))
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 215
diff changeset
415
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 215
diff changeset
416 ;;; lisp.el ends here