Mercurial > emacs
annotate lisp/emacs-lisp/lisp.el @ 100482:266595dfa1bb
Add info about emacsclient starting the daemon.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Thu, 18 Dec 2008 08:24:37 +0000 |
parents | b1b204eafe54 |
children | a9dc0e7c3f2b |
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, |
79704 | 4 ;; 2005, 2006, 2007, 2008 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 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
8 |
84 | 9 ;; This file is part of GNU Emacs. |
10 | |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93138
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
84 | 12 ;; 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
|
13 ;; 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
|
14 ;; (at your option) any later version. |
84 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; 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
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
84 | 23 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
24 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
25 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
26 ;; 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
|
27 ;; applicable in other modes too. |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
28 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
29 ;;; Code: |
84 | 30 |
6369 | 31 ;; Note that this variable is used by non-lisp modes too. |
17665 | 32 (defcustom defun-prompt-regexp nil |
61401
99b039f2f040
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
Luc Teirlinck <teirllm@auburn.edu>
parents:
59940
diff
changeset
|
33 "*If non-nil, a regexp to ignore before a defun. |
6369 | 34 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
|
35 See function `beginning-of-defun'." |
19831
a517c846d04e
(defun-prompt-regexp): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19781
diff
changeset
|
36 :type '(choice (const nil) |
a517c846d04e
(defun-prompt-regexp): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19781
diff
changeset
|
37 regexp) |
17665 | 38 :group 'lisp) |
6973
7aa70fb3afa8
(defun-prompt-regexp): Make this variable buffer-local.
Karl Heuer <kwzh@gnu.org>
parents:
6420
diff
changeset
|
39 (make-variable-buffer-local 'defun-prompt-regexp) |
84 | 40 |
17665 | 41 (defcustom parens-require-spaces t |
92519
5ce65481d860
(parens-require-spaces): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
87649
diff
changeset
|
42 "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
|
43 This affects `insert-parentheses' and `insert-pair'." |
17665 | 44 :type 'boolean |
45 :group 'lisp) | |
3733
c1c105ffdd0c
(parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
46 |
31982
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
47 (defvar forward-sexp-function nil |
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
48 "If non-nil, `forward-sexp' delegates to this function. |
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
49 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
|
50 |
84 | 51 (defun forward-sexp (&optional arg) |
52 "Move forward across one balanced expression (sexp). | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
53 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
|
54 move backward across N balanced expressions. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
55 This command assumes point is not in a string or comment." |
99959
b1b204eafe54
Fix typo in previous commit.
Juanma Barranquero <lekktu@gmail.com>
parents:
99958
diff
changeset
|
56 (interactive "p") |
84 | 57 (or arg (setq arg 1)) |
31982
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
58 (if forward-sexp-function |
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
59 (funcall forward-sexp-function arg) |
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
60 (goto-char (or (scan-sexps (point) arg) (buffer-end arg))) |
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
61 (if (< arg 0) (backward-prefix-chars)))) |
84 | 62 |
63 (defun backward-sexp (&optional arg) | |
64 "Move backward across one balanced expression (sexp). | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
65 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
|
66 move forward across N balanced expressions. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
67 This command assumes point is not in a string or comment." |
84 | 68 (interactive "p") |
69 (or arg (setq arg 1)) | |
70 (forward-sexp (- arg))) | |
71 | |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
72 (defun mark-sexp (&optional arg allow-extend) |
84 | 73 "Set mark ARG sexps from point. |
215 | 74 The place mark goes is the same place \\[forward-sexp] would |
41291
b75e56ea3973
(mark-sexp): Mark more if repeated.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32814
diff
changeset
|
75 move to with the same argument. |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
76 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
|
77 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
|
78 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
|
79 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
|
80 (interactive "P\np") |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
81 (cond ((and allow-extend |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
82 (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
|
83 (and transient-mark-mode mark-active))) |
57457
8c6dae33cdc3
(mark-sexp): Preserve direction when repeating.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56924
diff
changeset
|
84 (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
|
85 (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
|
86 (set-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
87 (save-excursion |
58918
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
88 (goto-char (mark)) |
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
89 (forward-sexp arg) |
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
90 (point)))) |
43301
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
91 (t |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
92 (push-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
93 (save-excursion |
57457
8c6dae33cdc3
(mark-sexp): Preserve direction when repeating.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56924
diff
changeset
|
94 (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
|
95 (point)) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
96 nil t)))) |
84 | 97 |
98 (defun forward-list (&optional arg) | |
99 "Move forward across one balanced group of parentheses. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
100 With ARG, do it that many times. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
101 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
|
102 This command assumes point is not in a string or comment." |
84 | 103 (interactive "p") |
104 (or arg (setq arg 1)) | |
105 (goto-char (or (scan-lists (point) arg 0) (buffer-end arg)))) | |
106 | |
107 (defun backward-list (&optional arg) | |
108 "Move backward across one balanced group of parentheses. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
109 With ARG, do it that many times. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
110 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
|
111 This command assumes point is not in a string or comment." |
84 | 112 (interactive "p") |
113 (or arg (setq arg 1)) | |
114 (forward-list (- arg))) | |
115 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
116 (defun down-list (&optional arg) |
84 | 117 "Move forward down one level of parentheses. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
118 With ARG, do this that many times. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
119 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
|
120 This command assumes point is not in a string or comment." |
84 | 121 (interactive "p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
122 (or arg (setq arg 1)) |
84 | 123 (let ((inc (if (> arg 0) 1 -1))) |
124 (while (/= arg 0) | |
125 (goto-char (or (scan-lists (point) inc -1) (buffer-end arg))) | |
126 (setq arg (- arg inc))))) | |
127 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
128 (defun backward-up-list (&optional arg) |
84 | 129 "Move backward out of one level of parentheses. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
130 With ARG, do this that many times. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
131 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
|
132 This command assumes point is not in a string or comment." |
84 | 133 (interactive "p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
134 (up-list (- (or arg 1)))) |
84 | 135 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
136 (defun up-list (&optional arg) |
84 | 137 "Move forward out of one level of parentheses. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
138 With ARG, do this that many times. |
99958
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
139 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
|
140 This command assumes point is not in a string or comment." |
84 | 141 (interactive "p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
142 (or arg (setq arg 1)) |
84 | 143 (let ((inc (if (> arg 0) 1 -1))) |
144 (while (/= arg 0) | |
145 (goto-char (or (scan-lists (point) inc 1) (buffer-end arg))) | |
146 (setq arg (- arg inc))))) | |
147 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
148 (defun kill-sexp (&optional arg) |
59602
99bf07f49031
(backward-kill-sexp, kill-sexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
59177
diff
changeset
|
149 "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
|
150 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
|
151 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
|
152 This command assumes point is not in a string or comment." |
84 | 153 (interactive "p") |
154 (let ((opoint (point))) | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
155 (forward-sexp (or arg 1)) |
84 | 156 (kill-region opoint (point)))) |
157 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
158 (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
|
159 "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
|
160 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
|
161 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
|
162 This command assumes point is not in a string or comment." |
84 | 163 (interactive "p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
164 (kill-sexp (- (or arg 1)))) |
56924
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
165 |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
166 ;; After Zmacs: |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
167 (defun kill-backward-up-list (&optional arg) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
168 "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
|
169 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
|
170 forms to be removed. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
171 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
|
172 (interactive "*p") |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
173 (let ((current-sexp (thing-at-point 'sexp))) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
174 (if current-sexp |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
175 (save-excursion |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
176 (backward-up-list arg) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
177 (kill-sexp) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
178 (insert current-sexp)) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
179 (error "Not at a sexp")))) |
84 | 180 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
181 (defvar beginning-of-defun-function nil |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
182 "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
|
183 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
|
184 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
|
185 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
|
186 needs. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
187 |
86353
480a058ecb2f
(beginning-of-defun-raw): Pass `arg' down to beginning-of-defun-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78217
diff
changeset
|
188 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
|
189 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
|
190 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
|
191 the body of the defun.") |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
192 |
84 | 193 (defun beginning-of-defun (&optional arg) |
194 "Move backward to the beginning of a defun. | |
97431
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
195 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
|
196 to the ARGth following beginning of defun. |
84 | 197 |
97431
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
198 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
|
199 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
|
200 |
97431
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
201 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
|
202 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
|
203 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
|
204 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
|
205 the open-parenthesis. If `defun-prompt-regexp' and |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
206 `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
|
207 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
|
208 |
97431
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
209 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
|
210 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
|
211 defun's beginning. |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
212 |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
213 Regardless of the values of `defun-prompt-regexp' and |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
214 `beginning-of-defun-function', point always moves to the |
02fedff190ed
(beginning-of-defun): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94655
diff
changeset
|
215 beginning of the line whenever the search is successful." |
6397
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
216 (interactive "p") |
58962
eb752b1a84b1
(beginning-of-defun, end-of-defun): Don't
Kim F. Storm <storm@cua.dk>
parents:
58918
diff
changeset
|
217 (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
|
218 (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
|
219 (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
|
220 (push-mark)) |
6397
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
221 (and (beginning-of-defun-raw arg) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
222 (progn (beginning-of-line) t))) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
223 |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
224 (defun beginning-of-defun-raw (&optional arg) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
225 "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
|
226 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
|
227 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
|
228 is non-nil. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
229 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
230 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
|
231 is called as a function to find the defun's beginning." |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
232 (interactive "p") ; change this to "P", maybe, if we ever come to pass ARG |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
233 ; 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
|
234 (unless arg (setq arg 1)) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
235 (cond |
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
236 (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
|
237 (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
|
238 (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
|
239 ;; 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
|
240 ;; 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
|
241 ;; 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
|
242 ;; 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
|
243 ;; 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
|
244 ;; 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
|
245 ;; 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
|
246 (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
|
247 (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
|
248 (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
|
249 (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
|
250 ;; 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
|
251 ;; 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
|
252 (end-of-defun (- arg)))))) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
253 |
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
254 ((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
|
255 (and (< arg 0) (not (eobp)) (forward-char 1)) |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
256 (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
|
257 (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
|
258 "^\\s(\\|" "") |
51084
c27a29e35a85
(beginning-of-defun-raw): Use shy-group.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47924
diff
changeset
|
259 "\\(?:" defun-prompt-regexp "\\)\\s(") |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
260 "^\\s(") |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
261 nil 'move arg) |
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
262 (progn (goto-char (1- (match-end 0)))) t)) |
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
263 |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
264 ;; 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
|
265 ;; 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
|
266 ;; 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
|
267 ;; |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
268 ;; 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
|
269 ;; 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
|
270 ;; 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
|
271 ;; 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
|
272 |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
273 ((eq arg 0)) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
274 (t |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
275 (let ((floor (point-min)) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
276 (ceiling (point-max)) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
277 (arg-+ve (> arg 0))) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
278 (save-restriction |
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
279 (widen) |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
280 (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
|
281 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
|
282 (syntax-ppss))) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
283 ;; 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
|
284 encl-pos) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
285 ;; 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
|
286 ;; 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
|
287 (when (nth 8 ppss) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
288 (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
|
289 (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
|
290 (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
|
291 (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
|
292 |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
293 (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
|
294 (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
|
295 (setq arg (1+ arg))) |
73832
adc185200028
2006-11-08 Alan Mackenzie <acm@muc.de>
Alan Mackenzie <acm@muc.de>
parents:
68648
diff
changeset
|
296 |
74708
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
297 (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
|
298 (progn |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
299 (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
|
300 (if arg-+ve |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
301 (if (>= (point) floor) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
302 t |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
303 (goto-char floor) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
304 nil) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
305 ;; 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
|
306 (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
|
307 (if (<= (point) ceiling) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
308 t |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
309 (goto-char ceiling) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
310 nil))) |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
311 (error |
ba0b39efd315
(beginning-of-defun-raw): Optimise (for speed) the case when
Chong Yidong <cyd@stupidchicken.com>
parents:
74466
diff
changeset
|
312 (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
|
313 nil)))))))) |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
314 |
86454
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
315 (defvar end-of-defun-function #'forward-sexp |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
316 "Function for `end-of-defun' to call. |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
317 This is used to find the end of the defun. |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
318 It is called with no argument, right after calling `beginning-of-defun-raw'. |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
319 So the function can assume that point is at the beginning of the defun body.") |
84 | 320 |
321 (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
|
322 "Return the \"far end\" position of the buffer, in direction ARG. |
59940 | 323 If ARG is positive, that's the end of the buffer. |
324 Otherwise, that's the beginning of the buffer." | |
84 | 325 (if (> arg 0) (point-max) (point-min))) |
326 | |
327 (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
|
328 "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
|
329 With argument, do it that many times. |
84 | 330 Negative argument -N means move back to Nth preceding end of defun. |
331 | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
332 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
|
333 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
|
334 `beginning-of-defun'. |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
335 |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
336 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
|
337 is called as a function to find the defun's end." |
84 | 338 (interactive "p") |
58962
eb752b1a84b1
(beginning-of-defun, end-of-defun): Don't
Kim F. Storm <storm@cua.dk>
parents:
58918
diff
changeset
|
339 (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
|
340 (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
|
341 (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
|
342 (push-mark)) |
54876
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
343 (if (or (null arg) (= arg 0)) (setq arg 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
|
344 (while (> arg 0) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
345 (let ((pos (point))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
346 (end-of-line 1) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
347 (beginning-of-defun-raw 1) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
348 (while (unless (eobp) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
349 (funcall end-of-defun-function) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
350 (skip-chars-forward " \t") |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
351 (if (looking-at "\\s<\\|\n") |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
352 (forward-line 1)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
353 ;; If we started after the end of the previous function, then |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
354 ;; try again with the next one. |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
355 (when (<= (point) pos) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
356 (or (bobp) (forward-char -1)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
357 (beginning-of-defun-raw -1) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
358 'try-again)))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
359 (setq arg (1- arg))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
360 (while (< arg 0) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
361 (let ((pos (point))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
362 (while (unless (bobp) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
363 (beginning-of-line 1) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
364 (beginning-of-defun-raw 1) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
365 (let ((beg (point))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
366 (funcall end-of-defun-function) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
367 (skip-chars-forward " \t") |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
368 (if (looking-at "\\s<\\|\n") |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
369 (forward-line 1)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
370 ;; If we started from within the function just found, then |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
371 ;; try again with the previous one. |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
372 (when (>= (point) pos) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
373 (goto-char beg) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
374 'try-again))))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
375 (setq arg (1+ arg)))) |
84 | 376 |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
377 (defun mark-defun (&optional allow-extend) |
84 | 378 "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
|
379 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
|
380 |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
381 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
|
382 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
|
383 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
|
384 (interactive "p") |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
385 (cond ((and allow-extend |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
386 (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
|
387 (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
|
388 (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
|
389 (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
|
390 (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
|
391 (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
|
392 (point)))) |
cc3ba2d0d471
* emacs-lisp/lisp.el (mark-defun): Don't leave multiple marks
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43301
diff
changeset
|
393 (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
|
394 (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
|
395 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
|
396 (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
|
397 ;; 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
|
398 ;; 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
|
399 ;; 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
|
400 (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
|
401 (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
|
402 (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
|
403 (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
|
404 (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
|
405 (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
|
406 (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
|
407 (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
|
408 ;; 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
|
409 (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
|
410 (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
|
411 (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
|
412 ;; 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
|
413 ;; 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
|
414 (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
|
415 (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
|
416 (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
|
417 (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
|
418 (re-search-backward "^\n" (- (point) 1) t))))) |
84 | 419 |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
420 (defun narrow-to-defun (&optional arg) |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
421 "Make text outside current defun invisible. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
422 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
|
423 Optional ARG is ignored." |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
424 (interactive) |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
425 (save-excursion |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
426 (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
|
427 (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
|
428 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
|
429 ;; 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
|
430 ;; 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
|
431 ;; 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
|
432 (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
|
433 (setq beg (point)) |
53752
592ddd618234
(beginning-of-defun-raw, end-of-defun):
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
434 (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
|
435 (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
|
436 (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
|
437 (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
|
438 (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
|
439 ;; 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
|
440 ;; 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
|
441 (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
|
442 (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
|
443 (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
|
444 (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
|
445 (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
|
446 (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
|
447 (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
|
448 (narrow-to-region beg end)))) |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
449 |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
450 (defvar insert-pair-alist |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
451 '((?\( ?\)) (?\[ ?\]) (?\{ ?\}) (?\< ?\>) (?\" ?\") (?\' ?\') (?\` ?\')) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
452 "Alist of paired characters inserted by `insert-pair'. |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
453 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
|
454 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
|
455 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
|
456 or without modifiers, are inserted by `insert-pair'.") |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
457 |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
458 (defun insert-pair (&optional arg open close) |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
459 "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
|
460 Leave point after the first character. |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
461 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
|
462 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
|
463 and leave point between. |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
464 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
|
465 before and after, depending on the surrounding characters. |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
466 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
|
467 |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
468 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
|
469 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
|
470 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
|
471 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
|
472 character is inserted ARG times. |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
473 |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
474 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
|
475 (interactive "P") |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
476 (if (not (and open close)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
477 (let ((pair (or (assq last-command-char insert-pair-alist) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
478 (assq (event-basic-type last-command-event) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
479 insert-pair-alist)))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
480 (if pair |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
481 (if (nth 2 pair) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
482 (setq open (nth 1 pair) close (nth 2 pair)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
483 (setq open (nth 0 pair) close (nth 1 pair)))))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
484 (if (and open close) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
485 (if (and transient-mark-mode mark-active) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
486 (progn |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
487 (save-excursion (goto-char (region-end)) (insert close)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
488 (save-excursion (goto-char (region-beginning)) (insert open))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
489 (if arg (setq arg (prefix-numeric-value arg)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
490 (setq arg 0)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
491 (cond ((> arg 0) (skip-chars-forward " \t")) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
492 ((< arg 0) (forward-sexp arg) (setq arg (- arg)))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
493 (and parens-require-spaces |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
494 (not (bobp)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
495 (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
|
496 (insert " ")) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
497 (insert open) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
498 (save-excursion |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
499 (or (eq arg 0) (forward-sexp arg)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
500 (insert close) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
501 (and parens-require-spaces |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
502 (not (eobp)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
503 (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
|
504 (insert " ")))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
505 (insert-char (event-basic-type last-command-event) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
506 (prefix-numeric-value arg)))) |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
507 |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
508 (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
|
509 "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
|
510 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
|
511 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
|
512 No argument is equivalent to zero: just insert `()' and leave point between. |
5838 | 513 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
|
514 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
|
515 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
|
516 |
42c2049ff2f6
(forward-sexp, backward-sexp, mark-sexp)
Alan Mackenzie <acm@muc.de>
parents:
97477
diff
changeset
|
517 This command assumes point is not in a string or comment." |
84 | 518 (interactive "P") |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
519 (insert-pair arg ?\( ?\))) |
84 | 520 |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
521 (defun delete-pair () |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
522 "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
|
523 (interactive) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
524 (save-excursion (forward-sexp 1) (delete-char -1)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
525 (delete-char 1)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
526 |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
527 (defun raise-sexp (&optional arg) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
528 "Raise ARG sexps higher up the tree." |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
529 (interactive "p") |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
530 (let ((s (if (and transient-mark-mode mark-active) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
531 (buffer-substring (region-beginning) (region-end)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
532 (buffer-substring |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
533 (point) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
534 (save-excursion (forward-sexp arg) (point)))))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
535 (backward-up-list 1) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
536 (delete-region (point) (save-excursion (forward-sexp 1) (point))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
537 (save-excursion (insert s)))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
538 |
84 | 539 (defun move-past-close-and-reindent () |
540 "Move past next `)', delete indentation before it, then indent after it." | |
541 (interactive) | |
542 (up-list 1) | |
543 (forward-char -1) | |
544 (while (save-excursion ; this is my contribution | |
545 (let ((before-paren (point))) | |
546 (back-to-indentation) | |
19781
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
547 (and (= (point) before-paren) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
548 (progn |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
549 ;; Move to end of previous line. |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
550 (beginning-of-line) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
551 (forward-char -1) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
552 ;; 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
|
553 (let ((end (point)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
554 state) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
555 (beginning-of-line) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
556 ;; Get state at start of line. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
557 (setq state (list 0 nil nil |
19781
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
558 (null (calculate-lisp-indent)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
559 nil nil nil nil |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
560 nil)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
561 ;; 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
|
562 (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
|
563 state)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
564 ;; Check not in string or comment. |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
565 (and (not (elt state 3)) (not (elt state 4)))))))) |
84 | 566 (delete-indentation)) |
567 (forward-char 1) | |
568 (newline-and-indent)) | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
569 |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
570 (defun check-parens () ; lame name? |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
571 "Check for unbalanced parentheses in the current buffer. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
572 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
|
573 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
|
574 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
|
575 appropriate. (See Info node `(emacs)Parentheses'.) If imbalance is |
63624
f8e5c41bb4b8
(check-parens): Fix spellings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62455
diff
changeset
|
576 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
|
577 character." |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
578 (interactive) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
579 (condition-case data |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
580 ;; Buffer can't have more than (point-max) sexps. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
581 (scan-sexps (point-min) (point-max)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
582 (scan-error (goto-char (nth 2 data)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
583 ;; Could print (nth 1 data), which is either |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
584 ;; "Containing expression ends prematurely" or |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
585 ;; "Unbalanced parentheses", but those may not be so |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
586 ;; accurate/helpful, e.g. quotes may actually be |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
587 ;; 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
|
588 (error "Unmatched bracket or quote")))) |
84 | 589 |
86454
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
590 (defun field-complete (table &optional predicate) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
591 (let* ((pattern (field-string-no-properties)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
592 (completion (try-completion pattern table predicate))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
593 (cond ((eq completion t)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
594 ((null completion) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
595 (message "Can't find completion for \"%s\"" pattern) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
596 (ding)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
597 ((not (string= pattern completion)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
598 (delete-region (field-beginning) (field-end)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
599 (insert completion) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
600 ;; Don't leave around a completions buffer that's out of date. |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
601 (let ((win (get-buffer-window "*Completions*" 0))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
602 (if win (with-selected-window win (bury-buffer))))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
603 (t |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
604 (let ((minibuf-is-in-use |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
605 (eq (minibuffer-window) (selected-window)))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
606 (unless minibuf-is-in-use |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
607 (message "Making completion list...")) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
608 (let ((list (all-completions pattern table predicate))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
609 (setq list (sort list 'string<)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
610 (or (eq predicate 'fboundp) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
611 (let (new) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
612 (while list |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
613 (setq new (cons (if (fboundp (intern (car list))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
614 (list (car list) " <f>") |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
615 (car list)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
616 new)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
617 (setq list (cdr list))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
618 (setq list (nreverse new)))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
619 (if (> (length list) 1) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
620 (with-output-to-temp-buffer "*Completions*" |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
621 (display-completion-list list pattern)) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
622 ;; Don't leave around a completions buffer that's |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
623 ;; out of date. |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
624 (let ((win (get-buffer-window "*Completions*" 0))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
625 (if win (with-selected-window win (bury-buffer)))))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
626 (unless minibuf-is-in-use |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
627 (message "Making completion list...%s" "done"))))))) |
ebd4b500132c
(end-of-defun): Restructure so that end-of-defun-function is called
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
86353
diff
changeset
|
628 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
629 (defun lisp-complete-symbol (&optional predicate) |
6004
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
630 "Perform completion on Lisp symbol preceding point. |
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
631 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
|
632 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
|
633 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
|
634 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
635 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
|
636 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
|
637 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
|
638 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
|
639 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
|
640 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
|
641 considered." |
84 | 642 (interactive) |
76768
36178b78d004
(lisp-complete-symbol): Make get-buffer-window find windows in other frames.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75346
diff
changeset
|
643 (let ((window (get-buffer-window "*Completions*" 0))) |
42658
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
644 (if (and (eq last-command this-command) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
645 window (window-live-p window) (window-buffer window) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
646 (buffer-name (window-buffer window))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
647 ;; If this command was repeated, and |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
648 ;; there's a fresh completion window with a live buffer, |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
649 ;; and this command is repeated, scroll that window. |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
650 (with-current-buffer (window-buffer window) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
651 (if (pos-visible-in-window-p (point-max) window) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
652 (set-window-start window (point-min)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
653 (save-selected-window |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
654 (select-window window) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
655 (scroll-up)))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
656 |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
657 ;; Do completion. |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
658 (let* ((end (point)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
659 (beg (with-syntax-table emacs-lisp-mode-syntax-table |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
660 (save-excursion |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
661 (backward-sexp 1) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
662 (while (= (char-syntax (following-char)) ?\') |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
663 (forward-char 1)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
664 (point)))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
665 (pattern (buffer-substring-no-properties beg end)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
666 (predicate |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
667 (or predicate |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
668 (save-excursion |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
669 (goto-char beg) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
670 (if (not (eq (char-before) ?\()) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
671 (lambda (sym) ;why not just nil ? -sm |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
672 (or (boundp sym) (fboundp sym) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
673 (symbol-plist sym))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
674 ;; Looks like a funcall position. Let's double check. |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
675 (if (condition-case nil |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
676 (progn (up-list -2) (forward-char 1) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
677 (eq (char-after) ?\()) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
678 (error nil)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
679 ;; If the first element of the parent list is an open |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
680 ;; parenthesis we are probably not in a funcall position. |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
681 ;; Maybe a `let' varlist or something. |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
682 nil |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
683 ;; Else, we assume that a function name is expected. |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
684 'fboundp))))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
685 (completion (try-completion pattern obarray predicate))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
686 (cond ((eq completion t)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
687 ((null completion) |
93138 | 688 (if (window-minibuffer-p (selected-window)) |
689 (minibuffer-message (format " [No completions of \"%s\"]" pattern)) | |
690 (message "Can't find completion for \"%s\"" pattern)) | |
42658
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
691 (ding)) |
67728
bffc4c57eda9
(lisp-complete-symbol): Mostly undo the change by Kevin Rodgers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67721
diff
changeset
|
692 ((not (string= pattern completion)) |
bffc4c57eda9
(lisp-complete-symbol): Mostly undo the change by Kevin Rodgers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67721
diff
changeset
|
693 (delete-region beg end) |
bffc4c57eda9
(lisp-complete-symbol): Mostly undo the change by Kevin Rodgers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67721
diff
changeset
|
694 (insert completion) |
67730
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
695 ;; Don't leave around a completions buffer that's out of date. |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
696 (let ((win (get-buffer-window "*Completions*" 0))) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
697 (if win (with-selected-window win (bury-buffer))))) |
42658
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
698 (t |
67730
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
699 (let ((minibuf-is-in-use |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
700 (eq (minibuffer-window) (selected-window)))) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
701 (unless minibuf-is-in-use |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
702 (message "Making completion list...")) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
703 (let ((list (all-completions pattern obarray predicate))) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
704 (setq list (sort list 'string<)) |
97474
b7077a582a3d
(lisp-complete-symbol): Supply match-size to display-completion-list.
Chong Yidong <cyd@stupidchicken.com>
parents:
97431
diff
changeset
|
705 (unless (eq predicate 'fboundp) |
b7077a582a3d
(lisp-complete-symbol): Supply match-size to display-completion-list.
Chong Yidong <cyd@stupidchicken.com>
parents:
97431
diff
changeset
|
706 (let (new) |
b7077a582a3d
(lisp-complete-symbol): Supply match-size to display-completion-list.
Chong Yidong <cyd@stupidchicken.com>
parents:
97431
diff
changeset
|
707 (dolist (compl list) |
b7077a582a3d
(lisp-complete-symbol): Supply match-size to display-completion-list.
Chong Yidong <cyd@stupidchicken.com>
parents:
97431
diff
changeset
|
708 (push (if (fboundp (intern compl)) |
b7077a582a3d
(lisp-complete-symbol): Supply match-size to display-completion-list.
Chong Yidong <cyd@stupidchicken.com>
parents:
97431
diff
changeset
|
709 (list compl " <f>") |
b7077a582a3d
(lisp-complete-symbol): Supply match-size to display-completion-list.
Chong Yidong <cyd@stupidchicken.com>
parents:
97431
diff
changeset
|
710 compl) |
b7077a582a3d
(lisp-complete-symbol): Supply match-size to display-completion-list.
Chong Yidong <cyd@stupidchicken.com>
parents:
97431
diff
changeset
|
711 new)) |
b7077a582a3d
(lisp-complete-symbol): Supply match-size to display-completion-list.
Chong Yidong <cyd@stupidchicken.com>
parents:
97431
diff
changeset
|
712 (setq list (nreverse new)))) |
67730
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
713 (if (> (length list) 1) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
714 (with-output-to-temp-buffer "*Completions*" |
97477 | 715 (display-completion-list list pattern)) |
67730
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
716 ;; Don't leave around a completions buffer that's |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
717 ;; out of date. |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
718 (let ((win (get-buffer-window "*Completions*" 0))) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
719 (if win (with-selected-window win (bury-buffer)))))) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
720 (unless minibuf-is-in-use |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
721 (message "Making completion list...%s" "done"))))))))) |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
215
diff
changeset
|
722 |
67721
d372bc6eff1d
(lisp-complete-symbol): Don't call delete-windows-on with an inexistent buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67472
diff
changeset
|
723 ;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
215
diff
changeset
|
724 ;;; lisp.el ends here |