Mercurial > emacs
annotate lisp/emacs-lisp/lisp.el @ 112402:a102f5772eaa
Merge from mainline.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Fri, 21 Jan 2011 12:27:07 -0800 |
parents | ef719132ddfa |
children |
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 |
74466 | 3 ;; Copyright (C) 1985, 1986, 1994, 2000, 2001, 2002, 2003, 2004, |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
110927
diff
changeset
|
4 ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
845 | 5 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
6 ;; Maintainer: FSF |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
7 ;; Keywords: lisp, languages |
110015
280c8ae2476d
Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents:
109819
diff
changeset
|
8 ;; Package: emacs |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
9 |
84 | 10 ;; This file is part of GNU Emacs. |
11 | |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93138
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
84 | 13 ;; it under the terms of the GNU General Public License as published by |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93138
diff
changeset
|
14 ;; the Free Software Foundation, either version 3 of the License, or |
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93138
diff
changeset
|
15 ;; (at your option) any later version. |
84 | 16 |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93138
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
84 | 24 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
25 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
26 |
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 | 31 |
6369 | 32 ;; Note that this variable is used by non-lisp modes too. |
17665 | 33 (defcustom defun-prompt-regexp nil |
104024
cce8d50c4566
Remove leading * from defcustom docs.
Glenn Morris <rgm@gnu.org>
parents:
102381
diff
changeset
|
34 "If non-nil, a regexp to ignore before a defun. |
6369 | 35 This is only necessary if the opening paren or brace is not in column 0. |
61401
99b039f2f040
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
Luc Teirlinck <teirllm@auburn.edu>
parents:
59940
diff
changeset
|
36 See function `beginning-of-defun'." |
19831
a517c846d04e
(defun-prompt-regexp): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19781
diff
changeset
|
37 :type '(choice (const nil) |
a517c846d04e
(defun-prompt-regexp): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19781
diff
changeset
|
38 regexp) |
17665 | 39 :group 'lisp) |
6973
7aa70fb3afa8
(defun-prompt-regexp): Make this variable buffer-local.
Karl Heuer <kwzh@gnu.org>
parents:
6420
diff
changeset
|
40 (make-variable-buffer-local 'defun-prompt-regexp) |
84 | 41 |
17665 | 42 (defcustom parens-require-spaces t |
92519
5ce65481d860
(parens-require-spaces): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
87649
diff
changeset
|
43 "If non-nil, add whitespace as needed when inserting parentheses. |
5ce65481d860
(parens-require-spaces): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
87649
diff
changeset
|
44 This affects `insert-parentheses' and `insert-pair'." |
17665 | 45 :type 'boolean |
46 :group 'lisp) | |
3733
c1c105ffdd0c
(parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
47 |
31982
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
48 (defvar forward-sexp-function nil |
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
49 "If non-nil, `forward-sexp' delegates to this function. |
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
50 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
|
51 |
84 | 52 (defun forward-sexp (&optional arg) |
53 "Move forward across one balanced expression (sexp). | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
54 With ARG, do it that many times. Negative arg -N means |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
55 move backward across N balanced expressions. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
56 This command assumes point is not in a string or comment." |
101789
7d131969b5e2
Add "^" to interactive spec of sexp movement commands
Miles Bader <miles@gnu.org>
parents:
101715
diff
changeset
|
57 (interactive "^p") |
84 | 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 | 63 |
64 (defun backward-sexp (&optional arg) | |
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 |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
67 move forward across N balanced expressions. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
68 This command assumes point is not in a string or comment." |
101789
7d131969b5e2
Add "^" to interactive spec of sexp movement commands
Miles Bader <miles@gnu.org>
parents:
101715
diff
changeset
|
69 (interactive "^p") |
84 | 70 (or arg (setq arg 1)) |
71 (forward-sexp (- arg))) | |
72 | |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
73 (defun mark-sexp (&optional arg allow-extend) |
84 | 74 "Set mark ARG sexps from point. |
215 | 75 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
|
76 move to with the same argument. |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
77 Interactively, if this command is repeated |
61401
99b039f2f040
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
Luc Teirlinck <teirllm@auburn.edu>
parents:
59940
diff
changeset
|
78 or (in Transient Mark mode) if the mark is active, |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
79 it marks the next ARG sexps after the ones already marked. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
80 This command assumes point is not in a string or comment." |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
81 (interactive "P\np") |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
82 (cond ((and allow-extend |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
83 (or (and (eq last-command this-command) (mark t)) |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
84 (and transient-mark-mode mark-active))) |
57457
8c6dae33cdc3
(mark-sexp): Preserve direction when repeating.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56924
diff
changeset
|
85 (setq arg (if arg (prefix-numeric-value arg) |
58918
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
86 (if (< (mark) (point)) -1 1))) |
43301
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
87 (set-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
88 (save-excursion |
58918
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
89 (goto-char (mark)) |
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
90 (forward-sexp arg) |
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
91 (point)))) |
43301
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
92 (t |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
93 (push-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
94 (save-excursion |
57457
8c6dae33cdc3
(mark-sexp): Preserve direction when repeating.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56924
diff
changeset
|
95 (forward-sexp (prefix-numeric-value arg)) |
43301
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
96 (point)) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
97 nil t)))) |
84 | 98 |
99 (defun forward-list (&optional arg) | |
100 "Move forward across one balanced group of parentheses. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
101 With ARG, do it that many times. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
102 Negative arg -N means move backward across N groups of parentheses. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
103 This command assumes point is not in a string or comment." |
101789
7d131969b5e2
Add "^" to interactive spec of sexp movement commands
Miles Bader <miles@gnu.org>
parents:
101715
diff
changeset
|
104 (interactive "^p") |
84 | 105 (or arg (setq arg 1)) |
106 (goto-char (or (scan-lists (point) arg 0) (buffer-end arg)))) | |
107 | |
108 (defun backward-list (&optional arg) | |
109 "Move backward across one balanced group of parentheses. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
110 With ARG, do it that many times. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
111 Negative arg -N means move forward across N groups of parentheses. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
112 This command assumes point is not in a string or comment." |
101789
7d131969b5e2
Add "^" to interactive spec of sexp movement commands
Miles Bader <miles@gnu.org>
parents:
101715
diff
changeset
|
113 (interactive "^p") |
84 | 114 (or arg (setq arg 1)) |
115 (forward-list (- arg))) | |
116 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
117 (defun down-list (&optional arg) |
84 | 118 "Move forward down one level of parentheses. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
119 With ARG, do this that many times. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
120 A negative argument means move backward but still go down a level. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
121 This command assumes point is not in a string or comment." |
101789
7d131969b5e2
Add "^" to interactive spec of sexp movement commands
Miles Bader <miles@gnu.org>
parents:
101715
diff
changeset
|
122 (interactive "^p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
123 (or arg (setq arg 1)) |
84 | 124 (let ((inc (if (> arg 0) 1 -1))) |
125 (while (/= arg 0) | |
126 (goto-char (or (scan-lists (point) inc -1) (buffer-end arg))) | |
127 (setq arg (- arg inc))))) | |
128 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
129 (defun backward-up-list (&optional arg) |
84 | 130 "Move backward out of one level of parentheses. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
131 With ARG, do this that many times. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
132 A negative argument means move forward but still to a less deep spot. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
133 This command assumes point is not in a string or comment." |
101789
7d131969b5e2
Add "^" to interactive spec of sexp movement commands
Miles Bader <miles@gnu.org>
parents:
101715
diff
changeset
|
134 (interactive "^p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
135 (up-list (- (or arg 1)))) |
84 | 136 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
137 (defun up-list (&optional arg) |
84 | 138 "Move forward out of one level of parentheses. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
139 With ARG, do this that many times. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
140 A negative argument means move backward but still to a less deep spot. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
141 This command assumes point is not in a string or comment." |
101789
7d131969b5e2
Add "^" to interactive spec of sexp movement commands
Miles Bader <miles@gnu.org>
parents:
101715
diff
changeset
|
142 (interactive "^p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
143 (or arg (setq arg 1)) |
110448
0e1478bb5f00
* lisp/simple.el (blink-matching-open): Use syntax-class.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110015
diff
changeset
|
144 (let ((inc (if (> arg 0) 1 -1)) |
0e1478bb5f00
* lisp/simple.el (blink-matching-open): Use syntax-class.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110015
diff
changeset
|
145 pos) |
84 | 146 (while (/= arg 0) |
110448
0e1478bb5f00
* lisp/simple.el (blink-matching-open): Use syntax-class.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110015
diff
changeset
|
147 (if (null forward-sexp-function) |
0e1478bb5f00
* lisp/simple.el (blink-matching-open): Use syntax-class.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110015
diff
changeset
|
148 (goto-char (or (scan-lists (point) inc 1) (buffer-end arg))) |
109819
7a3c2a989900
* lisp/emacs-lisp/lisp.el (up-list): Obey forward-sexp-function if set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108375
diff
changeset
|
149 (condition-case err |
110448
0e1478bb5f00
* lisp/simple.el (blink-matching-open): Use syntax-class.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110015
diff
changeset
|
150 (while (progn (setq pos (point)) |
109819
7a3c2a989900
* lisp/emacs-lisp/lisp.el (up-list): Obey forward-sexp-function if set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108375
diff
changeset
|
151 (forward-sexp inc) |
7a3c2a989900
* lisp/emacs-lisp/lisp.el (up-list): Obey forward-sexp-function if set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108375
diff
changeset
|
152 (/= (point) pos))) |
7a3c2a989900
* lisp/emacs-lisp/lisp.el (up-list): Obey forward-sexp-function if set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108375
diff
changeset
|
153 (scan-error (goto-char (nth 2 err)))) |
110448
0e1478bb5f00
* lisp/simple.el (blink-matching-open): Use syntax-class.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110015
diff
changeset
|
154 (if (= (point) pos) |
0e1478bb5f00
* lisp/simple.el (blink-matching-open): Use syntax-class.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110015
diff
changeset
|
155 (signal 'scan-error |
0e1478bb5f00
* lisp/simple.el (blink-matching-open): Use syntax-class.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110015
diff
changeset
|
156 (list "Unbalanced parentheses" (point) (point))))) |
84 | 157 (setq arg (- arg inc))))) |
158 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
159 (defun kill-sexp (&optional arg) |
59602
99bf07f49031
(backward-kill-sexp, kill-sexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
59177
diff
changeset
|
160 "Kill the sexp (balanced expression) following point. |
99bf07f49031
(backward-kill-sexp, kill-sexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
59177
diff
changeset
|
161 With ARG, kill that many sexps after point. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
162 Negative arg -N means kill N sexps before point. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
163 This command assumes point is not in a string or comment." |
84 | 164 (interactive "p") |
165 (let ((opoint (point))) | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
166 (forward-sexp (or arg 1)) |
84 | 167 (kill-region opoint (point)))) |
168 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
169 (defun backward-kill-sexp (&optional arg) |
59602
99bf07f49031
(backward-kill-sexp, kill-sexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
59177
diff
changeset
|
170 "Kill the sexp (balanced expression) preceding point. |
99bf07f49031
(backward-kill-sexp, kill-sexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
59177
diff
changeset
|
171 With ARG, kill that many sexps before point. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
172 Negative arg -N means kill N sexps after point. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
173 This command assumes point is not in a string or comment." |
84 | 174 (interactive "p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
175 (kill-sexp (- (or arg 1)))) |
56924
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
176 |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
177 ;; After Zmacs: |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
178 (defun kill-backward-up-list (&optional arg) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
179 "Kill the form containing the current sexp, leaving the sexp itself. |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
180 A prefix argument ARG causes the relevant number of surrounding |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
181 forms to be removed. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
182 This command assumes point is not in a string or comment." |
56924
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
183 (interactive "*p") |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
184 (let ((current-sexp (thing-at-point 'sexp))) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
185 (if current-sexp |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
186 (save-excursion |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
187 (backward-up-list arg) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
188 (kill-sexp) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
189 (insert current-sexp)) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
190 (error "Not at a sexp")))) |
84 | 191 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
192 (defvar beginning-of-defun-function nil |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
193 "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
|
194 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
|
195 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
|
196 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
|
197 needs. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
198 |
86353
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
199 The function takes the same argument as `beginning-of-defun' and should |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
200 behave similarly, returning non-nil if it found the beginning of a defun. |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
201 Ideally it should move to a point right before an open-paren which encloses |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
202 the body of the defun.") |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
203 |
84 | 204 (defun beginning-of-defun (&optional arg) |
205 "Move backward to the beginning of a defun. | |
97431
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
206 With ARG, do it that many times. Negative ARG means move forward |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
207 to the ARGth following beginning of defun. |
84 | 208 |
97431
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
209 If search is successful, return t; point ends up at the beginning |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
210 of the line where the search succeeded. Otherwise, return nil. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
211 |
97431
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
212 When `open-paren-in-column-0-is-defun-start' is non-nil, a defun |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
213 is assumed to start where there is a char with open-parenthesis |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
214 syntax at the beginning of a line. If `defun-prompt-regexp' is |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
215 non-nil, then a string which matches that regexp may also precede |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
216 the open-parenthesis. If `defun-prompt-regexp' and |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
217 `open-paren-in-column-0-is-defun-start' are both nil, this |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
218 function instead finds an open-paren at the outermost level. |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
219 |
97431
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
220 If the variable `beginning-of-defun-function' is non-nil, its |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
221 value is called as a function, with argument ARG, to find the |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
222 defun's beginning. |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
223 |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
224 Regardless of the values of `defun-prompt-regexp' and |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
225 `beginning-of-defun-function', point always moves to the |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
226 beginning of the line whenever the search is successful." |
101789
7d131969b5e2
Add "^" to interactive spec of sexp movement commands
Miles Bader <miles@gnu.org>
parents:
101715
diff
changeset
|
227 (interactive "^p") |
58962
eb752b1a84b1
(beginning-of-defun, end-of-defun): Don't
Kim F. Storm <storm@cua.dk>
parents:
58918
diff
changeset
|
228 (or (not (eq this-command 'beginning-of-defun)) |
58918
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
229 (eq last-command 'beginning-of-defun) |
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
230 (and transient-mark-mode mark-active) |
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
231 (push-mark)) |
6397
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
232 (and (beginning-of-defun-raw arg) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
233 (progn (beginning-of-line) t))) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
234 |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
235 (defun beginning-of-defun-raw (&optional arg) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
236 "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
|
237 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
|
238 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
|
239 is non-nil. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
240 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
241 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
|
242 is called as a function to find the defun's beginning." |
101789
7d131969b5e2
Add "^" to interactive spec of sexp movement commands
Miles Bader <miles@gnu.org>
parents:
101715
diff
changeset
|
243 (interactive "^p") ; change this to "P", maybe, if we ever come to pass ARG |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
244 ; to beginning-of-defun-function. |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
245 (unless arg (setq arg 1)) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
246 (cond |
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
247 (beginning-of-defun-function |
86353
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
248 (condition-case nil |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
249 (funcall beginning-of-defun-function arg) |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
250 ;; We used to define beginning-of-defun-function as taking no argument |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
251 ;; but that makes it impossible to implement correct forward motion: |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
252 ;; we used to use end-of-defun for that, but it's not supposed to do |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
253 ;; the same thing (it moves to the end of a defun not to the beginning |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
254 ;; of the next). |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
255 ;; In case the beginning-of-defun-function uses the old calling |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
256 ;; convention, fallback on the old implementation. |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
257 (wrong-number-of-arguments |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
258 (if (> arg 0) |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
259 (dotimes (i arg) |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
260 (funcall beginning-of-defun-function)) |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
261 ;; Better not call end-of-defun-function directly, in case |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
262 ;; it's not defined. |
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
263 (end-of-defun (- arg)))))) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
264 |
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
265 ((or defun-prompt-regexp open-paren-in-column-0-is-defun-start) |
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
266 (and (< arg 0) (not (eobp)) (forward-char 1)) |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
267 (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
|
268 (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
|
269 "^\\s(\\|" "") |
51084
c27a29e35a85
(beginning-of-defun-raw): Use shy-group.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47924
diff
changeset
|
270 "\\(?:" defun-prompt-regexp "\\)\\s(") |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
271 "^\\s(") |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
272 nil 'move arg) |
102124
75c910c62eaa
(beginning-of-defun): Fix harmless paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102122
diff
changeset
|
273 (progn (goto-char (1- (match-end 0))) |
75c910c62eaa
(beginning-of-defun): Fix harmless paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102122
diff
changeset
|
274 t))) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
275 |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
276 ;; If open-paren-in-column-0-is-defun-start and defun-prompt-regexp |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
277 ;; are both nil, column 0 has no significance - so scan forward |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
278 ;; from BOB to see how nested point is, then carry on from there. |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
279 ;; |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
280 ;; It is generally not a good idea to land up here, because the |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
281 ;; call to scan-lists below can be extremely slow. This is because |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
282 ;; back_comment in syntax.c may have to scan from bob to find the |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
283 ;; beginning of each comment. Fixing this is not trivial -- cyd. |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
284 |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
285 ((eq arg 0)) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
286 (t |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
287 (let ((floor (point-min)) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
288 (ceiling (point-max)) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
289 (arg-+ve (> arg 0))) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
290 (save-restriction |
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
291 (widen) |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
292 (let ((ppss (let (syntax-begin-function |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
293 font-lock-beginning-of-syntax-function) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
294 (syntax-ppss))) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
295 ;; position of least enclosing paren, or nil. |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
296 encl-pos) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
297 ;; Back out of any comment/string, so that encl-pos will always |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
298 ;; become nil if we're at top-level. |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
299 (when (nth 8 ppss) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
300 (goto-char (nth 8 ppss)) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
301 (setq ppss (syntax-ppss))) ; should be fast, due to cache. |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
302 (setq encl-pos (syntax-ppss-toplevel-pos ppss)) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
303 (if encl-pos (goto-char encl-pos)) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
304 |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
305 (and encl-pos arg-+ve (setq arg (1- arg))) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
306 (and (not encl-pos) (not arg-+ve) (not (looking-at "\\s(")) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
307 (setq arg (1+ arg))) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
308 |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
309 (condition-case nil ; to catch crazy parens. |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
310 (progn |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
311 (goto-char (scan-lists (point) (- arg) 0)) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
312 (if arg-+ve |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
313 (if (>= (point) floor) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
314 t |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
315 (goto-char floor) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
316 nil) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
317 ;; forward to next (, or trigger the c-c |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
318 (goto-char (1- (scan-lists (point) 1 -1))) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
319 (if (<= (point) ceiling) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
320 t |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
321 (goto-char ceiling) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
322 nil))) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
323 (error |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
324 (goto-char (if arg-+ve floor ceiling)) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
325 nil)))))))) |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
326 |
102381
36437490ed93
(end-of-defun-function): Make it more clear that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102124
diff
changeset
|
327 (defvar end-of-defun-function |
36437490ed93
(end-of-defun-function): Make it more clear that
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102124
diff
changeset
|
328 (lambda () (forward-sexp 1)) |
86454
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
329 "Function for `end-of-defun' to call. |
102025
a41e65af8655
(end-of-defun-function): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101957
diff
changeset
|
330 This is used to find the end of the defun at point. |
86454
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
331 It is called with no argument, right after calling `beginning-of-defun-raw'. |
102025
a41e65af8655
(end-of-defun-function): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101957
diff
changeset
|
332 So the function can assume that point is at the beginning of the defun body. |
a41e65af8655
(end-of-defun-function): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101957
diff
changeset
|
333 It should move point to the first position after the defun.") |
84 | 334 |
335 (defun buffer-end (arg) | |
61401
99b039f2f040
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
Luc Teirlinck <teirllm@auburn.edu>
parents:
59940
diff
changeset
|
336 "Return the \"far end\" position of the buffer, in direction ARG. |
59940 | 337 If ARG is positive, that's the end of the buffer. |
338 Otherwise, that's the beginning of the buffer." | |
84 | 339 (if (> arg 0) (point-max) (point-min))) |
340 | |
341 (defun end-of-defun (&optional arg) | |
61401
99b039f2f040
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
Luc Teirlinck <teirllm@auburn.edu>
parents:
59940
diff
changeset
|
342 "Move forward to next end of defun. |
99b039f2f040
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
Luc Teirlinck <teirllm@auburn.edu>
parents:
59940
diff
changeset
|
343 With argument, do it that many times. |
84 | 344 Negative argument -N means move back to Nth preceding end of defun. |
345 | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
346 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
|
347 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
|
348 `beginning-of-defun'. |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
349 |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
350 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
|
351 is called as a function to find the defun's end." |
101789
7d131969b5e2
Add "^" to interactive spec of sexp movement commands
Miles Bader <miles@gnu.org>
parents:
101715
diff
changeset
|
352 (interactive "^p") |
58962
eb752b1a84b1
(beginning-of-defun, end-of-defun): Don't
Kim F. Storm <storm@cua.dk>
parents:
58918
diff
changeset
|
353 (or (not (eq this-command 'end-of-defun)) |
58918
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
354 (eq last-command 'end-of-defun) |
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
355 (and transient-mark-mode mark-active) |
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
356 (push-mark)) |
54876
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
357 (if (or (null arg) (= arg 0)) (setq arg 1)) |
101957
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
358 (let ((pos (point)) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
359 (beg (progn (end-of-line 1) (beginning-of-defun-raw 1) (point)))) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
360 (funcall end-of-defun-function) |
102122
4eb463737ac8
(end-of-defun): Consider the ".*\n" after the end of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102025
diff
changeset
|
361 ;; When comparing point against pos, we want to consider that if |
4eb463737ac8
(end-of-defun): Consider the ".*\n" after the end of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102025
diff
changeset
|
362 ;; point was right after the end of the function, it's still |
4eb463737ac8
(end-of-defun): Consider the ".*\n" after the end of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102025
diff
changeset
|
363 ;; considered as "in that function". |
4eb463737ac8
(end-of-defun): Consider the ".*\n" after the end of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102025
diff
changeset
|
364 ;; E.g. `eval-defun' from right after the last close-paren. |
4eb463737ac8
(end-of-defun): Consider the ".*\n" after the end of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102025
diff
changeset
|
365 (unless (bolp) |
4eb463737ac8
(end-of-defun): Consider the ".*\n" after the end of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102025
diff
changeset
|
366 (skip-chars-forward " \t") |
4eb463737ac8
(end-of-defun): Consider the ".*\n" after the end of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102025
diff
changeset
|
367 (if (looking-at "\\s<\\|\n") |
4eb463737ac8
(end-of-defun): Consider the ".*\n" after the end of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102025
diff
changeset
|
368 (forward-line 1))) |
101957
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
369 (cond |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
370 ((> arg 0) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
371 ;; Moving forward. |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
372 (if (> (point) pos) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
373 ;; We already moved forward by one because we started from |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
374 ;; within a function. |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
375 (setq arg (1- arg)) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
376 ;; We started from after the end of the previous function. |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
377 (goto-char pos)) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
378 (unless (zerop arg) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
379 (beginning-of-defun-raw (- arg)) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
380 (funcall end-of-defun-function))) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
381 ((< arg 0) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
382 ;; Moving backward. |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
383 (if (< (point) pos) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
384 ;; We already moved backward because we started from between |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
385 ;; two functions. |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
386 (setq arg (1+ arg)) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
387 ;; We started from inside a function. |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
388 (goto-char beg)) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
389 (unless (zerop arg) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
390 (beginning-of-defun-raw (- arg)) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
391 (funcall end-of-defun-function)))) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
392 (unless (bolp) |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
393 (skip-chars-forward " \t") |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
394 (if (looking-at "\\s<\\|\n") |
db03a07a8e3e
(end-of-defun): Rewrite, to use the ARG argument to beginning-of-defun-raw.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
101956
diff
changeset
|
395 (forward-line 1))))) |
84 | 396 |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
397 (defun mark-defun (&optional allow-extend) |
84 | 398 "Put mark at end of this defun, point at beginning. |
43301
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
399 The defun marked is the one that contains point or follows point. |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
400 |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
401 Interactively, if this command is repeated |
61401
99b039f2f040
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
Luc Teirlinck <teirllm@auburn.edu>
parents:
59940
diff
changeset
|
402 or (in Transient Mark mode) if the mark is active, |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
403 it marks the next defun after the ones already marked." |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
404 (interactive "p") |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
405 (cond ((and allow-extend |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
406 (or (and (eq last-command this-command) (mark t)) |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
407 (and transient-mark-mode mark-active))) |
43384
cc3ba2d0d471
* emacs-lisp/lisp.el (mark-defun): Don't leave multiple marks
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43301
diff
changeset
|
408 (set-mark |
cc3ba2d0d471
* emacs-lisp/lisp.el (mark-defun): Don't leave multiple marks
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43301
diff
changeset
|
409 (save-excursion |
cc3ba2d0d471
* emacs-lisp/lisp.el (mark-defun): Don't leave multiple marks
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43301
diff
changeset
|
410 (goto-char (mark)) |
cc3ba2d0d471
* emacs-lisp/lisp.el (mark-defun): Don't leave multiple marks
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43301
diff
changeset
|
411 (end-of-defun) |
cc3ba2d0d471
* emacs-lisp/lisp.el (mark-defun): Don't leave multiple marks
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43301
diff
changeset
|
412 (point)))) |
cc3ba2d0d471
* emacs-lisp/lisp.el (mark-defun): Don't leave multiple marks
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43301
diff
changeset
|
413 (t |
55727
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
414 (let ((opoint (point)) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
415 beg end) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
416 (push-mark opoint) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
417 ;; Try first in this order for the sake of languages with nested |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
418 ;; functions where several can end at the same place as with |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
419 ;; the offside rule, e.g. Python. |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
420 (beginning-of-defun) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
421 (setq beg (point)) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
422 (end-of-defun) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
423 (setq end (point)) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
424 (while (looking-at "^\n") |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
425 (forward-line 1)) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
426 (if (> (point) opoint) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
427 (progn |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
428 ;; We got the right defun. |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
429 (push-mark beg nil t) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
430 (goto-char end) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
431 (exchange-point-and-mark)) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
432 ;; beginning-of-defun moved back one defun |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
433 ;; so we got the wrong one. |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
434 (goto-char opoint) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
435 (end-of-defun) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
436 (push-mark (point) nil t) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
437 (beginning-of-defun)) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
438 (re-search-backward "^\n" (- (point) 1) t))))) |
84 | 439 |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
440 (defun narrow-to-defun (&optional arg) |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
441 "Make text outside current defun invisible. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
442 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
|
443 Optional ARG is ignored." |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
444 (interactive) |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
445 (save-excursion |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
446 (widen) |
55727
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
447 (let ((opoint (point)) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
448 beg end) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
449 ;; Try first in this order for the sake of languages with nested |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
450 ;; functions where several can end at the same place as with |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
451 ;; the offside rule, e.g. Python. |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
452 (beginning-of-defun) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
453 (setq beg (point)) |
53752
592ddd618234
(beginning-of-defun-raw, end-of-defun):
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
454 (end-of-defun) |
55727
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
455 (setq end (point)) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
456 (while (looking-at "^\n") |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
457 (forward-line 1)) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
458 (unless (> (point) opoint) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
459 ;; beginning-of-defun moved back one defun |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
460 ;; so we got the wrong one. |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
461 (goto-char opoint) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
462 (end-of-defun) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
463 (setq end (point)) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
464 (beginning-of-defun) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
465 (setq beg (point))) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
466 (goto-char end) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
467 (re-search-backward "^\n" (- (point) 1) t) |
babf5161afd4
(mark-defun, narrow-to-defun): If moving back then fwd gets a defun
Richard M. Stallman <rms@gnu.org>
parents:
55277
diff
changeset
|
468 (narrow-to-region beg end)))) |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
469 |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
470 (defvar insert-pair-alist |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
471 '((?\( ?\)) (?\[ ?\]) (?\{ ?\}) (?\< ?\>) (?\" ?\") (?\' ?\') (?\` ?\')) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
472 "Alist of paired characters inserted by `insert-pair'. |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
473 Each element looks like (OPEN-CHAR CLOSE-CHAR) or (COMMAND-CHAR |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
474 OPEN-CHAR CLOSE-CHAR). The characters OPEN-CHAR and CLOSE-CHAR |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
475 of the pair whose key is equal to the last input character with |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
476 or without modifiers, are inserted by `insert-pair'.") |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
477 |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
478 (defun insert-pair (&optional arg open close) |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
479 "Enclose following ARG sexps in a pair of OPEN and CLOSE characters. |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
480 Leave point after the first character. |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
481 A negative ARG encloses the preceding ARG sexps instead. |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
482 No argument is equivalent to zero: just insert characters |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
483 and leave point between. |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
484 If `parens-require-spaces' is non-nil, this command also inserts a space |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
485 before and after, depending on the surrounding characters. |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
486 If region is active, insert enclosing characters at region boundaries. |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
487 |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
488 If arguments OPEN and CLOSE are nil, the character pair is found |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
489 from the variable `insert-pair-alist' according to the last input |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
490 character with or without modifiers. If no character pair is |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
491 found in the variable `insert-pair-alist', then the last input |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
492 character is inserted ARG times. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
493 |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
494 This command assumes point is not in a string or comment." |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
495 (interactive "P") |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
496 (if (not (and open close)) |
101008
5aa3a4e05089
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
497 (let ((pair (or (assq last-command-event insert-pair-alist) |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
498 (assq (event-basic-type last-command-event) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
499 insert-pair-alist)))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
500 (if pair |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
501 (if (nth 2 pair) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
502 (setq open (nth 1 pair) close (nth 2 pair)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
503 (setq open (nth 0 pair) close (nth 1 pair)))))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
504 (if (and open close) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
505 (if (and transient-mark-mode mark-active) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
506 (progn |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
507 (save-excursion (goto-char (region-end)) (insert close)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
508 (save-excursion (goto-char (region-beginning)) (insert open))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
509 (if arg (setq arg (prefix-numeric-value arg)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
510 (setq arg 0)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
511 (cond ((> arg 0) (skip-chars-forward " \t")) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
512 ((< arg 0) (forward-sexp arg) (setq arg (- arg)))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
513 (and parens-require-spaces |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
514 (not (bobp)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
515 (memq (char-syntax (preceding-char)) (list ?w ?_ (char-syntax close))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
516 (insert " ")) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
517 (insert open) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
518 (save-excursion |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
519 (or (eq arg 0) (forward-sexp arg)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
520 (insert close) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
521 (and parens-require-spaces |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
522 (not (eobp)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
523 (memq (char-syntax (following-char)) (list ?w ?_ (char-syntax open))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
524 (insert " ")))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
525 (insert-char (event-basic-type last-command-event) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
526 (prefix-numeric-value arg)))) |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
527 |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
528 (defun insert-parentheses (&optional arg) |
61401
99b039f2f040
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
Luc Teirlinck <teirllm@auburn.edu>
parents:
59940
diff
changeset
|
529 "Enclose following ARG sexps in parentheses. |
99b039f2f040
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
Luc Teirlinck <teirllm@auburn.edu>
parents:
59940
diff
changeset
|
530 Leave point after open-paren. |
16410
454a13718b1f
(narrow-to-defun): Narrow to the same defun that `mark-defun' would make
Erik Naggum <erik@naggum.no>
parents:
15971
diff
changeset
|
531 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
|
532 No argument is equivalent to zero: just insert `()' and leave point between. |
5838 | 533 If `parens-require-spaces' is non-nil, this command also inserts a space |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
534 before and after, depending on the surrounding characters. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
535 If region is active, insert enclosing characters at region boundaries. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
536 |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
537 This command assumes point is not in a string or comment." |
84 | 538 (interactive "P") |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
539 (insert-pair arg ?\( ?\))) |
84 | 540 |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
541 (defun delete-pair () |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
542 "Delete a pair of characters enclosing the sexp that follows point." |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
543 (interactive) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
544 (save-excursion (forward-sexp 1) (delete-char -1)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
545 (delete-char 1)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
546 |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
547 (defun raise-sexp (&optional arg) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
548 "Raise ARG sexps higher up the tree." |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
549 (interactive "p") |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
550 (let ((s (if (and transient-mark-mode mark-active) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
551 (buffer-substring (region-beginning) (region-end)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
552 (buffer-substring |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
553 (point) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
554 (save-excursion (forward-sexp arg) (point)))))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
555 (backward-up-list 1) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
556 (delete-region (point) (save-excursion (forward-sexp 1) (point))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
557 (save-excursion (insert s)))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
558 |
84 | 559 (defun move-past-close-and-reindent () |
560 "Move past next `)', delete indentation before it, then indent after it." | |
561 (interactive) | |
562 (up-list 1) | |
563 (forward-char -1) | |
564 (while (save-excursion ; this is my contribution | |
565 (let ((before-paren (point))) | |
566 (back-to-indentation) | |
19781
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
567 (and (= (point) before-paren) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
568 (progn |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
569 ;; Move to end of previous line. |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
570 (beginning-of-line) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
571 (forward-char -1) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
572 ;; 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
|
573 (let ((end (point)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
574 state) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
575 (beginning-of-line) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
576 ;; Get state at start of line. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
577 (setq state (list 0 nil nil |
19781
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
578 (null (calculate-lisp-indent)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
579 nil nil nil nil |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
580 nil)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
581 ;; 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
|
582 (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
|
583 state)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
584 ;; Check not in string or comment. |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
585 (and (not (elt state 3)) (not (elt state 4)))))))) |
84 | 586 (delete-indentation)) |
587 (forward-char 1) | |
588 (newline-and-indent)) | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
589 |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
590 (defun check-parens () ; lame name? |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
591 "Check for unbalanced parentheses in the current buffer. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
592 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
|
593 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
|
594 current syntax table and will find unbalanced brackets or quotes as |
62455
072c8e0cc835
(check-parens): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
61401
diff
changeset
|
595 appropriate. (See Info node `(emacs)Parentheses'.) If imbalance is |
63624
f8e5c41bb4b8
(check-parens): Fix spellings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62455
diff
changeset
|
596 found, an error is signaled and point is left at the first unbalanced |
62455
072c8e0cc835
(check-parens): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents:
61401
diff
changeset
|
597 character." |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
598 (interactive) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
599 (condition-case data |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
600 ;; Buffer can't have more than (point-max) sexps. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
601 (scan-sexps (point-min) (point-max)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
602 (scan-error (goto-char (nth 2 data)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
603 ;; Could print (nth 1 data), which is either |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
604 ;; "Containing expression ends prematurely" or |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
605 ;; "Unbalanced parentheses", but those may not be so |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
606 ;; accurate/helpful, e.g. quotes may actually be |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
607 ;; mismatched. |
86454
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
608 (error "Unmatched bracket or quote")))) |
84 | 609 |
86454
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
610 (defun field-complete (table &optional predicate) |
104736
cc62eac5991f
(field-complete): Use minibuffer-complete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104024
diff
changeset
|
611 (let ((minibuffer-completion-table table) |
cc62eac5991f
(field-complete): Use minibuffer-complete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104024
diff
changeset
|
612 (minibuffer-completion-predicate predicate) |
cc62eac5991f
(field-complete): Use minibuffer-complete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104024
diff
changeset
|
613 ;; This made sense for lisp-complete-symbol, but for |
cc62eac5991f
(field-complete): Use minibuffer-complete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104024
diff
changeset
|
614 ;; field-complete, this is out of place. --Stef |
cc62eac5991f
(field-complete): Use minibuffer-complete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104024
diff
changeset
|
615 ;; (completion-annotate-function |
cc62eac5991f
(field-complete): Use minibuffer-complete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104024
diff
changeset
|
616 ;; (unless (eq predicate 'fboundp) |
cc62eac5991f
(field-complete): Use minibuffer-complete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104024
diff
changeset
|
617 ;; (lambda (str) |
cc62eac5991f
(field-complete): Use minibuffer-complete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104024
diff
changeset
|
618 ;; (if (fboundp (intern-soft str)) " <f>")))) |
cc62eac5991f
(field-complete): Use minibuffer-complete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104024
diff
changeset
|
619 ) |
cc62eac5991f
(field-complete): Use minibuffer-complete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104024
diff
changeset
|
620 (call-interactively 'minibuffer-complete))) |
86454
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
621 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
622 (defun lisp-complete-symbol (&optional predicate) |
6004
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
623 "Perform completion on Lisp symbol preceding point. |
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
624 Compare that symbol against the known Lisp symbols. |
42658
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
625 If no characters can be completed, display a list of possible completions. |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
626 Repeating the command at that point scrolls the list. |
6004
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
627 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
628 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
|
629 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
|
630 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
|
631 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
|
632 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
|
633 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
|
634 considered." |
84 | 635 (interactive) |
106482
806e9f7990d8
* minibuffer.el (completion-at-point-functions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106109
diff
changeset
|
636 (let* ((data (lisp-completion-at-point predicate)) |
806e9f7990d8
* minibuffer.el (completion-at-point-functions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106109
diff
changeset
|
637 (plist (nthcdr 3 data))) |
108143
624169215019
* emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108029
diff
changeset
|
638 (if (null data) |
624169215019
* emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108029
diff
changeset
|
639 (minibuffer-message "Nothing to complete") |
624169215019
* emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108029
diff
changeset
|
640 (let ((completion-annotate-function |
624169215019
* emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108029
diff
changeset
|
641 (plist-get plist :annotate-function))) |
106482
806e9f7990d8
* minibuffer.el (completion-at-point-functions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106109
diff
changeset
|
642 (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) |
108143
624169215019
* emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108029
diff
changeset
|
643 (plist-get plist :predicate)))))) |
108321
497767b878dc
* emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
644 |
106482
806e9f7990d8
* minibuffer.el (completion-at-point-functions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106109
diff
changeset
|
645 |
806e9f7990d8
* minibuffer.el (completion-at-point-functions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106109
diff
changeset
|
646 (defun lisp-completion-at-point (&optional predicate) |
108321
497767b878dc
* emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
647 "Function used for `completion-at-point-functions' in `emacs-lisp-mode'." |
106482
806e9f7990d8
* minibuffer.el (completion-at-point-functions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106109
diff
changeset
|
648 ;; FIXME: the `end' could be after point? |
110927
81696c97193b
* lisp/emacs-lisp/lisp.el (lisp-completion-at-point):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108321
diff
changeset
|
649 (with-syntax-table emacs-lisp-mode-syntax-table |
110931
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
650 (let* ((pos (point)) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
651 (beg (condition-case nil |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
652 (save-excursion |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
653 (backward-sexp 1) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
654 (skip-syntax-forward "'") |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
655 (point)) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
656 (scan-error pos))) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
657 (predicate |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
658 (or predicate |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
659 (save-excursion |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
660 (goto-char beg) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
661 (if (not (eq (char-before) ?\()) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
662 (lambda (sym) ;why not just nil ? -sm |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
663 (or (boundp sym) (fboundp sym) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
664 (symbol-plist sym))) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
665 ;; Looks like a funcall position. Let's double check. |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
666 (if (condition-case nil |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
667 (progn (up-list -2) (forward-char 1) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
668 (eq (char-after) ?\()) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
669 (error nil)) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
670 ;; If the first element of the parent list is an open |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
671 ;; paren we are probably not in a funcall position. |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
672 ;; Maybe a `let' varlist or something. |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
673 nil |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
674 ;; Else, we assume that a function name is expected. |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
675 'fboundp))))) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
676 (end |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
677 (unless (or (eq beg (point-max)) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
678 (member (char-syntax (char-after beg)) '(?\" ?\( ?\)))) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
679 (condition-case nil |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
680 (save-excursion |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
681 (goto-char beg) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
682 (forward-sexp 1) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
683 (when (>= (point) pos) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
684 (point))) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
685 (scan-error pos))))) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
686 (when end |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
687 (list beg end obarray |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
688 :predicate predicate |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
689 :annotate-function |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
690 (unless (eq predicate 'fboundp) |
2316b868d5be
Merge changes from emacs-23 branch.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
691 (lambda (str) (if (fboundp (intern-soft str)) " <f>")))))))) |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
215
diff
changeset
|
692 |
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
215
diff
changeset
|
693 ;;; lisp.el ends here |