Mercurial > emacs
annotate lisp/simple.el @ 14053:c8c5b83d9691
(vc-update-change-log): Use add-log-full-name and
add-log-mailing-address if they are defined.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Mon, 08 Jan 1996 22:24:05 +0000 |
parents | 5f1ba0200a33 |
children | 83f275dcd93a |
rev | line source |
---|---|
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
1 ;;; simple.el --- basic editing commands for Emacs |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2 |
11235 | 3 ;; Copyright (C) 1985, 86, 87, 93, 94, 95 Free Software Foundation, Inc. |
475 | 4 |
5 ;; This file is part of GNU Emacs. | |
6 | |
7 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
8 ;; it under the terms of the GNU General Public License as published by | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
9 ;; the Free Software Foundation; either version 2, or (at your option) |
475 | 10 ;; any later version. |
11 | |
12 ;; GNU Emacs is distributed in the hope that it will be useful, | |
13 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 ;; GNU General Public License for more details. | |
16 | |
17 ;; You should have received a copy of the GNU General Public License | |
18 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
19 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
20 | |
2315
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
21 ;;; Commentary: |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
22 |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
23 ;; A grab-bag of basic Emacs commands not specifically related to some |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
24 ;; major mode or to file-handling. |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
25 |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
26 ;;; Code: |
475 | 27 |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
28 (defun newline (&optional arg) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
29 "Insert a newline, and move to left margin of the new line if it's blank. |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
30 The newline is marked with the text-property `hard'. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
31 With arg, insert that many newlines. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
32 In Auto Fill mode, if no numeric arg, break the preceding line if it's long." |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
33 (interactive "*P") |
13137
a83a1515fd9b
(newline): Call barf-if-buffer-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
12975
diff
changeset
|
34 (barf-if-buffer-read-only) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
35 ;; Inserting a newline at the end of a line produces better redisplay in |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
36 ;; try_window_id than inserting at the beginning of a line, and the textual |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
37 ;; result is the same. So, if we're at beginning of line, pretend to be at |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
38 ;; the end of the previous line. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
39 (let ((flag (and (not (bobp)) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
40 (bolp) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
41 (< (or (previous-property-change (point)) -2) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
42 (- (point) 2)))) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
43 (was-page-start (and (bolp) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
44 (looking-at page-delimiter))) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
45 (beforepos (point))) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
46 (if flag (backward-char 1)) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
47 ;; Call self-insert so that auto-fill, abbrev expansion etc. happens. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
48 ;; Set last-command-char to tell self-insert what to insert. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
49 (let ((last-command-char ?\n) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
50 ;; Don't auto-fill if we have a numeric argument. |
11362
b51e4c4cb0de
(newline): Don't auto-fill if flag is on; it was filling wrong line.
Richard M. Stallman <rms@gnu.org>
parents:
11326
diff
changeset
|
51 ;; Also not if flag is true (it would fill wrong line); |
b51e4c4cb0de
(newline): Don't auto-fill if flag is on; it was filling wrong line.
Richard M. Stallman <rms@gnu.org>
parents:
11326
diff
changeset
|
52 ;; there is no need to since we're at BOL. |
b51e4c4cb0de
(newline): Don't auto-fill if flag is on; it was filling wrong line.
Richard M. Stallman <rms@gnu.org>
parents:
11326
diff
changeset
|
53 (auto-fill-function (if (or arg flag) nil auto-fill-function))) |
12400
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
54 (unwind-protect |
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
55 (self-insert-command (prefix-numeric-value arg)) |
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
56 ;; If we get an error in self-insert-command, put point at right place. |
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
57 (if flag (forward-char 1)))) |
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
58 ;; If we did *not* get an error, cancel that forward-char. |
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
59 (if flag (backward-char 1)) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
60 ;; Mark the newline(s) `hard'. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
61 (if use-hard-newlines |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
62 (let* ((from (- (point) (if arg (prefix-numeric-value arg) 1))) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
63 (sticky (get-text-property from 'rear-nonsticky))) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
64 (put-text-property from (point) 'hard 't) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
65 ;; If rear-nonsticky is not "t", add 'hard to rear-nonsticky list |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
66 (if (and (listp sticky) (not (memq 'hard sticky))) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
67 (put-text-property from (point) 'rear-nonsticky |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
68 (cons 'hard sticky))))) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
69 ;; If the newline leaves the previous line blank, |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
70 ;; and we have a left margin, delete that from the blank line. |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
71 (or flag |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
72 (save-excursion |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
73 (goto-char beforepos) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
74 (beginning-of-line) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
75 (and (looking-at "[ \t]$") |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
76 (> (current-left-margin) 0) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
77 (delete-region (point) (progn (end-of-line) (point)))))) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
78 (if flag (forward-char 1)) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
79 ;; Indent the line after the newline, except in one case: |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
80 ;; when we added the newline at the beginning of a line |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
81 ;; which starts a page. |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
82 (or was-page-start |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
83 (move-to-left-margin nil t))) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
84 nil) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
85 |
475 | 86 (defun open-line (arg) |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
87 "Insert a newline and leave point before it. |
10813
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
88 If there is a fill prefix and/or a left-margin, insert them on the new line |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
89 if the line would have been blank. |
1063
25b929c06f83
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1039
diff
changeset
|
90 With arg N, insert N newlines." |
475 | 91 (interactive "*p") |
1063
25b929c06f83
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1039
diff
changeset
|
92 (let* ((do-fill-prefix (and fill-prefix (bolp))) |
10813
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
93 (do-left-margin (and (bolp) (> (current-left-margin) 0))) |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
94 (loc (point))) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
95 (newline arg) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
96 (goto-char loc) |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
97 (while (> arg 0) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
98 (cond ((bolp) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
99 (if do-left-margin (indent-to (current-left-margin))) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
100 (if do-fill-prefix (insert-and-inherit fill-prefix)))) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
101 (forward-line 1) |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
102 (setq arg (1- arg))) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
103 (goto-char loc) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
104 (end-of-line))) |
475 | 105 |
106 (defun split-line () | |
107 "Split current line, moving portion beyond point vertically down." | |
108 (interactive "*") | |
109 (skip-chars-forward " \t") | |
110 (let ((col (current-column)) | |
111 (pos (point))) | |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
112 (newline 1) |
475 | 113 (indent-to col 0) |
114 (goto-char pos))) | |
115 | |
116 (defun quoted-insert (arg) | |
117 "Read next input character and insert it. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
118 This is useful for inserting control characters. |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1812
diff
changeset
|
119 You may also type up to 3 octal digits, to insert a character with that code. |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
120 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
121 In overwrite mode, this function inserts the character anyway, and |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
122 does not handle octal digits specially. This means that if you use |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
123 overwrite as your normal editing mode, you can use this function to |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
124 insert characters when necessary. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
125 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
126 In binary overwrite mode, this function does overwrite, and octal |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
127 digits are interpreted as a character code. This is supposed to make |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
128 this function useful in editing binary files." |
475 | 129 (interactive "*p") |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
130 (let ((char (if (or (not overwrite-mode) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
131 (eq overwrite-mode 'overwrite-mode-binary)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
132 (read-quoted-char) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
133 (read-char)))) |
10779
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
134 (if (> arg 0) |
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
135 (if (eq overwrite-mode 'overwrite-mode-binary) |
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
136 (delete-char arg))) |
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
137 (while (> arg 0) |
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
138 (insert-and-inherit char) |
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
139 (setq arg (1- arg))))) |
475 | 140 |
141 (defun delete-indentation (&optional arg) | |
142 "Join this line to previous and fix up whitespace at join. | |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
143 If there is a fill prefix, delete it from the beginning of this line. |
475 | 144 With argument, join this line to following line." |
145 (interactive "*P") | |
146 (beginning-of-line) | |
147 (if arg (forward-line 1)) | |
148 (if (eq (preceding-char) ?\n) | |
149 (progn | |
150 (delete-region (point) (1- (point))) | |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
151 ;; If the second line started with the fill prefix, |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
152 ;; delete the prefix. |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
153 (if (and fill-prefix |
1276
6b63876aea1c
(kill-word): Don't change point before calling kill-region.
Richard M. Stallman <rms@gnu.org>
parents:
1145
diff
changeset
|
154 (<= (+ (point) (length fill-prefix)) (point-max)) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
155 (string= fill-prefix |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
156 (buffer-substring (point) |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
157 (+ (point) (length fill-prefix))))) |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
158 (delete-region (point) (+ (point) (length fill-prefix)))) |
475 | 159 (fixup-whitespace)))) |
160 | |
161 (defun fixup-whitespace () | |
162 "Fixup white space between objects around point. | |
163 Leave one space or none, according to the context." | |
164 (interactive "*") | |
165 (save-excursion | |
166 (delete-horizontal-space) | |
167 (if (or (looking-at "^\\|\\s)") | |
168 (save-excursion (forward-char -1) | |
169 (looking-at "$\\|\\s(\\|\\s'"))) | |
170 nil | |
171 (insert ?\ )))) | |
172 | |
173 (defun delete-horizontal-space () | |
174 "Delete all spaces and tabs around point." | |
175 (interactive "*") | |
176 (skip-chars-backward " \t") | |
177 (delete-region (point) (progn (skip-chars-forward " \t") (point)))) | |
178 | |
179 (defun just-one-space () | |
180 "Delete all spaces and tabs around point, leaving one space." | |
181 (interactive "*") | |
182 (skip-chars-backward " \t") | |
183 (if (= (following-char) ? ) | |
184 (forward-char 1) | |
185 (insert ? )) | |
186 (delete-region (point) (progn (skip-chars-forward " \t") (point)))) | |
187 | |
188 (defun delete-blank-lines () | |
189 "On blank line, delete all surrounding blank lines, leaving just one. | |
190 On isolated blank line, delete that one. | |
7817
d729f75fff04
(delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7762
diff
changeset
|
191 On nonblank line, delete any immediately following blank lines." |
475 | 192 (interactive "*") |
193 (let (thisblank singleblank) | |
194 (save-excursion | |
195 (beginning-of-line) | |
196 (setq thisblank (looking-at "[ \t]*$")) | |
715 | 197 ;; Set singleblank if there is just one blank line here. |
475 | 198 (setq singleblank |
199 (and thisblank | |
200 (not (looking-at "[ \t]*\n[ \t]*$")) | |
201 (or (bobp) | |
202 (progn (forward-line -1) | |
203 (not (looking-at "[ \t]*$"))))))) | |
715 | 204 ;; Delete preceding blank lines, and this one too if it's the only one. |
475 | 205 (if thisblank |
206 (progn | |
207 (beginning-of-line) | |
208 (if singleblank (forward-line 1)) | |
209 (delete-region (point) | |
210 (if (re-search-backward "[^ \t\n]" nil t) | |
211 (progn (forward-line 1) (point)) | |
212 (point-min))))) | |
715 | 213 ;; Delete following blank lines, unless the current line is blank |
214 ;; and there are no following blank lines. | |
475 | 215 (if (not (and thisblank singleblank)) |
216 (save-excursion | |
217 (end-of-line) | |
218 (forward-line 1) | |
219 (delete-region (point) | |
220 (if (re-search-forward "[^ \t\n]" nil t) | |
221 (progn (beginning-of-line) (point)) | |
715 | 222 (point-max))))) |
223 ;; Handle the special case where point is followed by newline and eob. | |
224 ;; Delete the line, leaving point at eob. | |
225 (if (looking-at "^[ \t]*\n\\'") | |
226 (delete-region (point) (point-max))))) | |
475 | 227 |
228 (defun back-to-indentation () | |
229 "Move point to the first non-whitespace character on this line." | |
230 (interactive) | |
231 (beginning-of-line 1) | |
232 (skip-chars-forward " \t")) | |
233 | |
234 (defun newline-and-indent () | |
235 "Insert a newline, then indent according to major mode. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
236 Indentation is done using the value of `indent-line-function'. |
475 | 237 In programming language modes, this is the same as TAB. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
238 In some text modes, where TAB inserts a tab, this command indents to the |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
239 column specified by the function `current-left-margin'." |
475 | 240 (interactive "*") |
241 (delete-region (point) (progn (skip-chars-backward " \t") (point))) | |
617 | 242 (newline) |
475 | 243 (indent-according-to-mode)) |
244 | |
245 (defun reindent-then-newline-and-indent () | |
246 "Reindent current line, insert newline, then indent the new line. | |
247 Indentation of both lines is done according to the current major mode, | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
248 which means calling the current value of `indent-line-function'. |
475 | 249 In programming language modes, this is the same as TAB. |
250 In some text modes, where TAB inserts a tab, this indents to the | |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
251 column specified by the function `current-left-margin'." |
475 | 252 (interactive "*") |
253 (save-excursion | |
254 (delete-region (point) (progn (skip-chars-backward " \t") (point))) | |
255 (indent-according-to-mode)) | |
617 | 256 (newline) |
475 | 257 (indent-according-to-mode)) |
258 | |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
259 ;; Internal subroutine of delete-char |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
260 (defun kill-forward-chars (arg) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
261 (if (listp arg) (setq arg (car arg))) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
262 (if (eq arg '-) (setq arg -1)) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
263 (kill-region (point) (+ (point) arg))) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
264 |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
265 ;; Internal subroutine of backward-delete-char |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
266 (defun kill-backward-chars (arg) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
267 (if (listp arg) (setq arg (car arg))) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
268 (if (eq arg '-) (setq arg -1)) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
269 (kill-region (point) (- (point) arg))) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
270 |
475 | 271 (defun backward-delete-char-untabify (arg &optional killp) |
272 "Delete characters backward, changing tabs into spaces. | |
273 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil. | |
274 Interactively, ARG is the prefix arg (default 1) | |
8600
0c56de09028d
(backward-delete-char-untabify): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8559
diff
changeset
|
275 and KILLP is t if a prefix arg was specified." |
475 | 276 (interactive "*p\nP") |
277 (let ((count arg)) | |
278 (save-excursion | |
279 (while (and (> count 0) (not (bobp))) | |
280 (if (= (preceding-char) ?\t) | |
281 (let ((col (current-column))) | |
282 (forward-char -1) | |
283 (setq col (- col (current-column))) | |
284 (insert-char ?\ col) | |
285 (delete-char 1))) | |
286 (forward-char -1) | |
287 (setq count (1- count))))) | |
288 (delete-backward-char arg killp) | |
289 ;; In overwrite mode, back over columns while clearing them out, | |
290 ;; unless at end of line. | |
291 (and overwrite-mode (not (eolp)) | |
292 (save-excursion (insert-char ?\ arg)))) | |
293 | |
294 (defun zap-to-char (arg char) | |
295 "Kill up to and including ARG'th occurrence of CHAR. | |
296 Goes backward if ARG is negative; error if CHAR not found." | |
297 (interactive "p\ncZap to char: ") | |
298 (kill-region (point) (progn | |
299 (search-forward (char-to-string char) nil nil arg) | |
300 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point)))) | |
301 (point)))) | |
302 | |
303 (defun beginning-of-buffer (&optional arg) | |
304 "Move point to the beginning of the buffer; leave mark at previous position. | |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
305 With arg N, put point N/10 of the way from the beginning. |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
306 |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
307 If the buffer is narrowed, this command uses the beginning and size |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
308 of the accessible part of the buffer. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
309 |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
310 Don't use this command in Lisp programs! |
475 | 311 \(goto-char (point-min)) is faster and avoids clobbering the mark." |
312 (interactive "P") | |
313 (push-mark) | |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
314 (let ((size (- (point-max) (point-min)))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
315 (goto-char (if arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
316 (+ (point-min) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
317 (if (> size 10000) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
318 ;; Avoid overflow for large buffer sizes! |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
319 (* (prefix-numeric-value arg) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
320 (/ size 10)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
321 (/ (+ 10 (* size (prefix-numeric-value arg))) 10))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
322 (point-min)))) |
475 | 323 (if arg (forward-line 1))) |
324 | |
325 (defun end-of-buffer (&optional arg) | |
326 "Move point to the end of the buffer; leave mark at previous position. | |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
327 With arg N, put point N/10 of the way from the end. |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
328 |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
329 If the buffer is narrowed, this command uses the beginning and size |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
330 of the accessible part of the buffer. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
331 |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
332 Don't use this command in Lisp programs! |
475 | 333 \(goto-char (point-max)) is faster and avoids clobbering the mark." |
334 (interactive "P") | |
335 (push-mark) | |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
336 (let ((size (- (point-max) (point-min)))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
337 (goto-char (if arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
338 (- (point-max) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
339 (if (> size 10000) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
340 ;; Avoid overflow for large buffer sizes! |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
341 (* (prefix-numeric-value arg) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
342 (/ size 10)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
343 (/ (* size (prefix-numeric-value arg)) 10))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
344 (point-max)))) |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
345 ;; If we went to a place in the middle of the buffer, |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
346 ;; adjust it to the beginning of a line. |
475 | 347 (if arg (forward-line 1) |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
348 ;; If the end of the buffer is not already on the screen, |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
349 ;; then scroll specially to put it near, but not at, the bottom. |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
350 (if (let ((old-point (point))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
351 (save-excursion |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
352 (goto-char (window-start)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
353 (vertical-motion (window-height)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
354 (< (point) old-point))) |
7877
0eb805c768af
(end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents:
7817
diff
changeset
|
355 (progn |
0eb805c768af
(end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents:
7817
diff
changeset
|
356 (overlay-recenter (point)) |
0eb805c768af
(end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents:
7817
diff
changeset
|
357 (recenter -3))))) |
475 | 358 |
359 (defun mark-whole-buffer () | |
715 | 360 "Put point at beginning and mark at end of buffer. |
361 You probably should not use this function in Lisp programs; | |
362 it is usually a mistake for a Lisp function to use any subroutine | |
363 that uses or sets the mark." | |
475 | 364 (interactive) |
365 (push-mark (point)) | |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
366 (push-mark (point-max) nil t) |
475 | 367 (goto-char (point-min))) |
368 | |
369 (defun count-lines-region (start end) | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3487
diff
changeset
|
370 "Print number of lines and characters in the region." |
475 | 371 (interactive "r") |
372 (message "Region has %d lines, %d characters" | |
373 (count-lines start end) (- end start))) | |
374 | |
375 (defun what-line () | |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
376 "Print the current buffer line number and narrowed line number of point." |
475 | 377 (interactive) |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
378 (let ((opoint (point)) start) |
475 | 379 (save-excursion |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
380 (save-restriction |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
381 (goto-char (point-min)) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
382 (widen) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
383 (beginning-of-line) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
384 (setq start (point)) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
385 (goto-char opoint) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
386 (beginning-of-line) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
387 (if (/= start 1) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
388 (message "line %d (narrowed line %d)" |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
389 (1+ (count-lines 1 (point))) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
390 (1+ (count-lines start (point)))) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
391 (message "Line %d" (1+ (count-lines 1 (point))))))))) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
392 |
475 | 393 |
394 (defun count-lines (start end) | |
395 "Return number of lines between START and END. | |
396 This is usually the number of newlines between them, | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
397 but can be one more if START is not equal to END |
475 | 398 and the greater of them is not at the start of a line." |
9554
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
399 (save-excursion |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
400 (save-restriction |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
401 (narrow-to-region start end) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
402 (goto-char (point-min)) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
403 (if (eq selective-display t) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
404 (save-match-data |
2421
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
405 (let ((done 0)) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
406 (while (re-search-forward "[\n\C-m]" nil t 40) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
407 (setq done (+ 40 done))) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
408 (while (re-search-forward "[\n\C-m]" nil t 1) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
409 (setq done (+ 1 done))) |
5151
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
410 (goto-char (point-max)) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
411 (if (and (/= start end) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
412 (not (bolp))) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
413 (1+ done) |
9554
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
414 done))) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
415 (- (buffer-size) (forward-line (buffer-size))))))) |
475 | 416 |
417 (defun what-cursor-position () | |
418 "Print info on cursor position (on screen and within buffer)." | |
419 (interactive) | |
420 (let* ((char (following-char)) | |
421 (beg (point-min)) | |
422 (end (point-max)) | |
423 (pos (point)) | |
424 (total (buffer-size)) | |
425 (percent (if (> total 50000) | |
426 ;; Avoid overflow from multiplying by 100! | |
427 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1)) | |
428 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1)))) | |
429 (hscroll (if (= (window-hscroll) 0) | |
430 "" | |
431 (format " Hscroll=%d" (window-hscroll)))) | |
432 (col (current-column))) | |
433 (if (= pos end) | |
434 (if (or (/= beg 1) (/= end (1+ total))) | |
435 (message "point=%d of %d(%d%%) <%d - %d> column %d %s" | |
436 pos total percent beg end col hscroll) | |
437 (message "point=%d of %d(%d%%) column %d %s" | |
438 pos total percent col hscroll)) | |
439 (if (or (/= beg 1) (/= end (1+ total))) | |
10352
cc26982277e4
(what-cursor-position): Show char in decimal, hex, octal.
Richard M. Stallman <rms@gnu.org>
parents:
10351
diff
changeset
|
440 (message "Char: %s (0%o, %d, 0x%x) point=%d of %d(%d%%) <%d - %d> column %d %s" |
cc26982277e4
(what-cursor-position): Show char in decimal, hex, octal.
Richard M. Stallman <rms@gnu.org>
parents:
10351
diff
changeset
|
441 (single-key-description char) char char char pos total percent beg end col hscroll) |
cc26982277e4
(what-cursor-position): Show char in decimal, hex, octal.
Richard M. Stallman <rms@gnu.org>
parents:
10351
diff
changeset
|
442 (message "Char: %s (0%o, %d, 0x%x) point=%d of %d(%d%%) column %d %s" |
cc26982277e4
(what-cursor-position): Show char in decimal, hex, octal.
Richard M. Stallman <rms@gnu.org>
parents:
10351
diff
changeset
|
443 (single-key-description char) char char char pos total percent col hscroll))))) |
475 | 444 |
445 (defun fundamental-mode () | |
446 "Major mode not specialized for anything in particular. | |
447 Other major modes are defined by comparison with this one." | |
448 (interactive) | |
449 (kill-all-local-variables)) | |
450 | |
4894
1574c6c6561f
(eval-expression): Fix typo: missing paren.
Roland McGrath <roland@gnu.org>
parents:
4886
diff
changeset
|
451 (defvar read-expression-map (cons 'keymap minibuffer-local-map) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
452 "Minibuffer keymap used for reading Lisp expressions.") |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
453 (define-key read-expression-map "\M-\t" 'lisp-complete-symbol) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
454 |
475 | 455 (put 'eval-expression 'disabled t) |
456 | |
4289
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
457 (defvar read-expression-history nil) |
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
458 |
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
459 ;; We define this, rather than making `eval' interactive, |
475 | 460 ;; for the sake of completion of names like eval-region, eval-current-buffer. |
461 (defun eval-expression (expression) | |
462 "Evaluate EXPRESSION and print value in minibuffer. | |
954
9e51bb887797
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
921
diff
changeset
|
463 Value is also consed on to front of the variable `values'." |
4886
20e345c97e28
(eval-expression, edit-and-eval-command): Let
Brian Fox <bfox@gnu.org>
parents:
4869
diff
changeset
|
464 (interactive |
5068
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
465 (list (read-from-minibuffer "Eval: " |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
466 nil read-expression-map t |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
467 'read-expression-history))) |
475 | 468 (setq values (cons (eval expression) values)) |
469 (prin1 (car values) t)) | |
470 | |
471 (defun edit-and-eval-command (prompt command) | |
472 "Prompting with PROMPT, let user edit COMMAND and eval result. | |
473 COMMAND is a Lisp expression. Let user edit that expression in | |
474 the minibuffer, then read and evaluate the result." | |
5068
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
475 (let ((command (read-from-minibuffer prompt |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
476 (prin1-to-string command) |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
477 read-expression-map t |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
478 '(command-history . 1)))) |
9629
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
479 ;; If command was added to command-history as a string, |
13960
5f1ba0200a33
(shell-command): Fix message spelling.
Karl Heuer <kwzh@gnu.org>
parents:
13810
diff
changeset
|
480 ;; get rid of that. We want only evaluable expressions there. |
9629
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
481 (if (stringp (car command-history)) |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
482 (setq command-history (cdr command-history))) |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
483 |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
484 ;; If command to be redone does not match front of history, |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
485 ;; add it to the history. |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
486 (or (equal command (car command-history)) |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
487 (setq command-history (cons command command-history))) |
475 | 488 (eval command))) |
489 | |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
490 (defun repeat-complex-command (arg) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
491 "Edit and re-evaluate last complex command, or ARGth from last. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
492 A complex command is one which used the minibuffer. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
493 The command is placed in the minibuffer as a Lisp form for editing. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
494 The result is executed, repeating the command as changed. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
495 If the command has been changed or is not the most recent previous command |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
496 it is added to the front of the command history. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
497 You can use the minibuffer history commands \\<minibuffer-local-map>\\[next-history-element] and \\[previous-history-element] |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
498 to get different commands to edit and resubmit." |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
499 (interactive "p") |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
500 (let ((elt (nth (1- arg) command-history)) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
501 (minibuffer-history-position arg) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
502 (minibuffer-history-sexp-flag t) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
503 newcmd) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
504 (if elt |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
505 (progn |
4821
2c16f99ef5dc
(edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents:
4765
diff
changeset
|
506 (setq newcmd |
8734
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
507 (let ((print-level nil)) |
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
508 (read-from-minibuffer |
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
509 "Redo: " (prin1-to-string elt) read-expression-map t |
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
510 (cons 'command-history arg)))) |
4821
2c16f99ef5dc
(edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents:
4765
diff
changeset
|
511 |
5135
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
512 ;; If command was added to command-history as a string, |
13960
5f1ba0200a33
(shell-command): Fix message spelling.
Karl Heuer <kwzh@gnu.org>
parents:
13810
diff
changeset
|
513 ;; get rid of that. We want only evaluable expressions there. |
5135
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
514 (if (stringp (car command-history)) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
515 (setq command-history (cdr command-history))) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
516 |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
517 ;; If command to be redone does not match front of history, |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
518 ;; add it to the history. |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
519 (or (equal newcmd (car command-history)) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
520 (setq command-history (cons newcmd command-history))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
521 (eval newcmd)) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
522 (ding)))) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
523 |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
524 (defvar minibuffer-history nil |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
525 "Default minibuffer history list. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
526 This is used for all minibuffer input |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
527 except when an alternate history list is specified.") |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
528 (defvar minibuffer-history-sexp-flag nil |
7373
451602bf12e4
(minibuffer-history-sexp-flag): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
7333
diff
changeset
|
529 "Non-nil when doing history operations on `command-history'. |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
530 More generally, indicates that the history list being acted on |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
531 contains expressions rather than strings.") |
862
46630543d659
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
859
diff
changeset
|
532 (setq minibuffer-history-variable 'minibuffer-history) |
46630543d659
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
859
diff
changeset
|
533 (setq minibuffer-history-position nil) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
534 (defvar minibuffer-history-search-history nil) |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
535 |
921 | 536 (mapcar |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
537 (lambda (key-and-command) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
538 (mapcar |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
539 (lambda (keymap-and-completionp) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
540 ;; Arg is (KEYMAP-SYMBOL . COMPLETION-MAP-P). |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
541 ;; If the cdr of KEY-AND-COMMAND (the command) is a cons, |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
542 ;; its car is used if COMPLETION-MAP-P is nil, its cdr if it is t. |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
543 (define-key (symbol-value (car keymap-and-completionp)) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
544 (car key-and-command) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
545 (let ((command (cdr key-and-command))) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
546 (if (consp command) |
1826
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
547 ;; (and ... nil) => ... turns back on the completion-oriented |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
548 ;; history commands which rms turned off since they seem to |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
549 ;; do things he doesn't like. |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
550 (if (and (cdr keymap-and-completionp) nil) ;XXX turned off |
1838
34da3c151be4
Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents:
1837
diff
changeset
|
551 (progn (error "EMACS BUG!") (cdr command)) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
552 (car command)) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
553 command)))) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
554 '((minibuffer-local-map . nil) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
555 (minibuffer-local-ns-map . nil) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
556 (minibuffer-local-completion-map . t) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
557 (minibuffer-local-must-match-map . t) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
558 (read-expression-map . nil)))) |
1838
34da3c151be4
Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents:
1837
diff
changeset
|
559 '(("\en" . (next-history-element . next-complete-history-element)) |
34da3c151be4
Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents:
1837
diff
changeset
|
560 ([next] . (next-history-element . next-complete-history-element)) |
34da3c151be4
Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents:
1837
diff
changeset
|
561 ("\ep" . (previous-history-element . previous-complete-history-element)) |
34da3c151be4
Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents:
1837
diff
changeset
|
562 ([prior] . (previous-history-element . previous-complete-history-element)) |
921 | 563 ("\er" . previous-matching-history-element) |
564 ("\es" . next-matching-history-element))) | |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
565 |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
566 (defun previous-matching-history-element (regexp n) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
567 "Find the previous history element that matches REGEXP. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
568 \(Previous history elements refer to earlier actions.) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
569 With prefix argument N, search for Nth previous match. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
570 If N is negative, find the next or Nth next match." |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
571 (interactive |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
572 (let* ((enable-recursive-minibuffers t) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
573 (minibuffer-history-sexp-flag nil) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
574 (regexp (read-from-minibuffer "Previous element matching (regexp): " |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
575 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
576 minibuffer-local-map |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
577 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
578 'minibuffer-history-search-history))) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
579 ;; Use the last regexp specified, by default, if input is empty. |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
580 (list (if (string= regexp "") |
11961
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
581 (if minibuffer-history-search-history |
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
582 (car minibuffer-history-search-history) |
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
583 (error "No previous history search regexp")) |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
584 regexp) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
585 (prefix-numeric-value current-prefix-arg)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
586 (let ((history (symbol-value minibuffer-history-variable)) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
587 prevpos |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
588 (pos minibuffer-history-position)) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
589 (while (/= n 0) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
590 (setq prevpos pos) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
591 (setq pos (min (max 1 (+ pos (if (< n 0) -1 1))) (length history))) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
592 (if (= pos prevpos) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
593 (error (if (= pos 1) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
594 "No later matching history item" |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
595 "No earlier matching history item"))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
596 (if (string-match regexp |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
597 (if minibuffer-history-sexp-flag |
8734
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
598 (let ((print-level nil)) |
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
599 (prin1-to-string (nth (1- pos) history))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
600 (nth (1- pos) history))) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
601 (setq n (+ n (if (< n 0) 1 -1))))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
602 (setq minibuffer-history-position pos) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
603 (erase-buffer) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
604 (let ((elt (nth (1- pos) history))) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
605 (insert (if minibuffer-history-sexp-flag |
8734
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
606 (let ((print-level nil)) |
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
607 (prin1-to-string elt)) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
608 elt))) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
609 (goto-char (point-min))) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
610 (if (or (eq (car (car command-history)) 'previous-matching-history-element) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
611 (eq (car (car command-history)) 'next-matching-history-element)) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
612 (setq command-history (cdr command-history)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
613 |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
614 (defun next-matching-history-element (regexp n) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
615 "Find the next history element that matches REGEXP. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
616 \(The next history element refers to a more recent action.) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
617 With prefix argument N, search for Nth next match. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
618 If N is negative, find the previous or Nth previous match." |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
619 (interactive |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
620 (let* ((enable-recursive-minibuffers t) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
621 (minibuffer-history-sexp-flag nil) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
622 (regexp (read-from-minibuffer "Next element matching (regexp): " |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
623 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
624 minibuffer-local-map |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
625 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
626 'minibuffer-history-search-history))) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
627 ;; Use the last regexp specified, by default, if input is empty. |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
628 (list (if (string= regexp "") |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
629 (setcar minibuffer-history-search-history |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
630 (nth 1 minibuffer-history-search-history)) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
631 regexp) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
632 (prefix-numeric-value current-prefix-arg)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
633 (previous-matching-history-element regexp (- n))) |
475 | 634 |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
635 (defun next-history-element (n) |
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
636 "Insert the next element of the minibuffer history into the minibuffer." |
475 | 637 (interactive "p") |
10722
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
638 (or (zerop n) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
639 (let ((narg (min (max 1 (- minibuffer-history-position n)) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
640 (length (symbol-value minibuffer-history-variable))))) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
641 (if (or (zerop narg) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
642 (= minibuffer-history-position narg)) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
643 (error (if (if (zerop narg) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
644 (> n 0) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
645 (= minibuffer-history-position 1)) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
646 "End of history; no next item" |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
647 "Beginning of history; no preceding item")) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
648 (erase-buffer) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
649 (setq minibuffer-history-position narg) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
650 (let ((elt (nth (1- minibuffer-history-position) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
651 (symbol-value minibuffer-history-variable)))) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
652 (insert |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
653 (if minibuffer-history-sexp-flag |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
654 (let ((print-level nil)) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
655 (prin1-to-string elt)) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
656 elt))) |
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
657 (goto-char (point-min)))))) |
475 | 658 |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
659 (defun previous-history-element (n) |
1145 | 660 "Inserts the previous element of the minibuffer history into the minibuffer." |
475 | 661 (interactive "p") |
859
5f325fbc093d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
858
diff
changeset
|
662 (next-history-element (- n))) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
663 |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
664 (defun next-complete-history-element (n) |
5324
f091cdec77e2
(next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5151
diff
changeset
|
665 "Get next element of history which is a completion of minibuffer contents." |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
666 (interactive "p") |
1826
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
667 (let ((point-at-start (point))) |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
668 (next-matching-history-element |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
669 (concat "^" (regexp-quote (buffer-substring (point-min) (point)))) n) |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
670 ;; next-matching-history-element always puts us at (point-min). |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
671 ;; Move to the position we were at before changing the buffer contents. |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
672 ;; This is still sensical, because the text before point has not changed. |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
673 (goto-char point-at-start))) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
674 |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
675 (defun previous-complete-history-element (n) |
5324
f091cdec77e2
(next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5151
diff
changeset
|
676 "\ |
f091cdec77e2
(next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5151
diff
changeset
|
677 Get previous element of history which is a completion of minibuffer contents." |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
678 (interactive "p") |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
679 (next-complete-history-element (- n))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
680 |
475 | 681 (defun goto-line (arg) |
682 "Goto line ARG, counting from line 1 at beginning of buffer." | |
683 (interactive "NGoto line: ") | |
9343
ee9866892683
(goto-line): Call prefix-numeric-value.
Richard M. Stallman <rms@gnu.org>
parents:
9065
diff
changeset
|
684 (setq arg (prefix-numeric-value arg)) |
475 | 685 (save-restriction |
686 (widen) | |
687 (goto-char 1) | |
688 (if (eq selective-display t) | |
689 (re-search-forward "[\n\C-m]" nil 'end (1- arg)) | |
690 (forward-line (1- arg))))) | |
691 | |
692 ;Put this on C-x u, so we can force that rather than C-_ into startup msg | |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
693 (define-function 'advertised-undo 'undo) |
475 | 694 |
695 (defun undo (&optional arg) | |
696 "Undo some previous changes. | |
697 Repeat this command to undo more changes. | |
698 A numeric argument serves as a repeat count." | |
699 (interactive "*p") | |
5935
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
700 ;; If we don't get all the way thru, make last-command indicate that |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
701 ;; for the following command. |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
702 (setq this-command t) |
3408
8ffb00332c5f
(undo): Pass proper arg to delete-auto-save-file-if-necessary.
Richard M. Stallman <rms@gnu.org>
parents:
3034
diff
changeset
|
703 (let ((modified (buffer-modified-p)) |
8ffb00332c5f
(undo): Pass proper arg to delete-auto-save-file-if-necessary.
Richard M. Stallman <rms@gnu.org>
parents:
3034
diff
changeset
|
704 (recent-save (recent-auto-save-p))) |
582 | 705 (or (eq (selected-window) (minibuffer-window)) |
706 (message "Undo!")) | |
475 | 707 (or (eq last-command 'undo) |
708 (progn (undo-start) | |
709 (undo-more 1))) | |
710 (undo-more (or arg 1)) | |
6386
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
711 ;; Don't specify a position in the undo record for the undo command. |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
712 ;; Instead, undoing this should move point to where the change is. |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
713 (let ((tail buffer-undo-list) |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
714 done) |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
715 (while (and tail (not done) (not (null (car tail)))) |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
716 (if (integerp (car tail)) |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
717 (progn |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
718 (setq done t) |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
719 (setq buffer-undo-list (delq (car tail) buffer-undo-list)))) |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
720 (setq tail (cdr tail)))) |
475 | 721 (and modified (not (buffer-modified-p)) |
5935
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
722 (delete-auto-save-file-if-necessary recent-save))) |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
723 ;; If we do get all the way thru, make this-command indicate that. |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
724 (setq this-command 'undo)) |
475 | 725 |
2947
518509536741
(pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents:
2935
diff
changeset
|
726 (defvar pending-undo-list nil |
518509536741
(pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents:
2935
diff
changeset
|
727 "Within a run of consecutive undo commands, list remaining to be undone.") |
518509536741
(pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents:
2935
diff
changeset
|
728 |
475 | 729 (defun undo-start () |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
730 "Set `pending-undo-list' to the front of the undo list. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
731 The next call to `undo-more' will undo the most recently made change." |
475 | 732 (if (eq buffer-undo-list t) |
733 (error "No undo information in this buffer")) | |
734 (setq pending-undo-list buffer-undo-list)) | |
735 | |
736 (defun undo-more (count) | |
737 "Undo back N undo-boundaries beyond what was already undone recently. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
738 Call `undo-start' to get ready to undo recent changes, |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
739 then call `undo-more' one or more times to undo them." |
475 | 740 (or pending-undo-list |
741 (error "No further undo information")) | |
742 (setq pending-undo-list (primitive-undo count pending-undo-list))) | |
743 | |
4374
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
744 (defvar shell-command-history nil |
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
745 "History list for some commands that read shell commands.") |
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
746 |
9779
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
747 (defvar shell-command-switch "-c" |
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
748 "Switch used to have the shell execute its command line argument.") |
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
749 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
750 (defun shell-command (command &optional output-buffer) |
475 | 751 "Execute string COMMAND in inferior shell; display output, if any. |
11072
c5fbb6f272f2
(shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents:
11036
diff
changeset
|
752 |
475 | 753 If COMMAND ends in ampersand, execute it asynchronously. |
11072
c5fbb6f272f2
(shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents:
11036
diff
changeset
|
754 The output appears in the buffer `*Async Shell Command*'. |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
755 That buffer is in shell mode. |
11072
c5fbb6f272f2
(shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents:
11036
diff
changeset
|
756 |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
757 Otherwise, COMMAND is executed synchronously. The output appears in the |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
758 buffer `*Shell Command Output*'. |
11072
c5fbb6f272f2
(shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents:
11036
diff
changeset
|
759 If the output is one line, it is displayed in the echo area *as well*, |
c5fbb6f272f2
(shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents:
11036
diff
changeset
|
760 but it is nonetheless available in buffer `*Shell Command Output*', |
c5fbb6f272f2
(shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents:
11036
diff
changeset
|
761 even though that buffer is not automatically displayed. |
c5fbb6f272f2
(shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents:
11036
diff
changeset
|
762 If there is no output, or if output is inserted in the current buffer, |
c5fbb6f272f2
(shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents:
11036
diff
changeset
|
763 then `*Shell Command Output*' is deleted. |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
764 |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
765 The optional second argument OUTPUT-BUFFER, if non-nil, |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
766 says to put the output in some other buffer. |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
767 If OUTPUT-BUFFER is a buffer or buffer name, put the output there. |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
768 If OUTPUT-BUFFER is not a buffer and not nil, |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
769 insert output in current buffer. (This cannot be done asynchronously.) |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
770 In either case, the output is inserted after point (leaving mark after it)." |
4488
b0a70d8d9af4
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
4477
diff
changeset
|
771 (interactive (list (read-from-minibuffer "Shell command: " |
b0a70d8d9af4
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
4477
diff
changeset
|
772 nil nil nil 'shell-command-history) |
b0a70d8d9af4
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
4477
diff
changeset
|
773 current-prefix-arg)) |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
774 (if (and output-buffer |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
775 (not (or (bufferp output-buffer) (stringp output-buffer)))) |
475 | 776 (progn (barf-if-buffer-read-only) |
777 (push-mark) | |
778 ;; We do not use -f for csh; we will not support broken use of | |
779 ;; .cshrcs. Even the BSD csh manual says to use | |
780 ;; "if ($?prompt) exit" before things which are not useful | |
781 ;; non-interactively. Besides, if someone wants their other | |
782 ;; aliases for shell commands then they can still have them. | |
783 (call-process shell-file-name nil t nil | |
9779
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
784 shell-command-switch command) |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
785 ;; This is like exchange-point-and-mark, but doesn't |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
786 ;; activate the mark. It is cleaner to avoid activation, |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
787 ;; even though the command loop would deactivate the mark |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
788 ;; because we inserted text. |
3029
2bf7bd92bd43
(shell-command): Don't activate mark even momentarily.
Richard M. Stallman <rms@gnu.org>
parents:
2947
diff
changeset
|
789 (goto-char (prog1 (mark t) |
2bf7bd92bd43
(shell-command): Don't activate mark even momentarily.
Richard M. Stallman <rms@gnu.org>
parents:
2947
diff
changeset
|
790 (set-marker (mark-marker) (point) |
2bf7bd92bd43
(shell-command): Don't activate mark even momentarily.
Richard M. Stallman <rms@gnu.org>
parents:
2947
diff
changeset
|
791 (current-buffer))))) |
475 | 792 ;; Preserve the match data in case called from a program. |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
793 (save-match-data |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
794 (if (string-match "[ \t]*&[ \t]*$" command) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
795 ;; Command ending with ampersand means asynchronous. |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
796 (let ((buffer (get-buffer-create |
13960
5f1ba0200a33
(shell-command): Fix message spelling.
Karl Heuer <kwzh@gnu.org>
parents:
13810
diff
changeset
|
797 (or output-buffer "*Async Shell Command*"))) |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
798 (directory default-directory) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
799 proc) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
800 ;; Remove the ampersand. |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
801 (setq command (substring command 0 (match-beginning 0))) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
802 ;; If will kill a process, query first. |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
803 (setq proc (get-buffer-process buffer)) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
804 (if proc |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
805 (if (yes-or-no-p "A command is running. Kill it? ") |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
806 (kill-process proc) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
807 (error "Shell command in progress"))) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
808 (save-excursion |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
809 (set-buffer buffer) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
810 (setq buffer-read-only nil) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
811 (erase-buffer) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
812 (display-buffer buffer) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
813 (setq default-directory directory) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
814 (setq proc (start-process "Shell" buffer shell-file-name |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
815 shell-command-switch command)) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
816 (setq mode-line-process '(":%s")) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
817 (require 'shell) (shell-mode) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
818 (set-process-sentinel proc 'shell-command-sentinel) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
819 )) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
820 (shell-command-on-region (point) (point) command nil) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
821 )))) |
475 | 822 |
823 ;; We have a sentinel to prevent insertion of a termination message | |
824 ;; in the buffer itself. | |
825 (defun shell-command-sentinel (process signal) | |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
826 (if (memq (process-status process) '(exit signal)) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
827 (message "%s: %s." |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
828 (car (cdr (cdr (process-command process)))) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
829 (substring signal 0 -1)))) |
475 | 830 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
831 (defun shell-command-on-region (start end command |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
832 &optional output-buffer replace) |
475 | 833 "Execute string COMMAND in inferior shell with region as input. |
834 Normally display output (if any) in temp buffer `*Shell Command Output*'; | |
835 Prefix arg means replace the region with it. | |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
836 |
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
837 The noninteractive arguments are START, END, COMMAND, OUTPUT-BUFFER, REPLACE. |
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
838 If REPLACE is non-nil, that means insert the output |
10912
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
839 in place of text from START to END, putting point and mark around it. |
475 | 840 |
841 If the output is one line, it is displayed in the echo area, | |
842 but it is nonetheless available in buffer `*Shell Command Output*' | |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
843 even though that buffer is not automatically displayed. |
10854
cd64b7e04e23
(shell-command-on-region): Fix typos in doc string.
Karl Heuer <kwzh@gnu.org>
parents:
10852
diff
changeset
|
844 If there is no output, or if output is inserted in the current buffer, |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
845 then `*Shell Command Output*' is deleted. |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
846 |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
847 If the optional fourth argument OUTPUT-BUFFER is non-nil, |
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
848 that says to put the output in some other buffer. |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
849 If OUTPUT-BUFFER is a buffer or buffer name, put the output there. |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
850 If OUTPUT-BUFFER is not a buffer and not nil, |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
851 insert output in the current buffer. |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
852 In either case, the output is inserted after point (leaving mark after it)." |
10805
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
853 (interactive (let ((string |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
854 ;; Do this before calling region-beginning |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
855 ;; and region-end, in case subprocess output |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
856 ;; relocates them while we are in the minibuffer. |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
857 (read-from-minibuffer "Shell command on region: " |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
858 nil nil nil |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
859 'shell-command-history))) |
13482
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
860 ;; call-interactively recognizes region-beginning and |
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
861 ;; region-end specially, leaving them in the history. |
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
862 (list (region-beginning) (region-end) |
10805
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
863 string |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
864 current-prefix-arg |
10912
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
865 current-prefix-arg))) |
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
866 (if (or replace |
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
867 (and output-buffer |
13810
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
868 (not (or (bufferp output-buffer) (stringp output-buffer)))) |
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
869 (equal (buffer-name (current-buffer)) "*Shell Command Output*")) |
475 | 870 ;; Replace specified region with output from command. |
12838
7e28ff12e682
(shell-command-on-region): Don't examine order of
Richard M. Stallman <rms@gnu.org>
parents:
12789
diff
changeset
|
871 (let ((swap (and replace (< start end)))) |
10912
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
872 ;; Don't muck with mark unless REPLACE says we should. |
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
873 (goto-char start) |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
874 (and replace (push-mark)) |
475 | 875 (call-process-region start end shell-file-name t t nil |
9779
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
876 shell-command-switch command) |
8604
7fff44ad20c9
(shell-command-on-region): Don't delete current buffer.
Karl Heuer <kwzh@gnu.org>
parents:
8600
diff
changeset
|
877 (let ((shell-buffer (get-buffer "*Shell Command Output*"))) |
7fff44ad20c9
(shell-command-on-region): Don't delete current buffer.
Karl Heuer <kwzh@gnu.org>
parents:
8600
diff
changeset
|
878 (and shell-buffer (not (eq shell-buffer (current-buffer))) |
7fff44ad20c9
(shell-command-on-region): Don't delete current buffer.
Karl Heuer <kwzh@gnu.org>
parents:
8600
diff
changeset
|
879 (kill-buffer shell-buffer))) |
10912
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
880 ;; Don't muck with mark unless REPLACE says we should. |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
881 (and replace swap (exchange-point-and-mark))) |
475 | 882 ;; No prefix argument: put the output in a temp buffer, |
883 ;; replacing its entire contents. | |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
884 (let ((buffer (get-buffer-create |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
885 (or output-buffer "*Shell Command Output*"))) |
5635
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
886 (success nil)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
887 (unwind-protect |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
888 (if (eq buffer (current-buffer)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
889 ;; If the input is the same buffer as the output, |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
890 ;; delete everything but the specified region, |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
891 ;; then replace that region with the output. |
9065
e321617e3fc6
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
8998
diff
changeset
|
892 (progn (setq buffer-read-only nil) |
12838
7e28ff12e682
(shell-command-on-region): Don't examine order of
Richard M. Stallman <rms@gnu.org>
parents:
12789
diff
changeset
|
893 (delete-region (max start end) (point-max)) |
7e28ff12e682
(shell-command-on-region): Don't examine order of
Richard M. Stallman <rms@gnu.org>
parents:
12789
diff
changeset
|
894 (delete-region (point-min) (max start end)) |
5635
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
895 (call-process-region (point-min) (point-max) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
896 shell-file-name t t nil |
9779
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
897 shell-command-switch command) |
5635
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
898 (setq success t)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
899 ;; Clear the output buffer, then run the command with output there. |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
900 (save-excursion |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
901 (set-buffer buffer) |
9065
e321617e3fc6
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
8998
diff
changeset
|
902 (setq buffer-read-only nil) |
5635
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
903 (erase-buffer)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
904 (call-process-region start end shell-file-name |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
905 nil buffer nil |
9779
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
906 shell-command-switch command) |
5635
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
907 (setq success t)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
908 ;; Report the amount of output. |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
909 (let ((lines (save-excursion |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
910 (set-buffer buffer) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
911 (if (= (buffer-size) 0) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
912 0 |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
913 (count-lines (point-min) (point-max)))))) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
914 (cond ((= lines 0) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
915 (if success |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
916 (message "(Shell command completed with no output)")) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
917 (kill-buffer buffer)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
918 ((and success (= lines 1)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
919 (message "%s" |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
920 (save-excursion |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
921 (set-buffer buffer) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
922 (goto-char (point-min)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
923 (buffer-substring (point) |
7426
58372be37e3a
(shell-command-on-region): Don't kill output buffer when in the one line case.
Richard M. Stallman <rms@gnu.org>
parents:
7373
diff
changeset
|
924 (progn (end-of-line) (point)))))) |
5635
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
925 (t |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
926 (set-window-start (display-buffer buffer) 1)))))))) |
475 | 927 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
928 (defconst universal-argument-map |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
929 (let ((map (make-sparse-keymap))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
930 (define-key map [t] 'universal-argument-other-key) |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
931 (define-key map (vector meta-prefix-char t) 'universal-argument-other-key) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
932 (define-key map [switch-frame] nil) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
933 (define-key map [?\C-u] 'universal-argument-more) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
934 (define-key map [?-] 'universal-argument-minus) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
935 (define-key map [?0] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
936 (define-key map [?1] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
937 (define-key map [?2] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
938 (define-key map [?3] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
939 (define-key map [?4] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
940 (define-key map [?5] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
941 (define-key map [?6] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
942 (define-key map [?7] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
943 (define-key map [?8] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
944 (define-key map [?9] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
945 map) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
946 "Keymap used while processing \\[universal-argument].") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
947 |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
948 (defvar universal-argument-num-events nil |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
949 "Number of argument-specifying events read by `universal-argument'. |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
950 `universal-argument-other-key' uses this to discard those events |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
951 from (this-command-keys), and reread only the final command.") |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
952 |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
953 (defun universal-argument () |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
954 "Begin a numeric argument for the following command. |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
955 Digits or minus sign following \\[universal-argument] make up the numeric argument. |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
956 \\[universal-argument] following the digits or minus sign ends the argument. |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
957 \\[universal-argument] without digits or minus sign provides 4 as argument. |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
958 Repeating \\[universal-argument] without digits or minus sign |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
959 multiplies the argument by 4 each time." |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
960 (interactive) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
961 (setq prefix-arg (list 4)) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
962 (setq universal-argument-num-events (length (this-command-keys))) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
963 (setq overriding-terminal-local-map universal-argument-map)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
964 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
965 ;; A subsequent C-u means to multiply the factor by 4 if we've typed |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
966 ;; nothing but C-u's; otherwise it means to terminate the prefix arg. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
967 (defun universal-argument-more (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
968 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
969 (if (consp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
970 (setq prefix-arg (list (* 4 (car arg)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
971 (setq prefix-arg arg) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
972 (setq overriding-terminal-local-map nil)) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
973 (setq universal-argument-num-events (length (this-command-keys)))) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
974 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
975 (defun negative-argument (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
976 "Begin a negative numeric argument for the next command. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
977 \\[universal-argument] following digits or minus sign ends the argument." |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
978 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
979 (cond ((integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
980 (setq prefix-arg (- arg))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
981 ((eq arg '-) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
982 (setq prefix-arg nil)) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
983 (t |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
984 (setq prefix-arg '-))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
985 (setq universal-argument-num-events (length (this-command-keys))) |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
986 (setq overriding-terminal-local-map universal-argument-map)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
987 |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
988 (defun digit-argument (arg) |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
989 "Part of the numeric argument for the next command. |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
990 \\[universal-argument] following digits or minus sign ends the argument." |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
991 (interactive "P") |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
992 (let ((digit (- (logand last-command-char ?\177) ?0))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
993 (cond ((integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
994 (setq prefix-arg (+ (* arg 10) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
995 (if (< arg 0) (- digit) digit)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
996 ((eq arg '-) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
997 ;; Treat -0 as just -, so that -01 will work. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
998 (setq prefix-arg (if (zerop digit) '- (- digit)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
999 (t |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
1000 (setq prefix-arg digit)))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1001 (setq universal-argument-num-events (length (this-command-keys))) |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
1002 (setq overriding-terminal-local-map universal-argument-map)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1003 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1004 ;; For backward compatibility, minus with no modifiers is an ordinary |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1005 ;; command if digits have already been entered. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1006 (defun universal-argument-minus (arg) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1007 (interactive "P") |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1008 (if (integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1009 (universal-argument-other-key arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1010 (negative-argument arg))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1011 |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1012 ;; Anything else terminates the argument and is left in the queue to be |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1013 ;; executed as a command. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1014 (defun universal-argument-other-key (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1015 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1016 (setq prefix-arg arg) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1017 (let* ((key (this-command-keys)) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1018 (keylist (listify-key-sequence key))) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1019 (setq unread-command-events |
13525
de50b50309d1
(universal-argument-other-key): Add to existing unread-command-events value.
Richard M. Stallman <rms@gnu.org>
parents:
13482
diff
changeset
|
1020 (append (nthcdr universal-argument-num-events keylist) |
de50b50309d1
(universal-argument-other-key): Add to existing unread-command-events value.
Richard M. Stallman <rms@gnu.org>
parents:
13482
diff
changeset
|
1021 unread-command-events))) |
12320
979836b1a1a9
(universal-argument-other-key): Call reset-this-command-lengths.
Richard M. Stallman <rms@gnu.org>
parents:
12313
diff
changeset
|
1022 (reset-this-command-lengths) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1023 (setq overriding-terminal-local-map nil)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1024 |
475 | 1025 (defun forward-to-indentation (arg) |
1026 "Move forward ARG lines and position at first nonblank character." | |
1027 (interactive "p") | |
1028 (forward-line arg) | |
1029 (skip-chars-forward " \t")) | |
1030 | |
1031 (defun backward-to-indentation (arg) | |
1032 "Move backward ARG lines and position at first nonblank character." | |
1033 (interactive "p") | |
1034 (forward-line (- arg)) | |
1035 (skip-chars-forward " \t")) | |
1036 | |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1037 (defvar kill-whole-line nil |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1038 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line.") |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1039 |
475 | 1040 (defun kill-line (&optional arg) |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1041 "Kill the rest of the current line; if no nonblanks there, kill thru newline. |
475 | 1042 With prefix argument, kill that many lines from point. |
1043 Negative arguments kill lines backward. | |
1044 | |
1045 When calling from a program, nil means \"no arg\", | |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1046 a number counts as a prefix arg. |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1047 |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1048 If `kill-whole-line' is non-nil, then kill the whole line |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1049 when given no argument at the beginning of a line." |
475 | 1050 (interactive "P") |
1051 (kill-region (point) | |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1052 ;; It is better to move point to the other end of the kill |
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1053 ;; before killing. That way, in a read-only buffer, point |
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1054 ;; moves across the text that is copied to the kill ring. |
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1055 ;; The choice has no effect on undo now that undo records |
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1056 ;; the value of point from before the command was run. |
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1057 (progn |
475 | 1058 (if arg |
1059 (forward-line (prefix-numeric-value arg)) | |
1060 (if (eobp) | |
1061 (signal 'end-of-buffer nil)) | |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1062 (if (or (looking-at "[ \t]*$") (and kill-whole-line (bolp))) |
475 | 1063 (forward-line 1) |
1064 (end-of-line))) | |
1065 (point)))) | |
1066 | |
715 | 1067 ;;;; Window system cut and paste hooks. |
1068 | |
1069 (defvar interprogram-cut-function nil | |
1070 "Function to call to make a killed region available to other programs. | |
1071 | |
1072 Most window systems provide some sort of facility for cutting and | |
3034
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1073 pasting text between the windows of different programs. |
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1074 This variable holds a function that Emacs calls whenever text |
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1075 is put in the kill ring, to make the new kill available to other |
715 | 1076 programs. |
1077 | |
3034
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1078 The function takes one or two arguments. |
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1079 The first argument, TEXT, is a string containing |
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1080 the text which should be made available. |
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1081 The second, PUSH, if non-nil means this is a \"new\" kill; |
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1082 nil means appending to an \"old\" kill.") |
715 | 1083 |
1084 (defvar interprogram-paste-function nil | |
1085 "Function to call to get text cut from other programs. | |
1086 | |
1087 Most window systems provide some sort of facility for cutting and | |
3034
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1088 pasting text between the windows of different programs. |
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1089 This variable holds a function that Emacs calls to obtain |
715 | 1090 text that other programs have provided for pasting. |
1091 | |
1092 The function should be called with no arguments. If the function | |
1093 returns nil, then no other program has provided such text, and the top | |
1094 of the Emacs kill ring should be used. If the function returns a | |
727 | 1095 string, that string should be put in the kill ring as the latest kill. |
1096 | |
1097 Note that the function should return a string only if a program other | |
1098 than Emacs has provided a string for pasting; if Emacs provided the | |
1099 most recent string, the function should return nil. If it is | |
1100 difficult to tell whether Emacs or some other program provided the | |
1101 current string, it is probably good enough to return nil if the string | |
1102 is equal (according to `string=') to the last text Emacs provided.") | |
715 | 1103 |
1104 | |
1105 | |
1106 ;;;; The kill ring data structure. | |
475 | 1107 |
1108 (defvar kill-ring nil | |
715 | 1109 "List of killed text sequences. |
1110 Since the kill ring is supposed to interact nicely with cut-and-paste | |
1111 facilities offered by window systems, use of this variable should | |
1112 interact nicely with `interprogram-cut-function' and | |
1113 `interprogram-paste-function'. The functions `kill-new', | |
1114 `kill-append', and `current-kill' are supposed to implement this | |
1115 interaction; you may want to use them instead of manipulating the kill | |
1116 ring directly.") | |
475 | 1117 |
1118 (defconst kill-ring-max 30 | |
1119 "*Maximum length of kill ring before oldest elements are thrown away.") | |
1120 | |
1121 (defvar kill-ring-yank-pointer nil | |
1122 "The tail of the kill ring whose car is the last thing yanked.") | |
1123 | |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1124 (defun kill-new (string &optional replace) |
715 | 1125 "Make STRING the latest kill in the kill ring. |
1126 Set the kill-ring-yank pointer to point to it. | |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1127 If `interprogram-cut-function' is non-nil, apply it to STRING. |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1128 Optional second argument REPLACE non-nil means that STRING will replace |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1129 the front of the kill ring, rather than being added to the list." |
8768
e2073805b688
(kill-new): Call menu-bar-update-yank-menu only if that function is defined.
Karl Heuer <kwzh@gnu.org>
parents:
8763
diff
changeset
|
1130 (and (fboundp 'menu-bar-update-yank-menu) |
e2073805b688
(kill-new): Call menu-bar-update-yank-menu only if that function is defined.
Karl Heuer <kwzh@gnu.org>
parents:
8763
diff
changeset
|
1131 (menu-bar-update-yank-menu string (and replace (car kill-ring)))) |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1132 (if replace |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1133 (setcar kill-ring string) |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1134 (setq kill-ring (cons string kill-ring)) |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1135 (if (> (length kill-ring) kill-ring-max) |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1136 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))) |
715 | 1137 (setq kill-ring-yank-pointer kill-ring) |
1138 (if interprogram-cut-function | |
12975
9bad6a54e268
(kill-new): Compute 2nd arg to interprogram-cut-function based on REPLACE.
Richard M. Stallman <rms@gnu.org>
parents:
12939
diff
changeset
|
1139 (funcall interprogram-cut-function string (not replace)))) |
715 | 1140 |
475 | 1141 (defun kill-append (string before-p) |
715 | 1142 "Append STRING to the end of the latest kill in the kill ring. |
1143 If BEFORE-P is non-nil, prepend STRING to the kill. | |
1760 | 1144 If `interprogram-cut-function' is set, pass the resulting kill to |
715 | 1145 it." |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1146 (kill-new (if before-p |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1147 (concat string (car kill-ring)) |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1148 (concat (car kill-ring) string)) t)) |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
1149 |
715 | 1150 (defun current-kill (n &optional do-not-move) |
1151 "Rotate the yanking point by N places, and then return that kill. | |
1152 If N is zero, `interprogram-paste-function' is set, and calling it | |
1153 returns a string, then that string is added to the front of the | |
1154 kill ring and returned as the latest kill. | |
1155 If optional arg DO-NOT-MOVE is non-nil, then don't actually move the | |
1156 yanking point; just return the Nth kill forward." | |
1157 (let ((interprogram-paste (and (= n 0) | |
1158 interprogram-paste-function | |
1159 (funcall interprogram-paste-function)))) | |
1160 (if interprogram-paste | |
1161 (progn | |
1162 ;; Disable the interprogram cut function when we add the new | |
1163 ;; text to the kill ring, so Emacs doesn't try to own the | |
1164 ;; selection, with identical text. | |
1165 (let ((interprogram-cut-function nil)) | |
1166 (kill-new interprogram-paste)) | |
1167 interprogram-paste) | |
1168 (or kill-ring (error "Kill ring is empty")) | |
4511
db555f6edd6b
(current-kill): Replace (% (+ N (- L K)) L) with (mod (- N K) L),
Paul Eggert <eggert@twinsun.com>
parents:
4488
diff
changeset
|
1169 (let ((ARGth-kill-element |
db555f6edd6b
(current-kill): Replace (% (+ N (- L K)) L) with (mod (- N K) L),
Paul Eggert <eggert@twinsun.com>
parents:
4488
diff
changeset
|
1170 (nthcdr (mod (- n (length kill-ring-yank-pointer)) |
db555f6edd6b
(current-kill): Replace (% (+ N (- L K)) L) with (mod (- N K) L),
Paul Eggert <eggert@twinsun.com>
parents:
4488
diff
changeset
|
1171 (length kill-ring)) |
db555f6edd6b
(current-kill): Replace (% (+ N (- L K)) L) with (mod (- N K) L),
Paul Eggert <eggert@twinsun.com>
parents:
4488
diff
changeset
|
1172 kill-ring))) |
715 | 1173 (or do-not-move |
1174 (setq kill-ring-yank-pointer ARGth-kill-element)) | |
1175 (car ARGth-kill-element))))) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
1176 |
715 | 1177 |
1178 | |
1179 ;;;; Commands for manipulating the kill ring. | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
1180 |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1181 (defvar kill-read-only-ok nil |
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1182 "*Non-nil means don't signal an error for killing read-only text.") |
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1183 |
475 | 1184 (defun kill-region (beg end) |
1185 "Kill between point and mark. | |
1186 The text is deleted but saved in the kill ring. | |
1187 The command \\[yank] can retrieve it from there. | |
1188 \(If you want to kill and then yank immediately, use \\[copy-region-as-kill].) | |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1189 If the buffer is read-only, Emacs will beep and refrain from deleting |
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1190 the text, but put the text in the kill ring anyway. This means that |
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1191 you can use the killing commands to copy text from a read-only buffer. |
475 | 1192 |
1193 This is the primitive for programs to kill text (as opposed to deleting it). | |
1194 Supply two arguments, character numbers indicating the stretch of text | |
1195 to be killed. | |
1196 Any command that calls this function is a \"kill command\". | |
1197 If the previous command was also a kill command, | |
1198 the text killed this time appends to the text killed last time | |
1199 to make one entry in the kill ring." | |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1200 (interactive "r") |
715 | 1201 (cond |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1202 |
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1203 ;; If the buffer is read-only, we should beep, in case the person |
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1204 ;; just isn't aware of this. However, there's no harm in putting |
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1205 ;; the region's text in the kill ring, anyway. |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1206 ((or (and buffer-read-only (not inhibit-read-only)) |
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1207 (text-property-not-all beg end 'read-only nil)) |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1208 (copy-region-as-kill beg end) |
1982
d65c1fefc636
* simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents:
1838
diff
changeset
|
1209 ;; This should always barf, and give us the correct error. |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1210 (if kill-read-only-ok |
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1211 (message "Read only text copied to kill ring") |
10012
4b936f4cad5c
(kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents:
9876
diff
changeset
|
1212 (setq this-command 'kill-region) |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1213 (barf-if-buffer-read-only))) |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1214 |
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1215 ;; In certain cases, we can arrange for the undo list and the kill |
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1216 ;; ring to share the same string object. This code does that. |
715 | 1217 ((not (or (eq buffer-undo-list t) |
1218 (eq last-command 'kill-region) | |
10034
1c6132b72da9
(kill-region): Use = to compare positions.
Richard M. Stallman <rms@gnu.org>
parents:
10012
diff
changeset
|
1219 ;; Use = since positions may be numbers or markers. |
1c6132b72da9
(kill-region): Use = to compare positions.
Richard M. Stallman <rms@gnu.org>
parents:
10012
diff
changeset
|
1220 (= beg end))) |
715 | 1221 ;; Don't let the undo list be truncated before we can even access it. |
3967
42932adb7074
(kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents:
3947
diff
changeset
|
1222 (let ((undo-strong-limit (+ (- (max beg end) (min beg end)) 100)) |
42932adb7074
(kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents:
3947
diff
changeset
|
1223 (old-list buffer-undo-list) |
42932adb7074
(kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents:
3947
diff
changeset
|
1224 tail) |
715 | 1225 (delete-region beg end) |
3967
42932adb7074
(kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents:
3947
diff
changeset
|
1226 ;; Search back in buffer-undo-list for this string, |
42932adb7074
(kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents:
3947
diff
changeset
|
1227 ;; in case a change hook made property changes. |
42932adb7074
(kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents:
3947
diff
changeset
|
1228 (setq tail buffer-undo-list) |
42932adb7074
(kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents:
3947
diff
changeset
|
1229 (while (not (stringp (car (car tail)))) |
42932adb7074
(kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents:
3947
diff
changeset
|
1230 (setq tail (cdr tail))) |
715 | 1231 ;; Take the same string recorded for undo |
1232 ;; and put it in the kill-ring. | |
10012
4b936f4cad5c
(kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents:
9876
diff
changeset
|
1233 (kill-new (car (car tail))))) |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1234 |
715 | 1235 (t |
475 | 1236 (copy-region-as-kill beg end) |
10012
4b936f4cad5c
(kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents:
9876
diff
changeset
|
1237 (delete-region beg end))) |
4b936f4cad5c
(kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents:
9876
diff
changeset
|
1238 (setq this-command 'kill-region)) |
475 | 1239 |
9876
75ecf866cfb8
Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents:
9870
diff
changeset
|
1240 ;; copy-region-as-kill no longer sets this-command, because it's confusing |
75ecf866cfb8
Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents:
9870
diff
changeset
|
1241 ;; to get two copies of the text when the user accidentally types M-w and |
75ecf866cfb8
Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents:
9870
diff
changeset
|
1242 ;; then corrects it with the intended C-w. |
475 | 1243 (defun copy-region-as-kill (beg end) |
1244 "Save the region as if killed, but don't kill it. | |
617 | 1245 If `interprogram-cut-function' is non-nil, also save the text for a window |
1246 system cut and paste." | |
475 | 1247 (interactive "r") |
1248 (if (eq last-command 'kill-region) | |
1249 (kill-append (buffer-substring beg end) (< end beg)) | |
715 | 1250 (kill-new (buffer-substring beg end))) |
475 | 1251 nil) |
1252 | |
1253 (defun kill-ring-save (beg end) | |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
1254 "Save the region as if killed, but don't kill it. |
3467
002945794814
(kill-ring-save): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
3408
diff
changeset
|
1255 This command is similar to `copy-region-as-kill', except that it gives |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
1256 visual feedback indicating the extent of the region being copied. |
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
1257 If `interprogram-cut-function' is non-nil, also save the text for a window |
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
1258 system cut and paste." |
475 | 1259 (interactive "r") |
1260 (copy-region-as-kill beg end) | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
1261 (if (interactive-p) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1262 (let ((other-end (if (= (point) beg) end beg)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1263 (opoint (point)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1264 ;; Inhibit quitting so we can make a quit here |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1265 ;; look like a C-g typed as a command. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1266 (inhibit-quit t)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1267 (if (pos-visible-in-window-p other-end (selected-window)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1268 (progn |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1269 ;; Swap point and mark. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1270 (set-marker (mark-marker) (point) (current-buffer)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1271 (goto-char other-end) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1272 (sit-for 1) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1273 ;; Swap back. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1274 (set-marker (mark-marker) other-end (current-buffer)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1275 (goto-char opoint) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1276 ;; If user quit, deactivate the mark |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1277 ;; as C-g would as a command. |
4044
ad0643aa3ebf
(kill-ring-save): Call deactivate-mark regardless of transient-mark-mode.
Roland McGrath <roland@gnu.org>
parents:
4042
diff
changeset
|
1278 (and quit-flag mark-active |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1279 (deactivate-mark))) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1280 (let* ((killed-text (current-kill 0)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1281 (message-len (min (length killed-text) 40))) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1282 (if (= (point) beg) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1283 ;; Don't say "killed"; that is misleading. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1284 (message "Saved text until \"%s\"" |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1285 (substring killed-text (- message-len))) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1286 (message "Saved text from \"%s\"" |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1287 (substring killed-text 0 message-len)))))))) |
475 | 1288 |
1289 (defun append-next-kill () | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1290 "Cause following command, if it kills, to append to previous kill." |
475 | 1291 (interactive) |
1292 (if (interactive-p) | |
1293 (progn | |
1294 (setq this-command 'kill-region) | |
1295 (message "If the next command is a kill, it will append")) | |
1296 (setq last-command 'kill-region))) | |
1297 | |
1298 (defun yank-pop (arg) | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1299 "Replace just-yanked stretch of killed text with a different stretch. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1300 This command is allowed only immediately after a `yank' or a `yank-pop'. |
475 | 1301 At such a time, the region contains a stretch of reinserted |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1302 previously-killed text. `yank-pop' deletes that text and inserts in its |
475 | 1303 place a different stretch of killed text. |
1304 | |
1305 With no argument, the previous kill is inserted. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1306 With argument N, insert the Nth previous kill. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1307 If N is negative, this is a more recent kill. |
475 | 1308 |
1309 The sequence of kills wraps around, so that after the oldest one | |
1310 comes the newest one." | |
1311 (interactive "*p") | |
1312 (if (not (eq last-command 'yank)) | |
1313 (error "Previous command was not a yank")) | |
1314 (setq this-command 'yank) | |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1315 (let ((before (< (point) (mark t)))) |
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1316 (delete-region (point) (mark t)) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1317 (set-marker (mark-marker) (point) (current-buffer)) |
715 | 1318 (insert (current-kill arg)) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1319 (if before |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1320 ;; This is like exchange-point-and-mark, but doesn't activate the mark. |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1321 ;; It is cleaner to avoid activation, even though the command |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1322 ;; loop would deactivate the mark because we inserted text. |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1323 (goto-char (prog1 (mark t) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1324 (set-marker (mark-marker) (point) (current-buffer)))))) |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
1325 nil) |
475 | 1326 |
1327 (defun yank (&optional arg) | |
1328 "Reinsert the last stretch of killed text. | |
1329 More precisely, reinsert the stretch of killed text most recently | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1330 killed OR yanked. Put point at end, and set mark at beginning. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1331 With just C-u as argument, same but put point at beginning (and mark at end). |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1332 With argument N, reinsert the Nth most recently killed stretch of killed |
475 | 1333 text. |
1334 See also the command \\[yank-pop]." | |
1335 (interactive "*P") | |
5935
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
1336 ;; If we don't get all the way thru, make last-command indicate that |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
1337 ;; for the following command. |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
1338 (setq this-command t) |
475 | 1339 (push-mark (point)) |
715 | 1340 (insert (current-kill (cond |
1341 ((listp arg) 0) | |
1342 ((eq arg '-) -1) | |
1343 (t (1- arg))))) | |
475 | 1344 (if (consp arg) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1345 ;; This is like exchange-point-and-mark, but doesn't activate the mark. |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1346 ;; It is cleaner to avoid activation, even though the command |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1347 ;; loop would deactivate the mark because we inserted text. |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1348 (goto-char (prog1 (mark t) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1349 (set-marker (mark-marker) (point) (current-buffer))))) |
5935
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
1350 ;; If we do get all the way thru, make this-command indicate that. |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
1351 (setq this-command 'yank) |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
1352 nil) |
715 | 1353 |
1354 (defun rotate-yank-pointer (arg) | |
1355 "Rotate the yanking point in the kill ring. | |
1356 With argument, rotate that many kills forward (or backward, if negative)." | |
1357 (interactive "p") | |
1358 (current-kill arg)) | |
1359 | |
475 | 1360 |
1361 (defun insert-buffer (buffer) | |
1362 "Insert after point the contents of BUFFER. | |
1363 Puts mark after the inserted text. | |
1364 BUFFER may be a buffer or a buffer name." | |
1331
dd2c33afcef2
(insert-buffer): Before reading arg, barf if read-only.
Richard M. Stallman <rms@gnu.org>
parents:
1321
diff
changeset
|
1365 (interactive (list (progn (barf-if-buffer-read-only) |
8998
25406f41c336
(insert-buffer): Default to first buffer other than current one.
Richard M. Stallman <rms@gnu.org>
parents:
8768
diff
changeset
|
1366 (read-buffer "Insert buffer: " |
25406f41c336
(insert-buffer): Default to first buffer other than current one.
Richard M. Stallman <rms@gnu.org>
parents:
8768
diff
changeset
|
1367 (other-buffer (current-buffer) t) |
25406f41c336
(insert-buffer): Default to first buffer other than current one.
Richard M. Stallman <rms@gnu.org>
parents:
8768
diff
changeset
|
1368 t)))) |
475 | 1369 (or (bufferp buffer) |
1370 (setq buffer (get-buffer buffer))) | |
1371 (let (start end newmark) | |
1372 (save-excursion | |
1373 (save-excursion | |
1374 (set-buffer buffer) | |
1375 (setq start (point-min) end (point-max))) | |
1376 (insert-buffer-substring buffer start end) | |
1377 (setq newmark (point))) | |
1982
d65c1fefc636
* simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents:
1838
diff
changeset
|
1378 (push-mark newmark)) |
d65c1fefc636
* simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents:
1838
diff
changeset
|
1379 nil) |
475 | 1380 |
1381 (defun append-to-buffer (buffer start end) | |
1382 "Append to specified buffer the text of the region. | |
1383 It is inserted into that buffer before its point. | |
1384 | |
1385 When calling from a program, give three arguments: | |
1386 BUFFER (or buffer name), START and END. | |
1387 START and END specify the portion of the current buffer to be copied." | |
715 | 1388 (interactive |
10048
db01a04d2afb
(append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents:
10034
diff
changeset
|
1389 (list (read-buffer "Append to buffer: " (other-buffer (current-buffer) t)) |
3629
58add805382e
(append-to-buffer): Interactively, supply all 3 args.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1390 (region-beginning) (region-end))) |
475 | 1391 (let ((oldbuf (current-buffer))) |
1392 (save-excursion | |
1393 (set-buffer (get-buffer-create buffer)) | |
1394 (insert-buffer-substring oldbuf start end)))) | |
1395 | |
1396 (defun prepend-to-buffer (buffer start end) | |
1397 "Prepend to specified buffer the text of the region. | |
1398 It is inserted into that buffer after its point. | |
1399 | |
1400 When calling from a program, give three arguments: | |
1401 BUFFER (or buffer name), START and END. | |
1402 START and END specify the portion of the current buffer to be copied." | |
1403 (interactive "BPrepend to buffer: \nr") | |
1404 (let ((oldbuf (current-buffer))) | |
1405 (save-excursion | |
1406 (set-buffer (get-buffer-create buffer)) | |
1407 (save-excursion | |
1408 (insert-buffer-substring oldbuf start end))))) | |
1409 | |
1410 (defun copy-to-buffer (buffer start end) | |
1411 "Copy to specified buffer the text of the region. | |
1412 It is inserted into that buffer, replacing existing text there. | |
1413 | |
1414 When calling from a program, give three arguments: | |
1415 BUFFER (or buffer name), START and END. | |
1416 START and END specify the portion of the current buffer to be copied." | |
1417 (interactive "BCopy to buffer: \nr") | |
1418 (let ((oldbuf (current-buffer))) | |
1419 (save-excursion | |
1420 (set-buffer (get-buffer-create buffer)) | |
1421 (erase-buffer) | |
1422 (save-excursion | |
1423 (insert-buffer-substring oldbuf start end))))) | |
1424 | |
4040
d06d7295d3eb
Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents:
3967
diff
changeset
|
1425 (put 'mark-inactive 'error-conditions '(mark-inactive error)) |
d06d7295d3eb
Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents:
3967
diff
changeset
|
1426 (put 'mark-inactive 'error-message "The mark is not active now") |
d06d7295d3eb
Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents:
3967
diff
changeset
|
1427 |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1428 (defun mark (&optional force) |
3487 | 1429 "Return this buffer's mark value as integer; error if mark inactive. |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1430 If optional argument FORCE is non-nil, access the mark value |
3487 | 1431 even if the mark is not currently active, and return nil |
1432 if there is no mark at all. | |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1433 |
475 | 1434 If you are using this in an editing command, you are most likely making |
1435 a mistake; see the documentation of `set-mark'." | |
10525
8c7043925702
(mark): If transient-mark-mode is nil, mark is active.
Karl Heuer <kwzh@gnu.org>
parents:
10471
diff
changeset
|
1436 (if (or force (not transient-mark-mode) mark-active mark-even-if-inactive) |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1437 (marker-position (mark-marker)) |
4040
d06d7295d3eb
Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents:
3967
diff
changeset
|
1438 (signal 'mark-inactive nil))) |
475 | 1439 |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1440 ;; Many places set mark-active directly, and several of them failed to also |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1441 ;; run deactivate-mark-hook. This shorthand should simplify. |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1442 (defsubst deactivate-mark () |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1443 "Deactivate the mark by setting `mark-active' to nil. |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1444 \(That makes a difference only in Transient Mark mode.) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1445 Also runs the hook `deactivate-mark-hook'." |
7726
0998ca7d922c
(deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents:
7698
diff
changeset
|
1446 (if transient-mark-mode |
0998ca7d922c
(deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents:
7698
diff
changeset
|
1447 (progn |
0998ca7d922c
(deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents:
7698
diff
changeset
|
1448 (setq mark-active nil) |
0998ca7d922c
(deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents:
7698
diff
changeset
|
1449 (run-hooks 'deactivate-mark-hook)))) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1450 |
475 | 1451 (defun set-mark (pos) |
1452 "Set this buffer's mark to POS. Don't use this function! | |
1453 That is to say, don't use this function unless you want | |
1454 the user to see that the mark has moved, and you want the previous | |
1455 mark position to be lost. | |
1456 | |
1457 Normally, when a new mark is set, the old one should go on the stack. | |
1458 This is why most applications should use push-mark, not set-mark. | |
1459 | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1460 Novice Emacs Lisp programmers often try to use the mark for the wrong |
475 | 1461 purposes. The mark saves a location for the user's convenience. |
1462 Most editing commands should not alter the mark. | |
1463 To remember a location for internal use in the Lisp program, | |
1464 store it in a Lisp variable. Example: | |
1465 | |
1466 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))." | |
1467 | |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1468 (if pos |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1469 (progn |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1470 (setq mark-active t) |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1471 (run-hooks 'activate-mark-hook) |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1472 (set-marker (mark-marker) pos (current-buffer))) |
8660
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
1473 ;; Normally we never clear mark-active except in Transient Mark mode. |
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
1474 ;; But when we actually clear out the mark value too, |
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
1475 ;; we must clear mark-active in any mode. |
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
1476 (setq mark-active nil) |
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
1477 (run-hooks 'deactivate-mark-hook) |
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
1478 (set-marker (mark-marker) nil))) |
475 | 1479 |
1480 (defvar mark-ring nil | |
8695
0f702e9ab06d
(mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8660
diff
changeset
|
1481 "The list of former marks of the current buffer, most recent first.") |
475 | 1482 (make-variable-buffer-local 'mark-ring) |
8695
0f702e9ab06d
(mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8660
diff
changeset
|
1483 (put 'mark-ring 'permanent-local t) |
475 | 1484 |
1485 (defconst mark-ring-max 16 | |
1486 "*Maximum size of mark ring. Start discarding off end if gets this big.") | |
1487 | |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1488 (defvar global-mark-ring nil |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1489 "The list of saved global marks, most recent first.") |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1490 |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1491 (defconst global-mark-ring-max 16 |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1492 "*Maximum size of global mark ring. \ |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1493 Start discarding off end if gets this big.") |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1494 |
475 | 1495 (defun set-mark-command (arg) |
1496 "Set mark at where point is, or jump to mark. | |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1497 With no prefix argument, set mark, push old mark position on local mark |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1498 ring, and push mark on global mark ring. |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1499 With argument, jump to mark, and pop a new position for mark off the ring |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1500 \(does not affect global mark ring\). |
475 | 1501 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1502 Novice Emacs Lisp programmers often try to use the mark for the wrong |
475 | 1503 purposes. See the documentation of `set-mark' for more information." |
1504 (interactive "P") | |
1505 (if (null arg) | |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1506 (progn |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1507 (push-mark nil nil t)) |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1508 (if (null (mark t)) |
475 | 1509 (error "No mark set in this buffer") |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1510 (goto-char (mark t)) |
475 | 1511 (pop-mark)))) |
1512 | |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1513 (defun push-mark (&optional location nomsg activate) |
475 | 1514 "Set mark at LOCATION (point, by default) and push old mark on mark ring. |
5812
1959e5c4a563
(push-mark): Don't push on global-mark-ring if its car is a marker in the
Roland McGrath <roland@gnu.org>
parents:
5811
diff
changeset
|
1515 If the last global mark pushed was not in the current buffer, |
1959e5c4a563
(push-mark): Don't push on global-mark-ring if its car is a marker in the
Roland McGrath <roland@gnu.org>
parents:
5811
diff
changeset
|
1516 also push LOCATION on the global mark ring. |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1517 Display `Mark set' unless the optional second arg NOMSG is non-nil. |
2844
086fda6b2041
(push-mark): Always activate the mark if not in Transient Mark mode.
Richard M. Stallman <rms@gnu.org>
parents:
2824
diff
changeset
|
1518 In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil. |
475 | 1519 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1520 Novice Emacs Lisp programmers often try to use the mark for the wrong |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1521 purposes. See the documentation of `set-mark' for more information. |
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1522 |
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1523 In Transient Mark mode, this does not activate the mark." |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1524 (if (null (mark t)) |
475 | 1525 nil |
1526 (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring)) | |
1527 (if (> (length mark-ring) mark-ring-max) | |
1528 (progn | |
1529 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil) | |
1530 (setcdr (nthcdr (1- mark-ring-max) mark-ring) nil)))) | |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1531 (set-marker (mark-marker) (or location (point)) (current-buffer)) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1532 ;; Now push the mark on the global mark ring. |
5812
1959e5c4a563
(push-mark): Don't push on global-mark-ring if its car is a marker in the
Roland McGrath <roland@gnu.org>
parents:
5811
diff
changeset
|
1533 (if (and global-mark-ring |
5826
2de9426a38bf
Fix Roland's misplaced paren around call to marker-buffer.
Michael I. Bushnell <mib@gnu.org>
parents:
5812
diff
changeset
|
1534 (eq (marker-buffer (car global-mark-ring)) (current-buffer))) |
5812
1959e5c4a563
(push-mark): Don't push on global-mark-ring if its car is a marker in the
Roland McGrath <roland@gnu.org>
parents:
5811
diff
changeset
|
1535 ;; The last global mark pushed was in this same buffer. |
1959e5c4a563
(push-mark): Don't push on global-mark-ring if its car is a marker in the
Roland McGrath <roland@gnu.org>
parents:
5811
diff
changeset
|
1536 ;; Don't push another one. |
1959e5c4a563
(push-mark): Don't push on global-mark-ring if its car is a marker in the
Roland McGrath <roland@gnu.org>
parents:
5811
diff
changeset
|
1537 nil |
1959e5c4a563
(push-mark): Don't push on global-mark-ring if its car is a marker in the
Roland McGrath <roland@gnu.org>
parents:
5811
diff
changeset
|
1538 (setq global-mark-ring (cons (copy-marker (mark-marker)) global-mark-ring)) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1539 (if (> (length global-mark-ring) global-mark-ring-max) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1540 (progn |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1541 (move-marker (car (nthcdr global-mark-ring-max global-mark-ring)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1542 nil) |
5812
1959e5c4a563
(push-mark): Don't push on global-mark-ring if its car is a marker in the
Roland McGrath <roland@gnu.org>
parents:
5811
diff
changeset
|
1543 (setcdr (nthcdr (1- global-mark-ring-max) global-mark-ring) nil)))) |
475 | 1544 (or nomsg executing-macro (> (minibuffer-depth) 0) |
1545 (message "Mark set")) | |
2844
086fda6b2041
(push-mark): Always activate the mark if not in Transient Mark mode.
Richard M. Stallman <rms@gnu.org>
parents:
2824
diff
changeset
|
1546 (if (or activate (not transient-mark-mode)) |
086fda6b2041
(push-mark): Always activate the mark if not in Transient Mark mode.
Richard M. Stallman <rms@gnu.org>
parents:
2824
diff
changeset
|
1547 (set-mark (mark t))) |
475 | 1548 nil) |
1549 | |
1550 (defun pop-mark () | |
1551 "Pop off mark ring into the buffer's actual mark. | |
1552 Does not set point. Does nothing if mark ring is empty." | |
1553 (if mark-ring | |
1554 (progn | |
1555 (setq mark-ring (nconc mark-ring (list (copy-marker (mark-marker))))) | |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1556 (set-marker (mark-marker) (+ 0 (car mark-ring)) (current-buffer)) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1557 (deactivate-mark) |
475 | 1558 (move-marker (car mark-ring) nil) |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1559 (if (null (mark t)) (ding)) |
475 | 1560 (setq mark-ring (cdr mark-ring))))) |
1561 | |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1562 (define-function 'exchange-dot-and-mark 'exchange-point-and-mark) |
475 | 1563 (defun exchange-point-and-mark () |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1564 "Put the mark where point is now, and point where the mark is now. |
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1565 This command works even when the mark is not active, |
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1566 and it reactivates the mark." |
475 | 1567 (interactive nil) |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1568 (let ((omark (mark t))) |
475 | 1569 (if (null omark) |
1570 (error "No mark set in this buffer")) | |
1571 (set-mark (point)) | |
1572 (goto-char omark) | |
1573 nil)) | |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1574 |
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1575 (defun transient-mark-mode (arg) |
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1576 "Toggle Transient Mark mode. |
2935
653e14f61220
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
2850
diff
changeset
|
1577 With arg, turn Transient Mark mode on if arg is positive, off otherwise. |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1578 |
5372
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
1579 In Transient Mark mode, when the mark is active, the region is highlighted. |
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
1580 Changing the buffer \"deactivates\" the mark. |
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
1581 So do certain other operations that set the mark |
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
1582 but whose main purpose is something else--for example, |
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
1583 incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]." |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1584 (interactive "P") |
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1585 (setq transient-mark-mode |
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1586 (if (null arg) |
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1587 (not transient-mark-mode) |
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1588 (> (prefix-numeric-value arg) 0)))) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1589 |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1590 (defun pop-global-mark () |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1591 "Pop off global mark ring and jump to the top location." |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1592 (interactive) |
7881
4ab8723cd491
(pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents:
7877
diff
changeset
|
1593 ;; Pop entries which refer to non-existent buffers. |
4ab8723cd491
(pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents:
7877
diff
changeset
|
1594 (while (and global-mark-ring (not (marker-buffer (car global-mark-ring)))) |
4ab8723cd491
(pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents:
7877
diff
changeset
|
1595 (setq global-mark-ring (cdr global-mark-ring))) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1596 (or global-mark-ring |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1597 (error "No global mark set")) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1598 (let* ((marker (car global-mark-ring)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1599 (buffer (marker-buffer marker)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1600 (position (marker-position marker))) |
10351
e34cbd5276bd
(pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents:
10284
diff
changeset
|
1601 (setq global-mark-ring (nconc (cdr global-mark-ring) |
e34cbd5276bd
(pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents:
10284
diff
changeset
|
1602 (list (car global-mark-ring)))) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1603 (set-buffer buffer) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1604 (or (and (>= position (point-min)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1605 (<= position (point-max))) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1606 (widen)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1607 (goto-char position) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1608 (switch-to-buffer buffer))) |
475 | 1609 |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1610 (defvar next-line-add-newlines t |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1611 "*If non-nil, `next-line' inserts newline to avoid `end of buffer' error.") |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1612 |
475 | 1613 (defun next-line (arg) |
1614 "Move cursor vertically down ARG lines. | |
1615 If there is no character in the target line exactly under the current column, | |
1616 the cursor is positioned after the character in that line which spans this | |
1617 column, or at the end of the line if it is not long enough. | |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1618 If there is no line in the buffer after this one, behavior depends on the |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1619 value of `next-line-add-newlines'. If non-nil, it inserts a newline character |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1620 to create a line, and moves the cursor to that line. Otherwise it moves the |
12718
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
1621 cursor to the end of the buffer. |
475 | 1622 |
1623 The command \\[set-goal-column] can be used to create | |
1624 a semipermanent goal column to which this command always moves. | |
1625 Then it does not try to move vertically. This goal column is stored | |
1626 in `goal-column', which is nil when there is none. | |
1627 | |
1628 If you are thinking of using this in a Lisp program, consider | |
1629 using `forward-line' instead. It is usually easier to use | |
1630 and more reliable (no dependence on goal column, etc.)." | |
1631 (interactive "p") | |
5675
3191bf405867
(next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents:
5635
diff
changeset
|
1632 (if (and next-line-add-newlines (= arg 1)) |
3191bf405867
(next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents:
5635
diff
changeset
|
1633 (let ((opoint (point))) |
8309
a4dbf8e6c78f
(line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents:
8203
diff
changeset
|
1634 (end-of-line) |
a4dbf8e6c78f
(line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents:
8203
diff
changeset
|
1635 (if (eobp) |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
1636 (newline 1) |
5675
3191bf405867
(next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents:
5635
diff
changeset
|
1637 (goto-char opoint) |
3191bf405867
(next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents:
5635
diff
changeset
|
1638 (line-move arg))) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1639 (if (interactive-p) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1640 (condition-case nil |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1641 (line-move arg) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1642 ((beginning-of-buffer end-of-buffer) (ding))) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1643 (line-move arg))) |
475 | 1644 nil) |
1645 | |
1646 (defun previous-line (arg) | |
1647 "Move cursor vertically up ARG lines. | |
1648 If there is no character in the target line exactly over the current column, | |
1649 the cursor is positioned after the character in that line which spans this | |
1650 column, or at the end of the line if it is not long enough. | |
1651 | |
1652 The command \\[set-goal-column] can be used to create | |
1653 a semipermanent goal column to which this command always moves. | |
1654 Then it does not try to move vertically. | |
1655 | |
1656 If you are thinking of using this in a Lisp program, consider using | |
1556
fce86d06a758
* simple.el (previous-line): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1481
diff
changeset
|
1657 `forward-line' with a negative argument instead. It is usually easier |
475 | 1658 to use and more reliable (no dependence on goal column, etc.)." |
1659 (interactive "p") | |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1660 (if (interactive-p) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1661 (condition-case nil |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1662 (line-move (- arg)) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1663 ((beginning-of-buffer end-of-buffer) (ding))) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1664 (line-move (- arg))) |
475 | 1665 nil) |
1666 | |
1667 (defconst track-eol nil | |
1668 "*Non-nil means vertical motion starting at end of line keeps to ends of lines. | |
1669 This means moving to the end of each line moved onto. | |
1670 The beginning of a blank line does not count as the end of a line.") | |
1671 | |
1466
04b4499061fd
(goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents:
1459
diff
changeset
|
1672 (defvar goal-column nil |
04b4499061fd
(goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents:
1459
diff
changeset
|
1673 "*Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil.") |
04b4499061fd
(goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents:
1459
diff
changeset
|
1674 (make-variable-buffer-local 'goal-column) |
475 | 1675 |
1676 (defvar temporary-goal-column 0 | |
1677 "Current goal column for vertical motion. | |
1678 It is the column where point was | |
1679 at the start of current run of vertical motion commands. | |
513 | 1680 When the `track-eol' feature is doing its job, the value is 9999.") |
475 | 1681 |
10949
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
1682 (defvar line-move-ignore-invisible nil |
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
1683 "*Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines. |
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
1684 Outline mode sets this.") |
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
1685 |
11326
0d5ebc078c51
(line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents:
11324
diff
changeset
|
1686 ;; This is the guts of next-line and previous-line. |
0d5ebc078c51
(line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents:
11324
diff
changeset
|
1687 ;; Arg says how many lines to move. |
475 | 1688 (defun line-move (arg) |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1689 ;; Don't run any point-motion hooks, and disregard intangibility, |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1690 ;; for intermediate positions. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1691 (let ((inhibit-point-motion-hooks t) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1692 (opoint (point)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1693 new) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1694 (unwind-protect |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1695 (progn |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1696 (if (not (or (eq last-command 'next-line) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1697 (eq last-command 'previous-line))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1698 (setq temporary-goal-column |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1699 (if (and track-eol (eolp) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1700 ;; Don't count beg of empty line as end of line |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1701 ;; unless we just did explicit end-of-line. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1702 (or (not (bolp)) (eq last-command 'end-of-line))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1703 9999 |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1704 (current-column)))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1705 (if (and (not (integerp selective-display)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1706 (not line-move-ignore-invisible)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1707 ;; Use just newline characters. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1708 (or (if (> arg 0) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1709 (progn (if (> arg 1) (forward-line (1- arg))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1710 ;; This way of moving forward ARG lines |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1711 ;; verifies that we have a newline after the last one. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1712 ;; It doesn't get confused by intangible text. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1713 (end-of-line) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1714 (zerop (forward-line 1))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1715 (and (zerop (forward-line arg)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1716 (bolp))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1717 (signal (if (< arg 0) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1718 'beginning-of-buffer |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1719 'end-of-buffer) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1720 nil)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1721 ;; Move by arg lines, but ignore invisible ones. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1722 (while (> arg 0) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1723 (end-of-line) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1724 (and (zerop (vertical-motion 1)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1725 (signal 'end-of-buffer nil)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1726 ;; If the following character is currently invisible, |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1727 ;; skip all characters with that same `invisible' property value. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1728 (while (and (not (eobp)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1729 (let ((prop |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1730 (get-char-property (point) 'invisible))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1731 (if (eq buffer-invisibility-spec t) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1732 prop |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1733 (or (memq prop buffer-invisibility-spec) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1734 (assq prop buffer-invisibility-spec))))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1735 (if (get-text-property (point) 'invisible) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1736 (goto-char (next-single-property-change (point) 'invisible)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1737 (goto-char (next-overlay-change (point))))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1738 (setq arg (1- arg))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1739 (while (< arg 0) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1740 (beginning-of-line) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1741 (and (zerop (vertical-motion -1)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1742 (signal 'beginning-of-buffer nil)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1743 (while (and (not (bobp)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1744 (let ((prop |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1745 (get-char-property (1- (point)) 'invisible))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1746 (if (eq buffer-invisibility-spec t) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1747 prop |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1748 (or (memq prop buffer-invisibility-spec) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1749 (assq prop buffer-invisibility-spec))))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1750 (if (get-text-property (1- (point)) 'invisible) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1751 (goto-char (previous-single-property-change (point) 'invisible)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1752 (goto-char (previous-overlay-change (point))))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1753 (setq arg (1+ arg)))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1754 (move-to-column (or goal-column temporary-goal-column))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1755 ;; Remember where we moved to, go back home, |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1756 ;; then do the motion over again |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1757 ;; in just one step, with intangibility and point-motion hooks |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1758 ;; enabled this time. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1759 (setq new (point)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1760 (goto-char opoint) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1761 (setq inhibit-point-motion-hooks nil) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1762 (goto-char new))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1763 nil) |
475 | 1764 |
1771
3f0f18d4eb8c
* simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents:
1760
diff
changeset
|
1765 ;;; Many people have said they rarely use this feature, and often type |
3f0f18d4eb8c
* simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents:
1760
diff
changeset
|
1766 ;;; it by accident. Maybe it shouldn't even be on a key. |
3f0f18d4eb8c
* simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents:
1760
diff
changeset
|
1767 (put 'set-goal-column 'disabled t) |
475 | 1768 |
1769 (defun set-goal-column (arg) | |
1770 "Set the current horizontal position as a goal for \\[next-line] and \\[previous-line]. | |
1771 Those commands will move to this position in the line moved to | |
1772 rather than trying to keep the same horizontal position. | |
1773 With a non-nil argument, clears out the goal column | |
1466
04b4499061fd
(goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents:
1459
diff
changeset
|
1774 so that \\[next-line] and \\[previous-line] resume vertical motion. |
04b4499061fd
(goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents:
1459
diff
changeset
|
1775 The goal column is stored in the variable `goal-column'." |
475 | 1776 (interactive "P") |
1777 (if arg | |
1778 (progn | |
1779 (setq goal-column nil) | |
1780 (message "No goal column")) | |
1781 (setq goal-column (current-column)) | |
1782 (message (substitute-command-keys | |
1783 "Goal column %d (use \\[set-goal-column] with an arg to unset it)") | |
1784 goal-column)) | |
1785 nil) | |
1786 | |
2597
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1787 ;;; Partial support for horizontal autoscrolling. Someday, this feature |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1788 ;;; will be built into the C level and all the (hscroll-point-visible) calls |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1789 ;;; will go away. |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1790 |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1791 (defvar hscroll-step 0 |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1792 "*The number of columns to try scrolling a window by when point moves out. |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1793 If that fails to bring point back on frame, point is centered instead. |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1794 If this is zero, point is always centered after it moves off frame.") |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1795 |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1796 (defun hscroll-point-visible () |
6743
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1797 "Scrolls the selected window horizontally to make point visible." |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1798 (save-excursion |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1799 (set-buffer (window-buffer)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1800 (if (not (or truncate-lines |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1801 (> (window-hscroll) 0) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1802 (and truncate-partial-width-windows |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1803 (< (window-width) (frame-width))))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1804 ;; Point is always visible when lines are wrapped. |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1805 () |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1806 ;; If point is on the invisible part of the line before window-start, |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1807 ;; then hscrolling can't bring it back, so reset window-start first. |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1808 (and (< (point) (window-start)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1809 (let ((ws-bol (save-excursion |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1810 (goto-char (window-start)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1811 (beginning-of-line) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1812 (point)))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1813 (and (>= (point) ws-bol) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1814 (set-window-start nil ws-bol)))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1815 (let* ((here (hscroll-window-column)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1816 (left (min (window-hscroll) 1)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1817 (right (1- (window-width)))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1818 ;; Allow for the truncation glyph, if we're not exactly at eol. |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1819 (if (not (and (= here right) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1820 (= (following-char) ?\n))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1821 (setq right (1- right))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1822 (cond |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1823 ;; If too far away, just recenter. But don't show too much |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1824 ;; white space off the end of the line. |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1825 ((or (< here (- left hscroll-step)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1826 (> here (+ right hscroll-step))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1827 (let ((eol (save-excursion (end-of-line) (hscroll-window-column)))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1828 (scroll-left (min (- here (/ (window-width) 2)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1829 (- eol (window-width) -5))))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1830 ;; Within range. Scroll by one step (or maybe not at all). |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1831 ((< here left) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1832 (scroll-right hscroll-step)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1833 ((> here right) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1834 (scroll-left hscroll-step))))))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1835 |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1836 ;; This function returns the window's idea of the display column of point, |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1837 ;; assuming that the window is already known to be truncated rather than |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1838 ;; wrapped, and that we've already handled the case where point is on the |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1839 ;; part of the line before window-start. We ignore window-width; if point |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1840 ;; is beyond the right margin, we want to know how far. The return value |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1841 ;; includes the effects of window-hscroll, window-start, and the prompt |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1842 ;; string in the minibuffer. It may be negative due to hscroll. |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1843 (defun hscroll-window-column () |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1844 (let* ((hscroll (window-hscroll)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1845 (startpos (save-excursion |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1846 (beginning-of-line) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1847 (if (= (point) (save-excursion |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1848 (goto-char (window-start)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1849 (beginning-of-line) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1850 (point))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1851 (goto-char (window-start))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1852 (point))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1853 (hpos (+ (if (and (eq (selected-window) (minibuffer-window)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1854 (= 1 (window-start)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1855 (= startpos (point-min))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1856 (minibuffer-prompt-width) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1857 0) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1858 (min 0 (- 1 hscroll)))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1859 val) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1860 (car (cdr (compute-motion startpos (cons hpos 0) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1861 (point) (cons 0 1) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1862 1000000 (cons hscroll 0) nil))))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
1863 |
2597
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
1864 |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1865 ;; rms: (1) The definitions of arrow keys should not simply restate |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1866 ;; what keys they are. The arrow keys should run the ordinary commands. |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1867 ;; (2) The arrow keys are just one of many common ways of moving point |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1868 ;; within a line. Real horizontal autoscrolling would be a good feature, |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1869 ;; but supporting it only for arrow keys is too incomplete to be desirable. |
2577
b28675709d41
(down-arrow): New function. Uses next-line-add-newlines to suppress
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2568
diff
changeset
|
1870 |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1871 ;;;;; Make arrow keys do the right thing for improved terminal support |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1872 ;;;;; When we implement true horizontal autoscrolling, right-arrow and |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1873 ;;;;; left-arrow can lose the (if truncate-lines ...) clause and become |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1874 ;;;;; aliases. These functions are bound to the corresponding keyboard |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1875 ;;;;; events in loaddefs.el. |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1876 |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1877 ;;(defun right-arrow (arg) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1878 ;; "Move right one character on the screen (with prefix ARG, that many chars). |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1879 ;;Scroll right if needed to keep point horizontally onscreen." |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1880 ;; (interactive "P") |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1881 ;; (forward-char arg) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1882 ;; (hscroll-point-visible)) |
2577
b28675709d41
(down-arrow): New function. Uses next-line-add-newlines to suppress
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2568
diff
changeset
|
1883 |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1884 ;;(defun left-arrow (arg) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1885 ;; "Move left one character on the screen (with prefix ARG, that many chars). |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1886 ;;Scroll left if needed to keep point horizontally onscreen." |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1887 ;; (interactive "P") |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1888 ;; (backward-char arg) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
1889 ;; (hscroll-point-visible)) |
8006
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
1890 |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
1891 (defun scroll-other-window-down (lines) |
12718
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
1892 "Scroll the \"other window\" down. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
1893 For more details, see the documentation for `scroll-other-window'." |
8006
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
1894 (interactive "P") |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
1895 (scroll-other-window |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
1896 ;; Just invert the argument's meaning. |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
1897 ;; We can do that without knowing which window it will be. |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
1898 (if (eq lines '-) nil |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
1899 (if (null lines) '- |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
1900 (- (prefix-numeric-value lines)))))) |
12718
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
1901 (define-key esc-map [?\C-\S-v] 'scroll-other-window-down) |
8057
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1902 |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1903 (defun beginning-of-buffer-other-window (arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1904 "Move point to the beginning of the buffer in the other window. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1905 Leave mark at previous position. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1906 With arg N, put point N/10 of the way from the true beginning." |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1907 (interactive "P") |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1908 (let ((orig-window (selected-window)) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1909 (window (other-window-for-scrolling))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1910 ;; We use unwind-protect rather than save-window-excursion |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1911 ;; because the latter would preserve the things we want to change. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1912 (unwind-protect |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1913 (progn |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1914 (select-window window) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1915 ;; Set point and mark in that window's buffer. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1916 (beginning-of-buffer arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1917 ;; Set point accordingly. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1918 (recenter '(t))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1919 (select-window orig-window)))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1920 |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1921 (defun end-of-buffer-other-window (arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1922 "Move point to the end of the buffer in the other window. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1923 Leave mark at previous position. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1924 With arg N, put point N/10 of the way from the true end." |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1925 (interactive "P") |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1926 ;; See beginning-of-buffer-other-window for comments. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1927 (let ((orig-window (selected-window)) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1928 (window (other-window-for-scrolling))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1929 (unwind-protect |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1930 (progn |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1931 (select-window window) |
8442
05efaa4966e0
(end-of-buffer-other-window): Go to the end, not to the beginning.
Richard M. Stallman <rms@gnu.org>
parents:
8380
diff
changeset
|
1932 (end-of-buffer arg) |
8057
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1933 (recenter '(t))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
1934 (select-window orig-window)))) |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1935 |
475 | 1936 (defun transpose-chars (arg) |
1937 "Interchange characters around point, moving forward one character. | |
1938 With prefix arg ARG, effect is to take character before point | |
1939 and drag it forward past ARG other characters (backward if ARG negative). | |
1940 If no argument and at end of line, the previous two chars are exchanged." | |
1941 (interactive "*P") | |
1942 (and (null arg) (eolp) (forward-char -1)) | |
1943 (transpose-subr 'forward-char (prefix-numeric-value arg))) | |
1944 | |
1945 (defun transpose-words (arg) | |
1946 "Interchange words around point, leaving point at end of them. | |
1947 With prefix arg ARG, effect is to take word before or around point | |
1948 and drag it forward past ARG other words (backward if ARG negative). | |
1949 If ARG is zero, the words around or after point and around or after mark | |
1950 are interchanged." | |
1951 (interactive "*p") | |
1952 (transpose-subr 'forward-word arg)) | |
1953 | |
1954 (defun transpose-sexps (arg) | |
1955 "Like \\[transpose-words] but applies to sexps. | |
1956 Does not work on a sexp that point is in the middle of | |
1957 if it is a list or string." | |
1958 (interactive "*p") | |
1959 (transpose-subr 'forward-sexp arg)) | |
1960 | |
1961 (defun transpose-lines (arg) | |
1962 "Exchange current line and previous line, leaving point after both. | |
1963 With argument ARG, takes previous line and moves it past ARG lines. | |
1964 With argument 0, interchanges line point is in with line mark is in." | |
1965 (interactive "*p") | |
1966 (transpose-subr (function | |
1967 (lambda (arg) | |
1968 (if (= arg 1) | |
1969 (progn | |
1970 ;; Move forward over a line, | |
1971 ;; but create a newline if none exists yet. | |
1972 (end-of-line) | |
1973 (if (eobp) | |
1974 (newline) | |
1975 (forward-char 1))) | |
1976 (forward-line arg)))) | |
1977 arg)) | |
1978 | |
1979 (defun transpose-subr (mover arg) | |
1980 (let (start1 end1 start2 end2) | |
1981 (if (= arg 0) | |
1982 (progn | |
1983 (save-excursion | |
1984 (funcall mover 1) | |
1985 (setq end2 (point)) | |
1986 (funcall mover -1) | |
1987 (setq start2 (point)) | |
1988 (goto-char (mark)) | |
1989 (funcall mover 1) | |
1990 (setq end1 (point)) | |
1991 (funcall mover -1) | |
1992 (setq start1 (point)) | |
1993 (transpose-subr-1)) | |
1994 (exchange-point-and-mark))) | |
1995 (while (> arg 0) | |
1996 (funcall mover -1) | |
1997 (setq start1 (point)) | |
1998 (funcall mover 1) | |
1999 (setq end1 (point)) | |
2000 (funcall mover 1) | |
2001 (setq end2 (point)) | |
2002 (funcall mover -1) | |
2003 (setq start2 (point)) | |
2004 (transpose-subr-1) | |
2005 (goto-char end2) | |
2006 (setq arg (1- arg))) | |
2007 (while (< arg 0) | |
2008 (funcall mover -1) | |
2009 (setq start2 (point)) | |
2010 (funcall mover -1) | |
2011 (setq start1 (point)) | |
2012 (funcall mover 1) | |
2013 (setq end1 (point)) | |
2014 (funcall mover 1) | |
2015 (setq end2 (point)) | |
2016 (transpose-subr-1) | |
2017 (setq arg (1+ arg))))) | |
2018 | |
2019 (defun transpose-subr-1 () | |
2020 (if (> (min end1 end2) (max start1 start2)) | |
2021 (error "Don't have two things to transpose")) | |
2022 (let ((word1 (buffer-substring start1 end1)) | |
2023 (word2 (buffer-substring start2 end2))) | |
2024 (delete-region start2 end2) | |
2025 (goto-char start2) | |
2026 (insert word1) | |
2027 (goto-char (if (< start1 start2) start1 | |
2028 (+ start1 (- (length word1) (length word2))))) | |
2029 (delete-char (length word1)) | |
2030 (insert word2))) | |
2031 | |
2032 (defconst comment-column 32 | |
2033 "*Column to indent right-margin comments to. | |
1581
9de0900ca56a
* simple.el (comment-column): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1556
diff
changeset
|
2034 Setting this variable automatically makes it local to the current buffer. |
9de0900ca56a
* simple.el (comment-column): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1556
diff
changeset
|
2035 Each mode establishes a different default value for this variable; you |
6237 | 2036 can set the value for a particular mode using that mode's hook.") |
475 | 2037 (make-variable-buffer-local 'comment-column) |
2038 | |
2039 (defconst comment-start nil | |
10983
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2040 "*String to insert to start a new comment, or nil if no comment syntax.") |
475 | 2041 |
2042 (defconst comment-start-skip nil | |
2043 "*Regexp to match the start of a comment plus everything up to its body. | |
2044 If there are any \\(...\\) pairs, the comment delimiter text is held to begin | |
2045 at the place matched by the close of the first pair.") | |
2046 | |
2047 (defconst comment-end "" | |
2048 "*String to insert to end a new comment. | |
2049 Should be an empty string if comments are terminated by end-of-line.") | |
2050 | |
2299
53abb56a18fa
* simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents:
2215
diff
changeset
|
2051 (defconst comment-indent-hook nil |
53abb56a18fa
* simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents:
2215
diff
changeset
|
2052 "Obsolete variable for function to compute desired indentation for a comment. |
53abb56a18fa
* simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents:
2215
diff
changeset
|
2053 This function is called with no args with point at the beginning of |
53abb56a18fa
* simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents:
2215
diff
changeset
|
2054 the comment's starting delimiter.") |
53abb56a18fa
* simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents:
2215
diff
changeset
|
2055 |
53abb56a18fa
* simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents:
2215
diff
changeset
|
2056 (defconst comment-indent-function |
475 | 2057 '(lambda () comment-column) |
2058 "Function to compute desired indentation for a comment. | |
2059 This function is called with no args with point at the beginning of | |
2060 the comment's starting delimiter.") | |
2061 | |
10983
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2062 (defconst block-comment-start nil |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2063 "*String to insert to start a new comment on a line by itself. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2064 If nil, use `comment-start' instead. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2065 Note that the regular expression `comment-start-skip' should skip this string |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2066 as well as the `comment-start' string.") |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2067 |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2068 (defconst block-comment-end nil |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2069 "*String to insert to end a new comment on a line by itself. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2070 Should be an empty string if comments are terminated by end-of-line. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2071 If nil, use `comment-end' instead.") |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2072 |
475 | 2073 (defun indent-for-comment () |
2074 "Indent this line's comment to comment column, or insert an empty comment." | |
2075 (interactive "*") | |
10983
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2076 (let* ((empty (save-excursion (beginning-of-line) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2077 (looking-at "[ \t]*$"))) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2078 (starter (or (and empty block-comment-start) comment-start)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2079 (ender (or (and empty block-comment-end) comment-end))) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2080 (if (null starter) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2081 (error "No comment syntax defined") |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2082 (let* ((eolpos (save-excursion (end-of-line) (point))) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2083 cpos indent begpos) |
11975
dd80dd6aa77f
(indent-for-comment): move to beginning of line only
Karl Heuer <kwzh@gnu.org>
parents:
11961
diff
changeset
|
2084 (beginning-of-line) |
10983
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2085 (if (re-search-forward comment-start-skip eolpos 'move) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2086 (progn (setq cpos (point-marker)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2087 ;; Find the start of the comment delimiter. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2088 ;; If there were paren-pairs in comment-start-skip, |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2089 ;; position at the end of the first pair. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2090 (if (match-end 1) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2091 (goto-char (match-end 1)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2092 ;; If comment-start-skip matched a string with |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2093 ;; internal whitespace (not final whitespace) then |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2094 ;; the delimiter start at the end of that |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2095 ;; whitespace. Otherwise, it starts at the |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2096 ;; beginning of what was matched. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2097 (skip-syntax-backward " " (match-beginning 0)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2098 (skip-syntax-backward "^ " (match-beginning 0))))) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2099 (setq begpos (point)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2100 ;; Compute desired indent. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2101 (if (= (current-column) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2102 (setq indent (if comment-indent-hook |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2103 (funcall comment-indent-hook) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2104 (funcall comment-indent-function)))) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2105 (goto-char begpos) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2106 ;; If that's different from current, change it. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2107 (skip-chars-backward " \t") |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2108 (delete-region (point) begpos) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2109 (indent-to indent)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2110 ;; An existing comment? |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2111 (if cpos |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2112 (progn (goto-char cpos) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2113 (set-marker cpos nil)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2114 ;; No, insert one. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2115 (insert starter) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2116 (save-excursion |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2117 (insert ender))))))) |
475 | 2118 |
2119 (defun set-comment-column (arg) | |
2120 "Set the comment column based on point. | |
2121 With no arg, set the comment column to the current column. | |
2122 With just minus as arg, kill any comment on this line. | |
2123 With any other arg, set comment column to indentation of the previous comment | |
2124 and then align or create a comment on this line at that column." | |
2125 (interactive "P") | |
2126 (if (eq arg '-) | |
2127 (kill-comment nil) | |
2128 (if arg | |
2129 (progn | |
2130 (save-excursion | |
2131 (beginning-of-line) | |
2132 (re-search-backward comment-start-skip) | |
2133 (beginning-of-line) | |
2134 (re-search-forward comment-start-skip) | |
2135 (goto-char (match-beginning 0)) | |
2136 (setq comment-column (current-column)) | |
2137 (message "Comment column set to %d" comment-column)) | |
2138 (indent-for-comment)) | |
2139 (setq comment-column (current-column)) | |
2140 (message "Comment column set to %d" comment-column)))) | |
2141 | |
2142 (defun kill-comment (arg) | |
2143 "Kill the comment on this line, if any. | |
2144 With argument, kill comments on that many lines starting with this one." | |
2145 ;; this function loses in a lot of situations. it incorrectly recognises | |
2146 ;; comment delimiters sometimes (ergo, inside a string), doesn't work | |
2147 ;; with multi-line comments, can kill extra whitespace if comment wasn't | |
2148 ;; through end-of-line, et cetera. | |
2149 (interactive "P") | |
2150 (or comment-start-skip (error "No comment syntax defined")) | |
2151 (let ((count (prefix-numeric-value arg)) endc) | |
2152 (while (> count 0) | |
2153 (save-excursion | |
2154 (end-of-line) | |
2155 (setq endc (point)) | |
2156 (beginning-of-line) | |
2157 (and (string< "" comment-end) | |
2158 (setq endc | |
2159 (progn | |
2160 (re-search-forward (regexp-quote comment-end) endc 'move) | |
2161 (skip-chars-forward " \t") | |
2162 (point)))) | |
2163 (beginning-of-line) | |
2164 (if (re-search-forward comment-start-skip endc t) | |
2165 (progn | |
2166 (goto-char (match-beginning 0)) | |
2167 (skip-chars-backward " \t") | |
2168 (kill-region (point) endc) | |
2169 ;; to catch comments a line beginnings | |
2170 (indent-according-to-mode)))) | |
2171 (if arg (forward-line 1)) | |
2172 (setq count (1- count))))) | |
2173 | |
2174 (defun comment-region (beg end &optional arg) | |
5730
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2175 "Comment or uncomment each line in the region. |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2176 With just C-u prefix arg, uncomment each line in region. |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2177 Numeric prefix arg ARG means use ARG comment characters. |
475 | 2178 If ARG is negative, delete that many comment characters instead. |
2179 Comments are terminated on each line, even for syntax in which newline does | |
2180 not end the comment. Blank lines do not get comments." | |
2181 ;; if someone wants it to only put a comment-start at the beginning and | |
2182 ;; comment-end at the end then typing it, C-x C-x, closing it, C-x C-x | |
2183 ;; is easy enough. No option is made here for other than commenting | |
2184 ;; every line. | |
5730
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2185 (interactive "r\nP") |
475 | 2186 (or comment-start (error "No comment syntax is defined")) |
2187 (if (> beg end) (let (mid) (setq mid beg beg end end mid))) | |
2188 (save-excursion | |
2189 (save-restriction | |
5730
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2190 (let ((cs comment-start) (ce comment-end) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2191 numarg) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2192 (if (consp arg) (setq numarg t) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2193 (setq numarg (prefix-numeric-value arg)) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2194 ;; For positive arg > 1, replicate the comment delims now, |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2195 ;; then insert the replicated strings just once. |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2196 (while (> numarg 1) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2197 (setq cs (concat cs comment-start) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2198 ce (concat ce comment-end)) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2199 (setq numarg (1- numarg)))) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2200 ;; Loop over all lines from BEG to END. |
475 | 2201 (narrow-to-region beg end) |
2202 (goto-char beg) | |
2203 (while (not (eobp)) | |
5730
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2204 (if (or (eq numarg t) (< numarg 0)) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2205 (progn |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2206 ;; Delete comment start from beginning of line. |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2207 (if (eq numarg t) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2208 (while (looking-at (regexp-quote cs)) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2209 (delete-char (length cs))) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2210 (let ((count numarg)) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2211 (while (and (> 1 (setq count (1+ count))) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2212 (looking-at (regexp-quote cs))) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2213 (delete-char (length cs))))) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2214 ;; Delete comment end from end of line. |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2215 (if (string= "" ce) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2216 nil |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2217 (if (eq numarg t) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2218 (progn |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2219 (end-of-line) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2220 ;; This is questionable if comment-end ends in |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2221 ;; whitespace. That is pretty brain-damaged, |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2222 ;; though. |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2223 (skip-chars-backward " \t") |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2224 (if (and (>= (- (point) (point-min)) (length ce)) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2225 (save-excursion |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2226 (backward-char (length ce)) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2227 (looking-at (regexp-quote ce)))) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2228 (delete-char (- (length ce))))) |
5767
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2229 (let ((count numarg)) |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2230 (while (> 1 (setq count (1+ count))) |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2231 (end-of-line) |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2232 ;; this is questionable if comment-end ends in whitespace |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2233 ;; that is pretty brain-damaged though |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2234 (skip-chars-backward " \t") |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2235 (save-excursion |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2236 (backward-char (length ce)) |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2237 (if (looking-at (regexp-quote ce)) |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2238 (delete-char (length ce)))))))) |
1459
a7394244aa9a
(comment-region): Do move to next line, in neg arg case.
Richard M. Stallman <rms@gnu.org>
parents:
1331
diff
changeset
|
2239 (forward-line 1)) |
5730
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2240 ;; Insert at beginning and at end. |
475 | 2241 (if (looking-at "[ \t]*$") () |
2242 (insert cs) | |
2243 (if (string= "" ce) () | |
2244 (end-of-line) | |
2245 (insert ce))) | |
2246 (search-forward "\n" nil 'move))))))) | |
2247 | |
2248 (defun backward-word (arg) | |
2249 "Move backward until encountering the end of a word. | |
2250 With argument, do this that many times. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2251 In programs, it is faster to call `forward-word' with negative arg." |
5764
5726c18895e3
Rms (in his change to comment-region on Feb 1) decided to make
Michael I. Bushnell <mib@gnu.org>
parents:
5730
diff
changeset
|
2252 (interactive "p") |
475 | 2253 (forward-word (- arg))) |
2254 | |
2255 (defun mark-word (arg) | |
2256 "Set mark arg words away from point." | |
2257 (interactive "p") | |
2258 (push-mark | |
2259 (save-excursion | |
2260 (forward-word arg) | |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
2261 (point)) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
2262 nil t)) |
475 | 2263 |
2264 (defun kill-word (arg) | |
2265 "Kill characters forward until encountering the end of a word. | |
2266 With argument, do this that many times." | |
2267 (interactive "p") | |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
2268 (kill-region (point) (progn (forward-word arg) (point)))) |
475 | 2269 |
2270 (defun backward-kill-word (arg) | |
2271 "Kill characters backward until encountering the end of a word. | |
2272 With argument, do this that many times." | |
2273 (interactive "p") | |
2274 (kill-word (- arg))) | |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2275 |
6174
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2276 (defun current-word (&optional strict) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2277 "Return the word point is on (or a nearby word) as a string. |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2278 If optional arg STRICT is non-nil, return nil unless point is within |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2279 or adjacent to a word." |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2280 (save-excursion |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2281 (let ((oldpoint (point)) (start (point)) (end (point))) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2282 (skip-syntax-backward "w_") (setq start (point)) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2283 (goto-char oldpoint) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2284 (skip-syntax-forward "w_") (setq end (point)) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2285 (if (and (eq start oldpoint) (eq end oldpoint)) |
6174
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2286 ;; Point is neither within nor adjacent to a word. |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2287 (and (not strict) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2288 (progn |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2289 ;; Look for preceding word in same line. |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2290 (skip-syntax-backward "^w_" |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2291 (save-excursion (beginning-of-line) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2292 (point))) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2293 (if (bolp) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2294 ;; No preceding word in same line. |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2295 ;; Look for following word in same line. |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2296 (progn |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2297 (skip-syntax-forward "^w_" |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2298 (save-excursion (end-of-line) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2299 (point))) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2300 (setq start (point)) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2301 (skip-syntax-forward "w_") |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2302 (setq end (point))) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2303 (setq end (point)) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2304 (skip-syntax-backward "w_") |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2305 (setq start (point))) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2306 (buffer-substring start end))) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2307 (buffer-substring start end))))) |
475 | 2308 |
2309 (defconst fill-prefix nil | |
2310 "*String for filling to insert at front of new line, or nil for none. | |
2311 Setting this variable automatically makes it local to the current buffer.") | |
2312 (make-variable-buffer-local 'fill-prefix) | |
2313 | |
2314 (defconst auto-fill-inhibit-regexp nil | |
2315 "*Regexp to match lines which should not be auto-filled.") | |
2316 | |
2317 (defun do-auto-fill () | |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2318 (let (fc justify bol give-up |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2319 (fill-prefix fill-prefix)) |
10471
3eb77f03f53e
(do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents:
10469
diff
changeset
|
2320 (if (or (not (setq justify (current-justification))) |
12428
e4c0623f4a2e
(do-auto-fill): No-op if (current-fill-column) is nil.
Richard M. Stallman <rms@gnu.org>
parents:
12400
diff
changeset
|
2321 (null (setq fc (current-fill-column))) |
e4c0623f4a2e
(do-auto-fill): No-op if (current-fill-column) is nil.
Richard M. Stallman <rms@gnu.org>
parents:
12400
diff
changeset
|
2322 (and (eq justify 'left) |
e4c0623f4a2e
(do-auto-fill): No-op if (current-fill-column) is nil.
Richard M. Stallman <rms@gnu.org>
parents:
12400
diff
changeset
|
2323 (<= (current-column) fc)) |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2324 (save-excursion (beginning-of-line) |
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2325 (setq bol (point)) |
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2326 (and auto-fill-inhibit-regexp |
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2327 (looking-at auto-fill-inhibit-regexp)))) |
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2328 nil ;; Auto-filling not required |
10813
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
2329 (if (memq justify '(full center right)) |
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
2330 (save-excursion (unjustify-current-line))) |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2331 |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2332 ;; Choose a fill-prefix automatically. |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2333 (if (and adaptive-fill-mode |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2334 (or (null fill-prefix) (string= fill-prefix ""))) |
13587
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2335 (let ((prefix |
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2336 (fill-context-prefix |
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2337 (save-excursion (backward-paragraph 1) (point)) |
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2338 (save-excursion (forward-paragraph 1) (point)) |
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2339 ;; Don't accept a non-whitespace fill prefix |
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2340 ;; from the first line of a paragraph. |
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2341 "^[ \t]*$"))) |
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2342 (and prefix (not (equal prefix "")) |
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2343 (setq fill-prefix prefix)))) |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2344 |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2345 (while (and (not give-up) (> (current-column) fc)) |
12718
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2346 ;; Determine where to split the line. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2347 (let ((fill-point |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2348 (let ((opoint (point)) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2349 bounce |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2350 (first t)) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2351 (save-excursion |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2352 (move-to-column (1+ fc)) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2353 ;; Move back to a word boundary. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2354 (while (or first |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2355 ;; If this is after period and a single space, |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2356 ;; move back once more--we don't want to break |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2357 ;; the line there and make it look like a |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2358 ;; sentence end. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2359 (and (not (bobp)) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2360 (not bounce) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2361 sentence-end-double-space |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2362 (save-excursion (forward-char -1) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2363 (and (looking-at "\\. ") |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2364 (not (looking-at "\\. ")))))) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2365 (setq first nil) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2366 (skip-chars-backward "^ \t\n") |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2367 ;; If we find nowhere on the line to break it, |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2368 ;; break after one word. Set bounce to t |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2369 ;; so we will not keep going in this while loop. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2370 (if (bolp) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2371 (progn |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2372 (re-search-forward "[ \t]" opoint t) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2373 (setq bounce t))) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2374 (skip-chars-backward " \t")) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2375 ;; Let fill-point be set to the place where we end up. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2376 (point))))) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2377 ;; If that place is not the beginning of the line, |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2378 ;; break the line there. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2379 (if (save-excursion |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2380 (goto-char fill-point) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2381 (not (bolp))) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2382 (let ((prev-column (current-column))) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2383 ;; If point is at the fill-point, do not `save-excursion'. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2384 ;; Otherwise, if a comment prefix or fill-prefix is inserted, |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2385 ;; point will end up before it rather than after it. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2386 (if (save-excursion |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2387 (skip-chars-backward " \t") |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2388 (= (point) fill-point)) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2389 (indent-new-comment-line t) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2390 (save-excursion |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2391 (goto-char fill-point) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2392 (indent-new-comment-line t))) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2393 ;; Now do justification, if required |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2394 (if (not (eq justify 'left)) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2395 (save-excursion |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2396 (end-of-line 0) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2397 (justify-current-line justify nil t))) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2398 ;; If making the new line didn't reduce the hpos of |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2399 ;; the end of the line, then give up now; |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2400 ;; trying again will not help. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2401 (if (>= (current-column) prev-column) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2402 (setq give-up t))) |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2403 ;; No place to break => stop trying. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2404 (setq give-up t)))) |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2405 ;; justify last line |
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2406 (justify-current-line justify t t)))) |
475 | 2407 |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2408 (defun auto-fill-mode (&optional arg) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2409 "Toggle auto-fill mode. |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2410 With arg, turn Auto-Fill mode on if and only if arg is positive. |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2411 In Auto-Fill mode, inserting a space at a column beyond `current-fill-column' |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2412 automatically breaks the line at a previous space." |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2413 (interactive "P") |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2414 (prog1 (setq auto-fill-function |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2415 (if (if (null arg) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2416 (not auto-fill-function) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2417 (> (prefix-numeric-value arg) 0)) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2418 'do-auto-fill |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2419 nil)) |
11572
09d49f6e0af9
(auto-fill-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11479
diff
changeset
|
2420 (force-mode-line-update))) |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2421 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2422 ;; This holds a document string used to document auto-fill-mode. |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2423 (defun auto-fill-function () |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2424 "Automatically break line at a previous space, in insertion of text." |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2425 nil) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2426 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2427 (defun turn-on-auto-fill () |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2428 "Unconditionally turn on Auto Fill mode." |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2429 (auto-fill-mode 1)) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2430 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2431 (defun set-fill-column (arg) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2432 "Set `fill-column' to current column, or to argument if given. |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2433 The variable `fill-column' has a separate value for each buffer." |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2434 (interactive "P") |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2435 (setq fill-column (if (integerp arg) arg (current-column))) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2436 (message "fill-column set to %d" fill-column)) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2437 |
475 | 2438 (defconst comment-multi-line nil |
2439 "*Non-nil means \\[indent-new-comment-line] should continue same comment | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2440 on new line, with no new terminator or starter. |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2441 This is obsolete because you might as well use \\[newline-and-indent].") |
475 | 2442 |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
2443 (defun indent-new-comment-line (&optional soft) |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2444 "Break line at point and indent, continuing comment if within one. |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2445 This indents the body of the continued comment |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2446 under the previous comment line. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2447 |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2448 This command is intended for styles where you write a comment per line, |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2449 starting a new comment (and terminating it if necessary) on each line. |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
2450 If you want to continue one comment across several lines, use \\[newline-and-indent]. |
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
2451 |
12624
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2452 If a fill column is specified, it overrides the use of the comment column |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2453 or comment indentation. |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2454 |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
2455 The inserted newline is marked hard if `use-hard-newlines' is true, |
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
2456 unless optional argument SOFT is non-nil." |
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
2457 (interactive) |
475 | 2458 (let (comcol comstart) |
2459 (skip-chars-backward " \t") | |
2460 (delete-region (point) | |
2461 (progn (skip-chars-forward " \t") | |
2462 (point))) | |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2463 (if soft (insert-and-inherit ?\n) (newline 1)) |
12624
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2464 (if fill-prefix |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2465 (progn |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2466 (indent-to-left-margin) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2467 (insert-and-inherit fill-prefix)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2468 (if (not comment-multi-line) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2469 (save-excursion |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2470 (if (and comment-start-skip |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2471 (let ((opoint (point))) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2472 (forward-line -1) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2473 (re-search-forward comment-start-skip opoint t))) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2474 ;; The old line is a comment. |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2475 ;; Set WIN to the pos of the comment-start. |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2476 ;; But if the comment is empty, look at preceding lines |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2477 ;; to find one that has a nonempty comment. |
10943
6a2af2832a42
(indent-new-comment-line): Clean up handling of \(...\) in comment-start-skip.
Richard M. Stallman <rms@gnu.org>
parents:
10912
diff
changeset
|
2478 |
12624
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2479 ;; If comment-start-skip contains a \(...\) pair, |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2480 ;; the real comment delimiter starts at the end of that pair. |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2481 (let ((win (or (match-end 1) (match-beginning 0)))) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2482 (while (and (eolp) (not (bobp)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2483 (let (opoint) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2484 (beginning-of-line) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2485 (setq opoint (point)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2486 (forward-line -1) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2487 (re-search-forward comment-start-skip opoint t))) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2488 (setq win (or (match-end 1) (match-beginning 0)))) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2489 ;; Indent this line like what we found. |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2490 (goto-char win) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2491 (setq comcol (current-column)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2492 (setq comstart |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2493 (buffer-substring (point) (match-end 0))))))) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2494 (if comcol |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2495 (let ((comment-column comcol) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2496 (comment-start comstart) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2497 (comment-end comment-end)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2498 (and comment-end (not (equal comment-end "")) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2499 ; (if (not comment-multi-line) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2500 (progn |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2501 (forward-char -1) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2502 (insert comment-end) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2503 (forward-char 1)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2504 ; (setq comment-column (+ comment-column (length comment-start)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2505 ; comment-start "") |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2506 ; ) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2507 ) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2508 (if (not (eolp)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2509 (setq comment-end "")) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2510 (insert-and-inherit ?\n) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2511 (forward-char -1) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2512 (indent-for-comment) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2513 (save-excursion |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2514 ;; Make sure we delete the newline inserted above. |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2515 (end-of-line) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2516 (delete-char 1))) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2517 (indent-according-to-mode))))) |
475 | 2518 |
2519 (defun set-selective-display (arg) | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2520 "Set `selective-display' to ARG; clear it if no arg. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2521 When the value of `selective-display' is a number > 0, |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2522 lines whose indentation is >= that value are not displayed. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2523 The variable `selective-display' has a separate value for each buffer." |
475 | 2524 (interactive "P") |
2525 (if (eq selective-display t) | |
2526 (error "selective-display already in use for marked lines")) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2527 (let ((current-vpos |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2528 (save-restriction |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2529 (narrow-to-region (point-min) (point)) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2530 (goto-char (window-start)) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2531 (vertical-motion (window-height))))) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2532 (setq selective-display |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2533 (and arg (prefix-numeric-value arg))) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2534 (recenter current-vpos)) |
475 | 2535 (set-window-start (selected-window) (window-start (selected-window))) |
2536 (princ "selective-display set to " t) | |
2537 (prin1 selective-display t) | |
2538 (princ "." t)) | |
2539 | |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2540 (defconst overwrite-mode-textual " Ovwrt" |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2541 "The string displayed in the mode line when in overwrite mode.") |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2542 (defconst overwrite-mode-binary " Bin Ovwrt" |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2543 "The string displayed in the mode line when in binary overwrite mode.") |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2544 |
475 | 2545 (defun overwrite-mode (arg) |
2546 "Toggle overwrite mode. | |
2547 With arg, turn overwrite mode on iff arg is positive. | |
2548 In overwrite mode, printing characters typed in replace existing text | |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2549 on a one-for-one basis, rather than pushing it to the right. At the |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2550 end of a line, such characters extend the line. Before a tab, |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2551 such characters insert until the tab is filled in. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2552 \\[quoted-insert] still inserts characters in overwrite mode; this |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2553 is supposed to make it easier to insert characters when necessary." |
475 | 2554 (interactive "P") |
2555 (setq overwrite-mode | |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2556 (if (if (null arg) (not overwrite-mode) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2557 (> (prefix-numeric-value arg) 0)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2558 'overwrite-mode-textual)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2559 (force-mode-line-update)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2560 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2561 (defun binary-overwrite-mode (arg) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2562 "Toggle binary overwrite mode. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2563 With arg, turn binary overwrite mode on iff arg is positive. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2564 In binary overwrite mode, printing characters typed in replace |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2565 existing text. Newlines are not treated specially, so typing at the |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2566 end of a line joins the line to the next, with the typed character |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2567 between them. Typing before a tab character simply replaces the tab |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2568 with the character typed. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2569 \\[quoted-insert] replaces the text at the cursor, just as ordinary |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2570 typing characters do. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2571 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2572 Note that binary overwrite mode is not its own minor mode; it is a |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2573 specialization of overwrite-mode, entered by setting the |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2574 `overwrite-mode' variable to `overwrite-mode-binary'." |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2575 (interactive "P") |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2576 (setq overwrite-mode |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2577 (if (if (null arg) |
2301
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2578 (not (eq overwrite-mode 'overwrite-mode-binary)) |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2579 (> (prefix-numeric-value arg) 0)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2580 'overwrite-mode-binary)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2581 (force-mode-line-update)) |
475 | 2582 |
12789
6ee52fbbee75
(column-number-mode, line-number-mode): Default now t.
Richard M. Stallman <rms@gnu.org>
parents:
12718
diff
changeset
|
2583 (defvar line-number-mode t |
2301
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2584 "*Non-nil means display line number in mode line.") |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2585 |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2586 (defun line-number-mode (arg) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2587 "Toggle Line Number mode. |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2588 With arg, turn Line Number mode on iff arg is positive. |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2589 When Line Number mode is enabled, the line number appears |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2590 in the mode line." |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2591 (interactive "P") |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2592 (setq line-number-mode |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2593 (if (null arg) (not line-number-mode) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2594 (> (prefix-numeric-value arg) 0))) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2595 (force-mode-line-update)) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2596 |
13328
344abd898be9
(column-number-mode): Make default value nil.
Richard M. Stallman <rms@gnu.org>
parents:
13171
diff
changeset
|
2597 (defvar column-number-mode nil |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2598 "*Non-nil means display column number in mode line.") |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2599 |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2600 (defun column-number-mode (arg) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2601 "Toggle Column Number mode. |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2602 With arg, turn Column Number mode on iff arg is positive. |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2603 When Column Number mode is enabled, the column number appears |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2604 in the mode line." |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2605 (interactive "P") |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2606 (setq column-number-mode |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2607 (if (null arg) (not column-number-mode) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2608 (> (prefix-numeric-value arg) 0))) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2609 (force-mode-line-update)) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2610 |
475 | 2611 (defvar blink-matching-paren t |
2612 "*Non-nil means show matching open-paren when close-paren is inserted.") | |
2613 | |
13810
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
2614 (defvar blink-matching-paren-on-screen t |
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
2615 "*Non-nil means show matching open-paren when it is on screen. |
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
2616 nil means don't show it (but the open-paren can still be shown |
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
2617 when it is off screen.") |
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
2618 |
2669
0931cd677ff4
(blink-matching-paren-distance): Change default to 12,000.
Richard M. Stallman <rms@gnu.org>
parents:
2608
diff
changeset
|
2619 (defconst blink-matching-paren-distance 12000 |
0931cd677ff4
(blink-matching-paren-distance): Change default to 12,000.
Richard M. Stallman <rms@gnu.org>
parents:
2608
diff
changeset
|
2620 "*If non-nil, is maximum distance to search for matching open-paren.") |
475 | 2621 |
9771
3a51735d4a55
(blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9750
diff
changeset
|
2622 (defconst blink-matching-delay 1 |
3a51735d4a55
(blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9750
diff
changeset
|
2623 "*The number of seconds that `blink-matching-open' will delay at a match.") |
3a51735d4a55
(blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9750
diff
changeset
|
2624 |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2625 (defconst blink-matching-paren-dont-ignore-comments nil |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2626 "*Non-nil means `blink-matching-paren' should not ignore comments.") |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2627 |
475 | 2628 (defun blink-matching-open () |
2629 "Move cursor momentarily to the beginning of the sexp before point." | |
2630 (interactive) | |
2631 (and (> (point) (1+ (point-min))) | |
2632 blink-matching-paren | |
9749
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
2633 ;; Verify an even number of quoting characters precede the close. |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
2634 (= 1 (logand 1 (- (point) |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
2635 (save-excursion |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
2636 (forward-char -1) |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
2637 (skip-syntax-backward "/\\") |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
2638 (point))))) |
475 | 2639 (let* ((oldpos (point)) |
2640 (blinkpos) | |
2641 (mismatch)) | |
2642 (save-excursion | |
2643 (save-restriction | |
2644 (if blink-matching-paren-distance | |
2645 (narrow-to-region (max (point-min) | |
2646 (- (point) blink-matching-paren-distance)) | |
2647 oldpos)) | |
2648 (condition-case () | |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2649 (let ((parse-sexp-ignore-comments |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2650 (and parse-sexp-ignore-comments |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2651 (not blink-matching-paren-dont-ignore-comments)))) |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2652 (setq blinkpos (scan-sexps oldpos -1))) |
475 | 2653 (error nil))) |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2654 (and blinkpos |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2655 (/= (char-syntax (char-after blinkpos)) |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2656 ?\$) |
475 | 2657 (setq mismatch |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2658 (or (null (matching-paren (char-after blinkpos))) |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2659 (/= (char-after (1- oldpos)) |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
2660 (matching-paren (char-after blinkpos)))))) |
475 | 2661 (if mismatch (setq blinkpos nil)) |
2662 (if blinkpos | |
2663 (progn | |
2664 (goto-char blinkpos) | |
2665 (if (pos-visible-in-window-p) | |
13810
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
2666 (and blink-matching-paren-on-screen |
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
2667 (sit-for blink-matching-delay)) |
475 | 2668 (goto-char blinkpos) |
2669 (message | |
2670 "Matches %s" | |
6539
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
2671 ;; Show what precedes the open in its line, if anything. |
475 | 2672 (if (save-excursion |
2673 (skip-chars-backward " \t") | |
2674 (not (bolp))) | |
2675 (buffer-substring (progn (beginning-of-line) (point)) | |
2676 (1+ blinkpos)) | |
6539
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
2677 ;; Show what follows the open in its line, if anything. |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
2678 (if (save-excursion |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
2679 (forward-char 1) |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
2680 (skip-chars-forward " \t") |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
2681 (not (eolp))) |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
2682 (buffer-substring blinkpos |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
2683 (progn (end-of-line) (point))) |
9434
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2684 ;; Otherwise show the previous nonblank line, |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2685 ;; if there is one. |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2686 (if (save-excursion |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2687 (skip-chars-backward "\n \t") |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2688 (not (bobp))) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2689 (concat |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2690 (buffer-substring (progn |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2691 (skip-chars-backward "\n \t") |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2692 (beginning-of-line) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2693 (point)) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2694 (progn (end-of-line) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2695 (skip-chars-backward " \t") |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2696 (point))) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2697 ;; Replace the newline and other whitespace with `...'. |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2698 "..." |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2699 (buffer-substring blinkpos (1+ blinkpos))) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2700 ;; There is nothing to show except the char itself. |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
2701 (buffer-substring blinkpos (1+ blinkpos)))))))) |
475 | 2702 (cond (mismatch |
2703 (message "Mismatched parentheses")) | |
2704 ((not blink-matching-paren-distance) | |
2705 (message "Unmatched parenthesis")))))))) | |
2706 | |
2707 ;Turned off because it makes dbx bomb out. | |
2708 (setq blink-paren-function 'blink-matching-open) | |
2709 | |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
2710 ;; This executes C-g typed while Emacs is waiting for a command. |
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
2711 ;; Quitting out of a program does not go through here; |
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
2712 ;; that happens in the QUIT macro at the C code level. |
475 | 2713 (defun keyboard-quit () |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
2714 "Signal a quit condition. |
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
2715 During execution of Lisp code, this character causes a quit directly. |
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
2716 At top-level, as an editor command, this simply beeps." |
475 | 2717 (interactive) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
2718 (deactivate-mark) |
475 | 2719 (signal 'quit nil)) |
2720 | |
2721 (define-key global-map "\C-g" 'keyboard-quit) | |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2722 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2723 (defvar buffer-quit-function nil |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2724 "Function to call to \"quit\" the current buffer, or nil if none. |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2725 \\[keyboard-escape-quit] calls this function when its more local actions |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2726 \(such as cancelling a prefix argument, minibuffer or region) do not apply.") |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2727 |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2728 (defun keyboard-escape-quit () |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2729 "Exit the current \"mode\" (in a generalized sense of the word). |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2730 This command can exit an interactive command such as `query-replace', |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2731 can clear out a prefix argument or a region, |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2732 can get out of the minibuffer or other recursive edit, |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2733 cancel the use of the current buffer (for special-purpose buffers), |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2734 or go back to just one window (by deleting all but the selected window)." |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2735 (interactive) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2736 (cond ((eq last-command 'mode-exited) nil) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2737 ((> (minibuffer-depth) 0) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2738 (abort-recursive-edit)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2739 (current-prefix-arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2740 nil) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2741 ((and transient-mark-mode |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2742 mark-active) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2743 (deactivate-mark)) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2744 (buffer-quit-function |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2745 (funcall buffer-quit-function)) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2746 ((not (one-window-p t)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2747 (delete-other-windows)))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
2748 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2749 (define-key global-map "\e\e\e" 'keyboard-escape-quit) |
475 | 2750 |
2751 (defun set-variable (var val) | |
2752 "Set VARIABLE to VALUE. VALUE is a Lisp object. | |
2753 When using this interactively, supply a Lisp expression for VALUE. | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2754 If you want VALUE to be a string, you must surround it with doublequotes. |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2755 |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2756 If VARIABLE has a `variable-interactive' property, that is used as if |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2757 it were the arg to `interactive' (which see) to interactively read the value." |
475 | 2758 (interactive |
2759 (let* ((var (read-variable "Set variable: ")) | |
2760 (minibuffer-help-form | |
2761 '(funcall myhelp)) | |
2762 (myhelp | |
2763 (function | |
2764 (lambda () | |
2765 (with-output-to-temp-buffer "*Help*" | |
2766 (prin1 var) | |
2767 (princ "\nDocumentation:\n") | |
2768 (princ (substring (documentation-property var 'variable-documentation) | |
2769 1)) | |
2770 (if (boundp var) | |
2771 (let ((print-length 20)) | |
2772 (princ "\n\nCurrent value: ") | |
2773 (prin1 (symbol-value var)))) | |
9846
6a9a8abb0b6e
(set-variable): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
9779
diff
changeset
|
2774 (save-excursion |
6a9a8abb0b6e
(set-variable): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
9779
diff
changeset
|
2775 (set-buffer standard-output) |
6a9a8abb0b6e
(set-variable): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
9779
diff
changeset
|
2776 (help-mode)) |
475 | 2777 nil))))) |
2778 (list var | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2779 (let ((prop (get var 'variable-interactive))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2780 (if prop |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2781 ;; Use VAR's `variable-interactive' property |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2782 ;; as an interactive spec for prompting. |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2783 (call-interactively (list 'lambda '(arg) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2784 (list 'interactive prop) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2785 'arg)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2786 (eval-minibuffer (format "Set %s to value: " var))))))) |
475 | 2787 (set var val)) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2788 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2789 ;; Define the major mode for lists of completions. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2790 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2791 (defvar completion-list-mode-map nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2792 "Local map for completion list buffers.") |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
2793 (or completion-list-mode-map |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2794 (let ((map (make-sparse-keymap))) |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2795 (define-key map [mouse-2] 'mouse-choose-completion) |
7762
763a8b8e7363
(completion-list-mode-map): Unbind down-mouse-2.
Richard M. Stallman <rms@gnu.org>
parents:
7726
diff
changeset
|
2796 (define-key map [down-mouse-2] nil) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2797 (define-key map "\C-m" 'choose-completion) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2798 (define-key map "\e\e\e" 'delete-completion-window) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2799 (define-key map [left] 'previous-completion) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2800 (define-key map [right] 'next-completion) |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
2801 (setq completion-list-mode-map map))) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2802 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2803 ;; Completion mode is suitable only for specially formatted data. |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
2804 (put 'completion-list-mode 'mode-class 'special) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2805 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2806 (defvar completion-reference-buffer nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2807 "Record the buffer that was current when the completion list was requested. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2808 This is a local variable in the completion list buffer. |
11318
45947c4ff70b
Fix typo in prev change.
Richard M. Stallman <rms@gnu.org>
parents:
11313
diff
changeset
|
2809 Initial value is nil to avoid some compiler warnings.") |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
2810 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2811 (defvar completion-base-size nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2812 "Number of chars at beginning of minibuffer not involved in completion. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2813 This is a local variable in the completion list buffer |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2814 but it talks about the buffer in `completion-reference-buffer'. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2815 If this is nil, it means to compare text to determine which part |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2816 of the tail end of the buffer's text is involved in completion.") |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
2817 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2818 (defun delete-completion-window () |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2819 "Delete the completion list window. |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2820 Go to the window from which completion was requested." |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2821 (interactive) |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2822 (let ((buf completion-reference-buffer)) |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2823 (delete-window (selected-window)) |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2824 (if (get-buffer-window buf) |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2825 (select-window (get-buffer-window buf))))) |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
2826 |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2827 (defun previous-completion (n) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2828 "Move to the previous item in the completion list." |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2829 (interactive "p") |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2830 (next-completion (- n))) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2831 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2832 (defun next-completion (n) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2833 "Move to the next item in the completion list. |
13960
5f1ba0200a33
(shell-command): Fix message spelling.
Karl Heuer <kwzh@gnu.org>
parents:
13810
diff
changeset
|
2834 With prefix argument N, move N items (negative N means move backward)." |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2835 (interactive "p") |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2836 (while (and (> n 0) (not (eobp))) |
13171
ed9465203ed6
(next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents:
13137
diff
changeset
|
2837 (let ((prop (get-text-property (point) 'mouse-face)) |
ed9465203ed6
(next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents:
13137
diff
changeset
|
2838 (end (point-max))) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2839 ;; If in a completion, move to the end of it. |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2840 (if prop |
13171
ed9465203ed6
(next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents:
13137
diff
changeset
|
2841 (goto-char (next-single-property-change (point) 'mouse-face nil end))) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2842 ;; Move to start of next one. |
13171
ed9465203ed6
(next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents:
13137
diff
changeset
|
2843 (goto-char (next-single-property-change (point) 'mouse-face nil end))) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2844 (setq n (1- n))) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2845 (while (and (< n 0) (not (bobp))) |
13171
ed9465203ed6
(next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents:
13137
diff
changeset
|
2846 (let ((prop (get-text-property (1- (point)) 'mouse-face)) |
ed9465203ed6
(next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents:
13137
diff
changeset
|
2847 (end (point-min))) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2848 ;; If in a completion, move to the start of it. |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2849 (if prop |
13171
ed9465203ed6
(next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents:
13137
diff
changeset
|
2850 (goto-char (previous-single-property-change |
ed9465203ed6
(next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents:
13137
diff
changeset
|
2851 (point) 'mouse-face nil end))) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2852 ;; Move to end of the previous completion. |
13171
ed9465203ed6
(next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents:
13137
diff
changeset
|
2853 (goto-char (previous-single-property-change (point) 'mouse-face nil end)) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2854 ;; Move to the start of that one. |
13171
ed9465203ed6
(next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents:
13137
diff
changeset
|
2855 (goto-char (previous-single-property-change (point) 'mouse-face nil end))) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2856 (setq n (1+ n)))) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2857 |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2858 (defun choose-completion () |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2859 "Choose the completion that point is in or next to." |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2860 (interactive) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
2861 (let (beg end completion (buffer completion-reference-buffer) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
2862 (base-size completion-base-size)) |
8203
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2863 (if (and (not (eobp)) (get-text-property (point) 'mouse-face)) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2864 (setq end (point) beg (1+ (point)))) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2865 (if (and (not (bobp)) (get-text-property (1- (point)) 'mouse-face)) |
10959
e43125b71452
(completion-setup-function): Set completion-base-size.
Richard M. Stallman <rms@gnu.org>
parents:
10949
diff
changeset
|
2866 (setq end (1- (point)) beg (point))) |
8203
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2867 (if (null beg) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2868 (error "No completion here")) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2869 (setq beg (previous-single-property-change beg 'mouse-face)) |
8380
40ab7df62402
(choose-completion): Check for next-single-property-change returning nil.
Richard M. Stallman <rms@gnu.org>
parents:
8309
diff
changeset
|
2870 (setq end (or (next-single-property-change end 'mouse-face) (point-max))) |
8468
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
2871 (setq completion (buffer-substring beg end)) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
2872 (let ((owindow (selected-window))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
2873 (if (and (one-window-p t 'selected-frame) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
2874 (window-dedicated-p (selected-window))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
2875 ;; This is a special buffer's frame |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
2876 (iconify-frame (selected-frame)) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
2877 (or (window-dedicated-p (selected-window)) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
2878 (bury-buffer))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
2879 (select-window owindow)) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
2880 (choose-completion-string completion buffer base-size))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2881 |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2882 ;; Delete the longest partial match for STRING |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2883 ;; that can be found before POINT. |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2884 (defun choose-completion-delete-max-match (string) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2885 (let ((opoint (point)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2886 (len (min (length string) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2887 (- (point) (point-min))))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2888 (goto-char (- (point) (length string))) |
7574
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
2889 (if completion-ignore-case |
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
2890 (setq string (downcase string))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2891 (while (and (> len 0) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2892 (let ((tail (buffer-substring (point) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2893 (+ (point) len)))) |
7574
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
2894 (if completion-ignore-case |
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
2895 (setq tail (downcase tail))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2896 (not (string= tail (substring string 0 len))))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2897 (setq len (1- len)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2898 (forward-char 1)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2899 (delete-char len))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2900 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2901 ;; Switch to BUFFER and insert the completion choice CHOICE. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2902 ;; BASE-SIZE, if non-nil, says how many characters of BUFFER's text |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2903 ;; to keep. If it is nil, use choose-completion-delete-max-match instead. |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
2904 (defun choose-completion-string (choice &optional buffer base-size) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2905 (let ((buffer (or buffer completion-reference-buffer))) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2906 ;; If BUFFER is a minibuffer, barf unless it's the currently |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2907 ;; active minibuffer. |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2908 (if (and (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name buffer)) |
11159
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
2909 (or (not (active-minibuffer-window)) |
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
2910 (not (equal buffer |
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
2911 (window-buffer (active-minibuffer-window)))))) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2912 (error "Minibuffer is not active for completion") |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2913 ;; Insert the completion into the buffer where completion was requested. |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2914 (set-buffer buffer) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
2915 (if base-size |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
2916 (delete-region (+ base-size (point-min)) (point)) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
2917 (choose-completion-delete-max-match choice)) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2918 (insert choice) |
7697
b52a92ea3796
(choose-completion-string): Clear mouse-face property.
Richard M. Stallman <rms@gnu.org>
parents:
7594
diff
changeset
|
2919 (remove-text-properties (- (point) (length choice)) (point) |
b52a92ea3796
(choose-completion-string): Clear mouse-face property.
Richard M. Stallman <rms@gnu.org>
parents:
7594
diff
changeset
|
2920 '(mouse-face nil)) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2921 ;; Update point in the window that BUFFER is showing in. |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2922 (let ((window (get-buffer-window buffer t))) |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2923 (set-window-point window (point))) |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2924 ;; If completing for the minibuffer, exit it with this choice. |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
2925 (and (equal buffer (window-buffer (minibuffer-window))) |
8559
509daefd2d13
(choose-completion-string): Use plain exit-minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
8479
diff
changeset
|
2926 minibuffer-completion-table |
509daefd2d13
(choose-completion-string): Use plain exit-minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
8479
diff
changeset
|
2927 (exit-minibuffer))))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2928 |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
2929 (defun completion-list-mode () |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2930 "Major mode for buffers showing lists of possible completions. |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2931 Type \\<completion-list-mode-map>\\[choose-completion] in the completion list\ |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2932 to select the completion near point. |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2933 Use \\<completion-list-mode-map>\\[mouse-choose-completion] to select one\ |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2934 with the mouse." |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2935 (interactive) |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2936 (kill-all-local-variables) |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
2937 (use-local-map completion-list-mode-map) |
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
2938 (setq mode-name "Completion List") |
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
2939 (setq major-mode 'completion-list-mode) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
2940 (make-local-variable 'completion-base-size) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
2941 (setq completion-base-size nil) |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
2942 (run-hooks 'completion-list-mode-hook)) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2943 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2944 (defvar completion-fixup-function nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2945 "A function to customize how completions are identified in completion lists. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2946 `completion-setup-function' calls this function with no arguments |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2947 each time it has found what it thinks is one completion. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2948 Point is at the end of the completion in the completion list buffer. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2949 If this function moves point, it can alter the end of that completion.") |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2950 |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2951 ;; This function goes in completion-setup-hook, so that it is called |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2952 ;; after the text of the completion list buffer is written. |
8203
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2953 |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2954 (defun completion-setup-function () |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2955 (save-excursion |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2956 (let ((mainbuf (current-buffer))) |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
2957 (set-buffer standard-output) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
2958 (completion-list-mode) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
2959 (make-local-variable 'completion-reference-buffer) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
2960 (setq completion-reference-buffer mainbuf) |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2961 ;;; The value 0 is right in most cases, but not for file name completion. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2962 ;;; so this has to be turned off. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
2963 ;;; (setq completion-base-size 0) |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
2964 (goto-char (point-min)) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
2965 (if window-system |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
2966 (insert (substitute-command-keys |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2967 "Click \\[mouse-choose-completion] on a completion to select it.\n"))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2968 (insert (substitute-command-keys |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
2969 "In this buffer, type \\[choose-completion] to \ |
6674
7ada27b4bf3c
(completion-setup-function): Add mouse-face properties.
Karl Heuer <kwzh@gnu.org>
parents:
6549
diff
changeset
|
2970 select the completion near point.\n\n")) |
7ada27b4bf3c
(completion-setup-function): Add mouse-face properties.
Karl Heuer <kwzh@gnu.org>
parents:
6549
diff
changeset
|
2971 (forward-line 1) |
8203
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2972 (while (re-search-forward "[^ \t\n]+\\( [^ \t\n]+\\)*" nil t) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2973 (let ((beg (match-beginning 0)) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2974 (end (point))) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2975 (if completion-fixup-function |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2976 (funcall completion-fixup-function)) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2977 (put-text-property beg (point) 'mouse-face 'highlight) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
2978 (goto-char end)))))) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2979 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
2980 (add-hook 'completion-setup-hook 'completion-setup-function) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2981 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2982 (define-key minibuffer-local-completion-map [prior] |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2983 'switch-to-completions) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2984 (define-key minibuffer-local-must-match-map [prior] |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2985 'switch-to-completions) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2986 (define-key minibuffer-local-completion-map "\M-v" |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2987 'switch-to-completions) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2988 (define-key minibuffer-local-must-match-map "\M-v" |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2989 'switch-to-completions) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2990 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2991 (defun switch-to-completions () |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2992 "Select the completion list window." |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2993 (interactive) |
12483
ec77cb3940f1
(switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents:
12428
diff
changeset
|
2994 ;; Make sure we have a completions window. |
ec77cb3940f1
(switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents:
12428
diff
changeset
|
2995 (or (get-buffer-window "*Completions*") |
ec77cb3940f1
(switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents:
12428
diff
changeset
|
2996 (minibuffer-completion-help)) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2997 (select-window (get-buffer-window "*Completions*")) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2998 (goto-char (point-min)) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
2999 (search-forward "\n\n") |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3000 (forward-line 1)) |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3001 |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3002 ;; Support keyboard commands to turn on various modifiers. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3003 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3004 ;; These functions -- which are not commands -- each add one modifier |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3005 ;; to the following event. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3006 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3007 (defun event-apply-alt-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3008 (vector (event-apply-modifier (read-event) 'alt 22 "A-"))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3009 (defun event-apply-super-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3010 (vector (event-apply-modifier (read-event) 'super 23 "s-"))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3011 (defun event-apply-hyper-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3012 (vector (event-apply-modifier (read-event) 'hyper 24 "H-"))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3013 (defun event-apply-shift-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3014 (vector (event-apply-modifier (read-event) 'shift 25 "S-"))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3015 (defun event-apply-control-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3016 (vector (event-apply-modifier (read-event) 'control 26 "C-"))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3017 (defun event-apply-meta-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3018 (vector (event-apply-modifier (read-event) 'meta 27 "M-"))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3019 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3020 (defun event-apply-modifier (event symbol lshiftby prefix) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3021 "Apply a modifier flag to event EVENT. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3022 SYMBOL is the name of this modifier, as a symbol. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3023 LSHIFTBY is the numeric value of this modifier, in keyboard events. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3024 PREFIX is the string that represents this modifier in an event type symbol." |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3025 (if (numberp event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3026 (cond ((eq symbol 'control) |
11201
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3027 (if (and (<= (downcase event) ?z) |
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3028 (>= (downcase event) ?a)) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3029 (- (downcase event) ?a -1) |
11201
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3030 (if (and (<= (downcase event) ?Z) |
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3031 (>= (downcase event) ?A)) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3032 (- (downcase event) ?A -1) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3033 (logior (lsh 1 lshiftby) event)))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3034 ((eq symbol 'shift) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3035 (if (and (<= (downcase event) ?z) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3036 (>= (downcase event) ?a)) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3037 (upcase event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3038 (logior (lsh 1 lshiftby) event))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3039 (t |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3040 (logior (lsh 1 lshiftby) event))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3041 (if (memq symbol (event-modifiers event)) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3042 event |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3043 (let ((event-type (if (symbolp event) event (car event)))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3044 (setq event-type (intern (concat prefix (symbol-name event-type)))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3045 (if (symbolp event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3046 event-type |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3047 (cons event-type (cdr event))))))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3048 |
11206
60b7ab7d4fec
Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents:
11201
diff
changeset
|
3049 (define-key function-key-map [?\C-x ?@ ?h] 'event-apply-hyper-modifier) |
60b7ab7d4fec
Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents:
11201
diff
changeset
|
3050 (define-key function-key-map [?\C-x ?@ ?s] 'event-apply-super-modifier) |
60b7ab7d4fec
Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents:
11201
diff
changeset
|
3051 (define-key function-key-map [?\C-x ?@ ?m] 'event-apply-meta-modifier) |
60b7ab7d4fec
Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents:
11201
diff
changeset
|
3052 (define-key function-key-map [?\C-x ?@ ?a] 'event-apply-alt-modifier) |
60b7ab7d4fec
Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents:
11201
diff
changeset
|
3053 (define-key function-key-map [?\C-x ?@ ?S] 'event-apply-shift-modifier) |
60b7ab7d4fec
Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents:
11201
diff
changeset
|
3054 (define-key function-key-map [?\C-x ?@ ?c] 'event-apply-control-modifier) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3055 |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3056 ;;;; Keypad support. |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3057 |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3058 ;;; Make the keypad keys act like ordinary typing keys. If people add |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3059 ;;; bindings for the function key symbols, then those bindings will |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3060 ;;; override these, so this shouldn't interfere with any existing |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3061 ;;; bindings. |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3062 |
5342
f38861038093
(setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents:
5324
diff
changeset
|
3063 ;; Also tell read-char how to handle these keys. |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3064 (mapcar |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3065 (lambda (keypad-normal) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3066 (let ((keypad (nth 0 keypad-normal)) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3067 (normal (nth 1 keypad-normal))) |
5342
f38861038093
(setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents:
5324
diff
changeset
|
3068 (put keypad 'ascii-character normal) |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3069 (define-key function-key-map (vector keypad) (vector normal)))) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3070 '((kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3071 (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3072 (kp-space ?\ ) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3073 (kp-tab ?\t) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3074 (kp-enter ?\r) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3075 (kp-multiply ?*) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3076 (kp-add ?+) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3077 (kp-separator ?,) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3078 (kp-subtract ?-) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3079 (kp-decimal ?.) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3080 (kp-divide ?/) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3081 (kp-equal ?=))) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3082 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3083 ;;; simple.el ends here |