Mercurial > emacs
annotate lisp/emacs-lisp/lisp.el @ 71356:a183bff9cb83
(mac-text-encoding-ascii): New constant.
(mac-utxt-to-string): Use it.
(mac-ts-update-active-input-area): Use mac-ae-number.
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
---|---|
date | Fri, 16 Jun 2006 08:07:59 +0000 |
parents | 067115a6e738 |
children | adc185200028 c5406394f567 |
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 |
64751
5b1a238fcbb4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64085
diff
changeset
|
3 ;; Copyright (C) 1985, 1986, 1994, 2000, 2002, 2003, 2004, |
68648
067115a6e738
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
67730
diff
changeset
|
4 ;; 2005, 2006 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 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
13 ;; the Free Software Foundation; either version 2, or (at your option) |
84 | 14 ;; any later version. |
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 | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
84 | 25 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
26 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
27 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
28 ;; 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
|
29 ;; applicable in other modes too. |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
30 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
31 ;;; Code: |
84 | 32 |
6369 | 33 ;; Note that this variable is used by non-lisp modes too. |
17665 | 34 (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
|
35 "*If non-nil, a regexp to ignore before a defun. |
6369 | 36 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
|
37 See function `beginning-of-defun'." |
19831
a517c846d04e
(defun-prompt-regexp): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19781
diff
changeset
|
38 :type '(choice (const nil) |
a517c846d04e
(defun-prompt-regexp): Fix customize type.
Richard M. Stallman <rms@gnu.org>
parents:
19781
diff
changeset
|
39 regexp) |
17665 | 40 :group 'lisp) |
6973
7aa70fb3afa8
(defun-prompt-regexp): Make this variable buffer-local.
Karl Heuer <kwzh@gnu.org>
parents:
6420
diff
changeset
|
41 (make-variable-buffer-local 'defun-prompt-regexp) |
84 | 42 |
17665 | 43 (defcustom parens-require-spaces t |
61401
99b039f2f040
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
Luc Teirlinck <teirllm@auburn.edu>
parents:
59940
diff
changeset
|
44 "If non-nil, `insert-parentheses' inserts whitespace as needed." |
17665 | 45 :type 'boolean |
46 :group 'lisp) | |
3733
c1c105ffdd0c
(parens-dont-require-spaces): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
47 |
31982
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
48 (defvar forward-sexp-function nil |
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
49 "If non-nil, `forward-sexp' delegates to this function. |
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
50 Should take the same arguments and behave similarly to `forward-sexp'.") |
ed0ed1c70495
(lisp-complete-symbol):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30979
diff
changeset
|
51 |
84 | 52 (defun forward-sexp (&optional arg) |
53 "Move forward across one balanced expression (sexp). | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
54 With ARG, do it that many times. Negative arg -N means |
215 | 55 move backward across N balanced expressions." |
84 | 56 (interactive "p") |
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 |
215 | 66 move forward across N balanced expressions." |
84 | 67 (interactive "p") |
68 (or arg (setq arg 1)) | |
69 (forward-sexp (- arg))) | |
70 | |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
71 (defun mark-sexp (&optional arg allow-extend) |
84 | 72 "Set mark ARG sexps from point. |
215 | 73 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
|
74 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
|
75 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
|
76 or (in Transient Mark mode) if the mark is active, |
58918
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
77 it marks the next ARG sexps after the ones already marked." |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
78 (interactive "P\np") |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
79 (cond ((and allow-extend |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
80 (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
|
81 (and transient-mark-mode mark-active))) |
57457
8c6dae33cdc3
(mark-sexp): Preserve direction when repeating.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56924
diff
changeset
|
82 (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
|
83 (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
|
84 (set-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
85 (save-excursion |
58918
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
86 (goto-char (mark)) |
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
87 (forward-sexp arg) |
2ee970dcd072
* emacs-lisp/lisp.el (beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
57457
diff
changeset
|
88 (point)))) |
43301
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
89 (t |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
90 (push-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
91 (save-excursion |
57457
8c6dae33cdc3
(mark-sexp): Preserve direction when repeating.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56924
diff
changeset
|
92 (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
|
93 (point)) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42658
diff
changeset
|
94 nil t)))) |
84 | 95 |
96 (defun forward-list (&optional arg) | |
97 "Move forward across one balanced group of parentheses. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
98 With ARG, do it that many times. |
84 | 99 Negative arg -N means move backward across N groups of parentheses." |
100 (interactive "p") | |
101 (or arg (setq arg 1)) | |
102 (goto-char (or (scan-lists (point) arg 0) (buffer-end arg)))) | |
103 | |
104 (defun backward-list (&optional arg) | |
105 "Move backward across one balanced group of parentheses. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
106 With ARG, do it that many times. |
84 | 107 Negative arg -N means move forward across N groups of parentheses." |
108 (interactive "p") | |
109 (or arg (setq arg 1)) | |
110 (forward-list (- arg))) | |
111 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
112 (defun down-list (&optional arg) |
84 | 113 "Move forward down one level of parentheses. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
114 With ARG, do this that many times. |
32456
ec203cfd2e41
(down-list, backward-up-list, up-list): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
32047
diff
changeset
|
115 A negative argument means move backward but still go down a level." |
84 | 116 (interactive "p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
117 (or arg (setq arg 1)) |
84 | 118 (let ((inc (if (> arg 0) 1 -1))) |
119 (while (/= arg 0) | |
120 (goto-char (or (scan-lists (point) inc -1) (buffer-end arg))) | |
121 (setq arg (- arg inc))))) | |
122 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
123 (defun backward-up-list (&optional arg) |
84 | 124 "Move backward out of one level of parentheses. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
125 With ARG, do this that many times. |
32456
ec203cfd2e41
(down-list, backward-up-list, up-list): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
32047
diff
changeset
|
126 A negative argument means move forward but still to a less deep spot." |
84 | 127 (interactive "p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
128 (up-list (- (or arg 1)))) |
84 | 129 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
130 (defun up-list (&optional arg) |
84 | 131 "Move forward out of one level of parentheses. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
132 With ARG, do this that many times. |
32456
ec203cfd2e41
(down-list, backward-up-list, up-list): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
32047
diff
changeset
|
133 A negative argument means move backward but still to a less deep spot." |
84 | 134 (interactive "p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
135 (or arg (setq arg 1)) |
84 | 136 (let ((inc (if (> arg 0) 1 -1))) |
137 (while (/= arg 0) | |
138 (goto-char (or (scan-lists (point) inc 1) (buffer-end arg))) | |
139 (setq arg (- arg inc))))) | |
140 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
141 (defun kill-sexp (&optional arg) |
59602
99bf07f49031
(backward-kill-sexp, kill-sexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
59177
diff
changeset
|
142 "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
|
143 With ARG, kill that many sexps after point. |
99bf07f49031
(backward-kill-sexp, kill-sexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
59177
diff
changeset
|
144 Negative arg -N means kill N sexps before point." |
84 | 145 (interactive "p") |
146 (let ((opoint (point))) | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
147 (forward-sexp (or arg 1)) |
84 | 148 (kill-region opoint (point)))) |
149 | |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
150 (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
|
151 "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
|
152 With ARG, kill that many sexps before point. |
99bf07f49031
(backward-kill-sexp, kill-sexp): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
59177
diff
changeset
|
153 Negative arg -N means kill N sexps after point." |
84 | 154 (interactive "p") |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
155 (kill-sexp (- (or arg 1)))) |
56924
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
156 |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
157 ;; After Zmacs: |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
158 (defun kill-backward-up-list (&optional arg) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
159 "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
|
160 A prefix argument ARG causes the relevant number of surrounding |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
161 forms to be removed." |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
162 (interactive "*p") |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
163 (let ((current-sexp (thing-at-point 'sexp))) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
164 (if current-sexp |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
165 (save-excursion |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
166 (backward-up-list arg) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
167 (kill-sexp) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
168 (insert current-sexp)) |
bca93997a4d7
(kill-backward-up-list): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
56876
diff
changeset
|
169 (error "Not at a sexp")))) |
84 | 170 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
171 (defvar beginning-of-defun-function nil |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
172 "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
|
173 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
|
174 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
|
175 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
|
176 needs. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
177 |
52287
aece5dd1efda
(beginning-of-defun-function): Doc fix.
Dave Love <fx@gnu.org>
parents:
51084
diff
changeset
|
178 The function (of no args) should go to the line on which the current |
aece5dd1efda
(beginning-of-defun-function): Doc fix.
Dave Love <fx@gnu.org>
parents:
51084
diff
changeset
|
179 defun starts, and return non-nil, or should return nil if it can't |
aece5dd1efda
(beginning-of-defun-function): Doc fix.
Dave Love <fx@gnu.org>
parents:
51084
diff
changeset
|
180 find the beginning.") |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
181 |
84 | 182 (defun beginning-of-defun (&optional arg) |
183 "Move backward to the beginning of a defun. | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
184 With ARG, do it that many times. Negative arg -N |
84 | 185 means move forward to Nth following beginning of defun. |
186 Returns t unless search stops due to beginning or end of buffer. | |
187 | |
47924
d9a861a5b9d6
(beginning-of-defun): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
43384
diff
changeset
|
188 Normally a defun starts when there is a char with open-parenthesis |
84 | 189 syntax at the beginning of a line. If `defun-prompt-regexp' is |
190 non-nil, then a string which matches that regexp may precede the | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
191 open-parenthesis, and point ends up at the beginning of the line. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
192 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
193 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
|
194 is called as a function to find the defun's beginning." |
6397
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
195 (interactive "p") |
58962
eb752b1a84b1
(beginning-of-defun, end-of-defun): Don't
Kim F. Storm <storm@cua.dk>
parents:
58918
diff
changeset
|
196 (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
|
197 (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
|
198 (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
|
199 (push-mark)) |
6397
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
200 (and (beginning-of-defun-raw arg) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
201 (progn (beginning-of-line) t))) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
202 |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
203 (defun beginning-of-defun-raw (&optional arg) |
70bf65b6aae9
(beginning-of-defun-raw): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6396
diff
changeset
|
204 "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
|
205 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
|
206 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
|
207 is non-nil. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
208 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
209 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
|
210 is called as a function to find the defun's beginning." |
84 | 211 (interactive "p") |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
212 (if beginning-of-defun-function |
54876
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
213 (if (> (setq arg (or arg 1)) 0) |
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
214 (dotimes (i arg) |
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
215 (funcall beginning-of-defun-function)) |
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
216 ;; Better not call end-of-defun-function directly, in case |
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
217 ;; it's not defined. |
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
218 (end-of-defun (- arg))) |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
219 (and arg (< arg 0) (not (eobp)) (forward-char 1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
220 (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
|
221 (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
|
222 "^\\s(\\|" "") |
51084
c27a29e35a85
(beginning-of-defun-raw): Use shy-group.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47924
diff
changeset
|
223 "\\(?:" defun-prompt-regexp "\\)\\s(") |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
224 "^\\s(") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
225 nil 'move (or arg 1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
226 (progn (goto-char (1- (match-end 0)))) t))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
227 |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
228 (defvar end-of-defun-function nil |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
229 "If non-nil, function for function `end-of-defun' to call. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
230 This is used to find the end of the defun instead of using the normal |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
231 recipe (see `end-of-defun'). Major modes can define this if the |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
232 normal method is not appropriate.") |
84 | 233 |
234 (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
|
235 "Return the \"far end\" position of the buffer, in direction ARG. |
59940 | 236 If ARG is positive, that's the end of the buffer. |
237 Otherwise, that's the beginning of the buffer." | |
84 | 238 (if (> arg 0) (point-max) (point-min))) |
239 | |
240 (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
|
241 "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
|
242 With argument, do it that many times. |
84 | 243 Negative argument -N means move back to Nth preceding end of defun. |
244 | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
245 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
|
246 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
|
247 `beginning-of-defun'. |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
248 |
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
249 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
|
250 is called as a function to find the defun's end." |
84 | 251 (interactive "p") |
58962
eb752b1a84b1
(beginning-of-defun, end-of-defun): Don't
Kim F. Storm <storm@cua.dk>
parents:
58918
diff
changeset
|
252 (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
|
253 (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
|
254 (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
|
255 (push-mark)) |
54876
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
256 (if (or (null arg) (= arg 0)) (setq arg 1)) |
27380
59243c413664
(beginning-of-defun-function): Variable renamed from beginning-of-defun.
Richard M. Stallman <rms@gnu.org>
parents:
27190
diff
changeset
|
257 (if end-of-defun-function |
54876
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
258 (if (> arg 0) |
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
259 (dotimes (i arg) |
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
260 (funcall end-of-defun-function)) |
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
261 ;; Better not call beginning-of-defun-function |
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
262 ;; directly, in case it's not defined. |
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
263 (beginning-of-defun (- arg))) |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
264 (let ((first t)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
265 (while (and (> arg 0) (< (point) (point-max))) |
54876
95ee18354a3a
(beginning-of-defun-raw, end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53752
diff
changeset
|
266 (let ((pos (point))) |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
267 (while (progn |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
268 (if (and first |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
269 (progn |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
270 (end-of-line 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
271 (beginning-of-defun-raw 1))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
272 nil |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
273 (or (bobp) (forward-char -1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
274 (beginning-of-defun-raw -1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
275 (setq first nil) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
276 (forward-list 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
277 (skip-chars-forward " \t") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
278 (if (looking-at "\\s<\\|\n") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
279 (forward-line 1)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
280 (<= (point) pos)))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
281 (setq arg (1- arg))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
282 (while (< arg 0) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
283 (let ((pos (point))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
284 (beginning-of-defun-raw 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
285 (forward-sexp 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
286 (forward-line 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
287 (if (>= (point) pos) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
288 (if (beginning-of-defun-raw 2) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
289 (progn |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
290 (forward-list 1) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
291 (skip-chars-forward " \t") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
292 (if (looking-at "\\s<\\|\n") |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
293 (forward-line 1))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
294 (goto-char (point-min))))) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
295 (setq arg (1+ arg)))))) |
84 | 296 |
59177
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
297 (defun mark-defun (&optional allow-extend) |
84 | 298 "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
|
299 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
|
300 |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
301 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
|
302 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
|
303 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
|
304 (interactive "p") |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
305 (cond ((and allow-extend |
5188f5b11d56
(mark-sexp, mark-defun): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
58962
diff
changeset
|
306 (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
|
307 (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
|
308 (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
|
309 (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
|
310 (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
|
311 (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
|
312 (point)))) |
cc3ba2d0d471
* emacs-lisp/lisp.el (mark-defun): Don't leave multiple marks
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43301
diff
changeset
|
313 (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
|
314 (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
|
315 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
|
316 (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
|
317 ;; 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
|
318 ;; 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
|
319 ;; 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
|
320 (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
|
321 (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
|
322 (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
|
323 (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
|
324 (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
|
325 (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
|
326 (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
|
327 (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
|
328 ;; 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
|
329 (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
|
330 (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
|
331 (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
|
332 ;; 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
|
333 ;; 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
|
334 (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
|
335 (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
|
336 (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
|
337 (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
|
338 (re-search-backward "^\n" (- (point) 1) t))))) |
84 | 339 |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
340 (defun narrow-to-defun (&optional arg) |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
341 "Make text outside current defun invisible. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
342 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
|
343 Optional ARG is ignored." |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
344 (interactive) |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
345 (save-excursion |
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
346 (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
|
347 (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
|
348 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
|
349 ;; 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
|
350 ;; 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
|
351 ;; 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
|
352 (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
|
353 (setq beg (point)) |
53752
592ddd618234
(beginning-of-defun-raw, end-of-defun):
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
354 (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
|
355 (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
|
356 (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
|
357 (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
|
358 (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
|
359 ;; 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
|
360 ;; 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
|
361 (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
|
362 (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
|
363 (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
|
364 (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
|
365 (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
|
366 (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
|
367 (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
|
368 (narrow-to-region beg end)))) |
15971
9e9c14ecf6e1
(narrow-to-defun): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
369 |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
370 (defvar insert-pair-alist |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
371 '((?\( ?\)) (?\[ ?\]) (?\{ ?\}) (?\< ?\>) (?\" ?\") (?\' ?\') (?\` ?\')) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
372 "Alist of paired characters inserted by `insert-pair'. |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
373 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
|
374 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
|
375 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
|
376 or without modifiers, are inserted by `insert-pair'.") |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
377 |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
378 (defun insert-pair (&optional arg open close) |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
379 "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
|
380 Leave point after the first character. |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
381 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
|
382 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
|
383 and leave point between. |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
384 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
|
385 before and after, depending on the surrounding characters. |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
386 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
|
387 |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
388 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
|
389 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
|
390 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
|
391 found in the variable `insert-pair-alist', then the last input |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
392 character is inserted ARG times." |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
393 (interactive "P") |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
394 (if (not (and open close)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
395 (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
|
396 (assq (event-basic-type last-command-event) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
397 insert-pair-alist)))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
398 (if pair |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
399 (if (nth 2 pair) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
400 (setq open (nth 1 pair) close (nth 2 pair)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
401 (setq open (nth 0 pair) close (nth 1 pair)))))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
402 (if (and open close) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
403 (if (and transient-mark-mode mark-active) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
404 (progn |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
405 (save-excursion (goto-char (region-end)) (insert close)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
406 (save-excursion (goto-char (region-beginning)) (insert open))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
407 (if arg (setq arg (prefix-numeric-value arg)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
408 (setq arg 0)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
409 (cond ((> arg 0) (skip-chars-forward " \t")) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
410 ((< arg 0) (forward-sexp arg) (setq arg (- arg)))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
411 (and parens-require-spaces |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
412 (not (bobp)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
413 (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
|
414 (insert " ")) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
415 (insert open) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
416 (save-excursion |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
417 (or (eq arg 0) (forward-sexp arg)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
418 (insert close) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
419 (and parens-require-spaces |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
420 (not (eobp)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
421 (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
|
422 (insert " ")))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
423 (insert-char (event-basic-type last-command-event) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
424 (prefix-numeric-value arg)))) |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
425 |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
426 (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
|
427 "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
|
428 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
|
429 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
|
430 No argument is equivalent to zero: just insert `()' and leave point between. |
5838 | 431 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
|
432 before and after, depending on the surrounding characters. |
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
433 If region is active, insert enclosing characters at region boundaries." |
84 | 434 (interactive "P") |
55277
980615cc9a94
(beginning-of-defun, end-of-defun):
Juri Linkov <juri@jurta.org>
parents:
54876
diff
changeset
|
435 (insert-pair arg ?\( ?\))) |
84 | 436 |
55807
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
437 (defun delete-pair () |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
438 "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
|
439 (interactive) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
440 (save-excursion (forward-sexp 1) (delete-char -1)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
441 (delete-char 1)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
442 |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
443 (defun raise-sexp (&optional arg) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
444 "Raise ARG sexps higher up the tree." |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
445 (interactive "p") |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
446 (let ((s (if (and transient-mark-mode mark-active) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
447 (buffer-substring (region-beginning) (region-end)) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
448 (buffer-substring |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
449 (point) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
450 (save-excursion (forward-sexp arg) (point)))))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
451 (backward-up-list 1) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
452 (delete-region (point) (save-excursion (forward-sexp 1) (point))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
453 (save-excursion (insert s)))) |
eb9d99ced391
(insert-pair-alist): New var.
Juri Linkov <juri@jurta.org>
parents:
55727
diff
changeset
|
454 |
84 | 455 (defun move-past-close-and-reindent () |
456 "Move past next `)', delete indentation before it, then indent after it." | |
457 (interactive) | |
458 (up-list 1) | |
459 (forward-char -1) | |
460 (while (save-excursion ; this is my contribution | |
461 (let ((before-paren (point))) | |
462 (back-to-indentation) | |
19781
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
463 (and (= (point) before-paren) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
464 (progn |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
465 ;; Move to end of previous line. |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
466 (beginning-of-line) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
467 (forward-char -1) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
468 ;; 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
|
469 (let ((end (point)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
470 state) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
471 (beginning-of-line) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
472 ;; Get state at start of line. |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
473 (setq state (list 0 nil nil |
19781
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
474 (null (calculate-lisp-indent)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
475 nil nil nil nil |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
476 nil)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
477 ;; 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
|
478 (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
|
479 state)) |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
480 ;; Check not in string or comment. |
03264c342376
(move-past-close-and-reindent):
Richard M. Stallman <rms@gnu.org>
parents:
17665
diff
changeset
|
481 (and (not (elt state 3)) (not (elt state 4)))))))) |
84 | 482 (delete-indentation)) |
483 (forward-char 1) | |
484 (newline-and-indent)) | |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
485 |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
486 (defun check-parens () ; lame name? |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
487 "Check for unbalanced parentheses in the current buffer. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
488 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
|
489 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
|
490 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
|
491 appropriate. (See Info node `(emacs)Parentheses'.) If imbalance is |
63624
f8e5c41bb4b8
(check-parens): Fix spellings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62455
diff
changeset
|
492 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
|
493 character." |
27190
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
494 (interactive) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
495 (condition-case data |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
496 ;; Buffer can't have more than (point-max) sexps. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
497 (scan-sexps (point-min) (point-max)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
498 (scan-error (goto-char (nth 2 data)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
499 ;; Could print (nth 1 data), which is either |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
500 ;; "Containing expression ends prematurely" or |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
501 ;; "Unbalanced parentheses", but those may not be so |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
502 ;; accurate/helpful, e.g. quotes may actually be |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
503 ;; mismatched. |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
504 (error "Unmatched bracket or quote")) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
505 (error (cond ((eq 'scan-error (car data)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
506 (goto-char (nth 2 data)) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
507 (error "Unmatched bracket or quote")) |
f132d890985a
(beginning-of-defun): New variable.
Dave Love <fx@gnu.org>
parents:
23451
diff
changeset
|
508 (t (signal (car data) (cdr data))))))) |
84 | 509 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
510 (defun lisp-complete-symbol (&optional predicate) |
6004
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
511 "Perform completion on Lisp symbol preceding point. |
4fa3d631dae8
(lisp-complete-symbol): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5981
diff
changeset
|
512 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
|
513 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
|
514 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
|
515 |
30979
72284d9d7a11
(defun-prompt-regexp, parens-require-spaces): Doc fix.
Dave Love <fx@gnu.org>
parents:
28299
diff
changeset
|
516 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
|
517 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
|
518 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
|
519 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
|
520 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
|
521 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
|
522 considered." |
84 | 523 (interactive) |
42658
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
524 |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
525 (let ((window (get-buffer-window "*Completions*"))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
526 (if (and (eq last-command this-command) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
527 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
|
528 (buffer-name (window-buffer window))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
529 ;; If this command was repeated, and |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
530 ;; 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
|
531 ;; 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
|
532 (with-current-buffer (window-buffer window) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
533 (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
|
534 (set-window-start window (point-min)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
535 (save-selected-window |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
536 (select-window window) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
537 (scroll-up)))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
538 |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
539 ;; Do completion. |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
540 (let* ((end (point)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
541 (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
|
542 (save-excursion |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
543 (backward-sexp 1) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
544 (while (= (char-syntax (following-char)) ?\') |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
545 (forward-char 1)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
546 (point)))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
547 (pattern (buffer-substring-no-properties beg end)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
548 (predicate |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
549 (or predicate |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
550 (save-excursion |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
551 (goto-char beg) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
552 (if (not (eq (char-before) ?\()) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
553 (lambda (sym) ;why not just nil ? -sm |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
554 (or (boundp sym) (fboundp sym) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
555 (symbol-plist sym))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
556 ;; 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
|
557 (if (condition-case nil |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
558 (progn (up-list -2) (forward-char 1) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
559 (eq (char-after) ?\()) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
560 (error nil)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
561 ;; 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
|
562 ;; 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
|
563 ;; Maybe a `let' varlist or something. |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
564 nil |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
565 ;; 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
|
566 'fboundp))))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
567 (completion (try-completion pattern obarray predicate))) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
568 (cond ((eq completion t)) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
569 ((null completion) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
570 (message "Can't find completion for \"%s\"" pattern) |
c45e40c77be6
(lisp-complete-symbol): Repeating the command
Richard M. Stallman <rms@gnu.org>
parents:
41291
diff
changeset
|
571 (ding)) |
67728
bffc4c57eda9
(lisp-complete-symbol): Mostly undo the change by Kevin Rodgers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67721
diff
changeset
|
572 ((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
|
573 (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
|
574 (insert completion) |
67730
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
575 ;; 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
|
576 (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
|
577 (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
|
578 (t |
67730
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
579 (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
|
580 (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
|
581 (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
|
582 (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
|
583 (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
|
584 (setq list (sort list 'string<)) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
585 (or (eq predicate 'fboundp) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
586 (let (new) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
587 (while list |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
588 (setq new (cons (if (fboundp (intern (car list))) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
589 (list (car list) " <f>") |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
590 (car list)) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
591 new)) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
592 (setq list (cdr list))) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
593 (setq list (nreverse new)))) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
594 (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
|
595 (with-output-to-temp-buffer "*Completions*" |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
596 (display-completion-list list pattern)) |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
597 ;; 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
|
598 ;; out of date. |
1ee1a77d8b03
(lisp-complete-symbol): Don't print progress messages if in the
Romain Francoise <romain@orebokech.com>
parents:
67728
diff
changeset
|
599 (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
|
600 (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
|
601 (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
|
602 (message "Making completion list...%s" "done"))))))))) |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
215
diff
changeset
|
603 |
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
|
604 ;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
215
diff
changeset
|
605 ;;; lisp.el ends here |