annotate lisp/emacs-lisp/lisp.el @ 22024:bf37812dd6bb

(normal-top-level-add-subdirs-to-load-path): Ignore subdirectories whose names start with nonalphanumeric or that have a file called .nosearch.
author Richard M. Stallman <rms@gnu.org>
date Mon, 11 May 1998 01:17:48 +0000
parents a517c846d04e
children 4b8c40cf1931
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
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
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
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
30
6369
881009b034b3 (defun-prompt-regexp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6004
diff changeset
31 ;; 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
32 (defcustom defun-prompt-regexp nil
6369
881009b034b3 (defun-prompt-regexp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6004
diff changeset
33 "*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
34 This is only necessary if the opening paren or brace is not in column 0.
17665
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
35 See `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
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
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
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
40
17665
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
41 (defcustom parens-require-spaces t
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
42 "Non-nil => `insert-parentheses' should insert whitespace as needed."
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
43 :type 'boolean
b11021ca3525 Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16494
diff changeset
44 :group 'lisp)
3733
c1c105ffdd0c (parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
45
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
46 (defun forward-sexp (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
47 "Move forward across one balanced expression (sexp).
215
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
48 With argument, do it that many times. Negative arg -N means
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
49 move backward across N balanced expressions."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
50 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
51 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
52 (goto-char (or (scan-sexps (point) arg) (buffer-end arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
53 (if (< arg 0) (backward-prefix-chars)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
54
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
55 (defun backward-sexp (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
56 "Move backward across one balanced expression (sexp).
215
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
57 With argument, do it that many times. Negative arg -N means
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
58 move forward across N balanced expressions."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
59 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
60 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
61 (forward-sexp (- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
62
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
63 (defun mark-sexp (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
64 "Set mark ARG sexps from point.
215
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
65 The place mark goes is the same place \\[forward-sexp] would
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
66 move to with the same argument."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
67 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
68 (push-mark
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
69 (save-excursion
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
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
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
73
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
74 (defun forward-list (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
75 "Move forward across one balanced group of parentheses.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
76 With argument, do it that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
77 Negative arg -N means move backward across N groups of parentheses."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
78 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
79 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
80 (goto-char (or (scan-lists (point) arg 0) (buffer-end arg))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
81
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
82 (defun backward-list (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
83 "Move backward across one balanced group of parentheses.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
84 With argument, do it that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
85 Negative arg -N means move forward across N groups of parentheses."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
86 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
87 (or arg (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
88 (forward-list (- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
89
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
90 (defun down-list (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
91 "Move forward down one level of parentheses.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
92 With argument, do this that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
93 A negative argument means move backward but still go down a level.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
94 In Lisp programs, an argument is required."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
95 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
96 (let ((inc (if (> arg 0) 1 -1)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
97 (while (/= arg 0)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
98 (goto-char (or (scan-lists (point) inc -1) (buffer-end arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
99 (setq arg (- arg inc)))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
100
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
101 (defun backward-up-list (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
102 "Move backward out of one level of parentheses.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
103 With argument, do this that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
104 A negative argument means move forward but still to a less deep spot.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
105 In Lisp programs, an argument is required."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
106 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
107 (up-list (- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
108
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
109 (defun up-list (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
110 "Move forward out of one level of parentheses.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
111 With argument, do this that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
112 A negative argument means move backward but still to a less deep spot.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
113 In Lisp programs, an argument is required."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
114 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
115 (let ((inc (if (> arg 0) 1 -1)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
116 (while (/= arg 0)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
117 (goto-char (or (scan-lists (point) inc 1) (buffer-end arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
118 (setq arg (- arg inc)))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
119
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
120 (defun kill-sexp (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
121 "Kill the sexp (balanced expression) following the cursor.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
122 With argument, kill that many sexps after the cursor.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
123 Negative arg -N means kill N sexps before the cursor."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
124 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
125 (let ((opoint (point)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
126 (forward-sexp arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
127 (kill-region opoint (point))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
128
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
129 (defun backward-kill-sexp (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
130 "Kill the sexp (balanced expression) preceding the cursor.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
131 With argument, kill that many sexps before the cursor.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
132 Negative arg -N means kill N sexps after the cursor."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
133 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
134 (kill-sexp (- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
135
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
136 (defun beginning-of-defun (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
137 "Move backward to the beginning of a defun.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
138 With argument, do it that many times. Negative arg -N
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
139 means move forward to Nth following beginning of defun.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
140 Returns t unless search stops due to beginning or end of buffer.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
141
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
142 Normally a defun starts when there is an char with open-parenthesis
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
143 syntax at the beginning of a line. If `defun-prompt-regexp' is
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
144 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
145 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
146 (interactive "p")
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
147 (and (beginning-of-defun-raw arg)
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
148 (progn (beginning-of-line) t)))
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
149
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
150 (defun beginning-of-defun-raw (&optional arg)
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
151 "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
152 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
153 to the beginning of the line when `defun-prompt-regexp' is non-nil."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
154 (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
155 (and arg (< arg 0) (not (eobp)) (forward-char 1))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
156 (and (re-search-backward (if defun-prompt-regexp
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
157 (concat "^\\s(\\|"
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
158 "\\(" defun-prompt-regexp "\\)\\s(")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
159 "^\\s(")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
160 nil 'move (or arg 1))
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
161 (progn (goto-char (1- (match-end 0)))) t))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
162
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
163 (defun buffer-end (arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
164 (if (> arg 0) (point-max) (point-min)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
165
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
166 (defun end-of-defun (&optional arg)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
167 "Move forward to next end of defun. With argument, do it that many times.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
168 Negative argument -N means move back to Nth preceding end of defun.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
169
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
170 An end of a defun occurs right after the close-parenthesis that matches
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
171 the open-parenthesis that starts a defun; see `beginning-of-defun'."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
172 (interactive "p")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
173 (if (or (null arg) (= arg 0)) (setq arg 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
174 (let ((first t))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
175 (while (and (> arg 0) (< (point) (point-max)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
176 (let ((pos (point)) npos)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
177 (while (progn
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
178 (if (and first
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
179 (progn
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
180 (end-of-line 1)
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
181 (beginning-of-defun-raw 1)))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
182 nil
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
183 (or (bobp) (forward-char -1))
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
184 (beginning-of-defun-raw -1))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
185 (setq first nil)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
186 (forward-list 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
187 (skip-chars-forward " \t")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
188 (if (looking-at "\\s<\\|\n")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
189 (forward-line 1))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
190 (<= (point) pos))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
191 (setq arg (1- arg)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
192 (while (< arg 0)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
193 (let ((pos (point)))
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
194 (beginning-of-defun-raw 1)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
195 (forward-sexp 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
196 (forward-line 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
197 (if (>= (point) pos)
6397
70bf65b6aae9 (beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6396
diff changeset
198 (if (beginning-of-defun-raw 2)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
199 (progn
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
200 (forward-list 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
201 (skip-chars-forward " \t")
6396
1740ec160ff8 (end-of-defun): Fix check for trailing comment.
Karl Heuer <kwzh@gnu.org>
parents: 6369
diff changeset
202 (if (looking-at "\\s<\\|\n")
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
203 (forward-line 1)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
204 (goto-char (point-min)))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
205 (setq arg (1+ arg)))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
206
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
207 (defun mark-defun ()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
208 "Put mark at end of this defun, point at beginning.
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
209 The defun marked is the one that contains point or follows point."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
210 (interactive)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
211 (push-mark (point))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
212 (end-of-defun)
2823
8ab0e280fbf0 (mark-sexp, mark-defun): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
213 (push-mark (point) nil t)
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
214 (beginning-of-defun)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
215 (re-search-backward "^\n" (- (point) 1) t))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
216
15971
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
217 (defun narrow-to-defun (&optional arg)
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
218 "Make text outside current defun invisible.
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
219 The defun visible is the one that contains point or follows point."
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
220 (interactive)
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
221 (save-excursion
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
222 (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
223 (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
224 (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
225 (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
226 (narrow-to-region (point) end))))
15971
9e9c14ecf6e1 (narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
227
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
228 (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
229 "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
230 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
231 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
232 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
233 before and after, depending on the surrounding characters."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
234 (interactive "P")
133
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
235 (if arg (setq arg (prefix-numeric-value arg))
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
236 (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
237 (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
238 ((< 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
239 (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
240 (not (bobp))
3733
c1c105ffdd0c (parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
241 (memq (char-syntax (preceding-char)) '(?w ?_ ?\) ))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
242 (insert " "))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
243 (insert ?\()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
244 (save-excursion
133
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
245 (or (eq arg 0) (forward-sexp arg))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
246 (insert ?\))
3758
e212a0863773 (parens-require-spaces): Var renamed and sense changed.
Richard M. Stallman <rms@gnu.org>
parents: 3733
diff changeset
247 (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
248 (not (eobp))
3733
c1c105ffdd0c (parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3591
diff changeset
249 (memq (char-syntax (following-char)) '(?w ?_ ?\( ))
133
2f5b3f50773d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 119
diff changeset
250 (insert " "))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
251
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
252 (defun move-past-close-and-reindent ()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
253 "Move past next `)', delete indentation before it, then indent after it."
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
254 (interactive)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
255 (up-list 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
256 (forward-char -1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
257 (while (save-excursion ; this is my contribution
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
258 (let ((before-paren (point)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
259 (back-to-indentation)
19781
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
260 (and (= (point) before-paren)
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
261 (progn
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
262 ;; Move to end of previous line.
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
263 (beginning-of-line)
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
264 (forward-char -1)
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
265 ;; 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
266 (let ((end (point))
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
267 state)
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
268 (beginning-of-line)
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
269 ;; Get state at start of line.
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
270 (setq state (list 0 nil nil
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
271 (null (calculate-lisp-indent))
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
272 nil nil nil nil
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
273 nil))
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
274 ;; 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
275 (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
276 state))
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
277 ;; Check not in string or comment.
03264c342376 (move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents: 17665
diff changeset
278 (and (not (elt state 3)) (not (elt state 4))))))))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
279 (delete-indentation))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
280 (forward-char 1)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
281 (newline-and-indent))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
282
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
283 (defun lisp-complete-symbol ()
6004
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
284 "Perform completion on Lisp symbol preceding point.
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
285 Compare that symbol against the known Lisp symbols.
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
286
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
287 The context determines which symbols are considered.
4fa3d631dae8 (lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5981
diff changeset
288 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
289 with function definitions are considered. Otherwise, all symbols with
8b1123702915 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 133
diff changeset
290 function definitions, values or properties are considered."
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
291 (interactive)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
292 (let* ((end (point))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
293 (buffer-syntax (syntax-table))
119
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
294 (beg (unwind-protect
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
295 (save-excursion
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
296 (set-syntax-table emacs-lisp-mode-syntax-table)
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
297 (backward-sexp 1)
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
298 (while (= (char-syntax (following-char)) ?\')
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
299 (forward-char 1))
7cfabf2a8964 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 84
diff changeset
300 (point))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
301 (set-syntax-table buffer-syntax)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
302 (pattern (buffer-substring beg end))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
303 (predicate
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
304 (if (eq (char-after (1- beg)) ?\()
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
305 'fboundp
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
306 (function (lambda (sym)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
307 (or (boundp sym) (fboundp sym)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
308 (symbol-plist sym))))))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
309 (completion (try-completion pattern obarray predicate)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
310 (cond ((eq completion t))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
311 ((null completion)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
312 (message "Can't find completion for \"%s\"" pattern)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
313 (ding))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
314 ((not (string= pattern completion))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
315 (delete-region beg end)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
316 (insert completion))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
317 (t
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
318 (message "Making completion list...")
8205
f9e57f3ecc9d (lisp-complete-symbol): Bind completion-fixup-function.
Richard M. Stallman <rms@gnu.org>
parents: 7845
diff changeset
319 (let ((list (all-completions pattern obarray predicate))
f9e57f3ecc9d (lisp-complete-symbol): Bind completion-fixup-function.
Richard M. Stallman <rms@gnu.org>
parents: 7845
diff changeset
320 (completion-fixup-function
f9e57f3ecc9d (lisp-complete-symbol): Bind completion-fixup-function.
Richard M. Stallman <rms@gnu.org>
parents: 7845
diff changeset
321 (function (lambda () (if (save-excursion
f9e57f3ecc9d (lisp-complete-symbol): Bind completion-fixup-function.
Richard M. Stallman <rms@gnu.org>
parents: 7845
diff changeset
322 (goto-char (max (point-min) (- (point) 4)))
f9e57f3ecc9d (lisp-complete-symbol): Bind completion-fixup-function.
Richard M. Stallman <rms@gnu.org>
parents: 7845
diff changeset
323 (looking-at " <f>"))
f9e57f3ecc9d (lisp-complete-symbol): Bind completion-fixup-function.
Richard M. Stallman <rms@gnu.org>
parents: 7845
diff changeset
324 (forward-char -4))))))
16494
3f971c7163fb (lisp-complete-symbol): Sort the list.
Richard M. Stallman <rms@gnu.org>
parents: 16410
diff changeset
325 (setq list (sort list 'string<))
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
326 (or (eq predicate 'fboundp)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
327 (let (new)
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
328 (while list
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
329 (setq new (cons (if (fboundp (intern (car list)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
330 (list (car list) " <f>")
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
331 (car list))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
332 new))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
333 (setq list (cdr list)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
334 (setq list (nreverse new))))
7845
6f6b61216b0b (lisp-complete-symbol): Likewise.
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
335 (with-output-to-temp-buffer "*Completions*"
84
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
336 (display-completion-list list)))
225a5c57fe64 Initial revision
root <root>
parents:
diff changeset
337 (message "Making completion list...%s" "done")))))
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 215
diff changeset
338
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 215
diff changeset
339 ;;; lisp.el ends here