Mercurial > emacs
annotate lisp/simple.el @ 19977:f5ea3a56adb5
(mode-line-format): Doc fix.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Thu, 25 Sep 1997 00:40:45 +0000 |
parents | 45a077538366 |
children | c9ed682ff86f |
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 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3 ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 1997 |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
475 | 5 |
6 ;; This file is part of GNU Emacs. | |
7 | |
8 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
9 ;; 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
|
10 ;; the Free Software Foundation; either version 2, or (at your option) |
475 | 11 ;; any later version. |
12 | |
13 ;; GNU Emacs is distributed in the hope that it will be useful, | |
14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 ;; GNU General Public License for more details. | |
17 | |
18 ;; You should have received a copy of the GNU General Public License | |
14169 | 19 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
20 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 ;; Boston, MA 02111-1307, USA. | |
475 | 22 |
2315
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
23 ;;; Commentary: |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
24 |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
25 ;; 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
|
26 ;; major mode or to file-handling. |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
27 |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
28 ;;; Code: |
475 | 29 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
30 (defgroup killing nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
31 "Killing and yanking commands" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
32 :group 'editing) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
33 |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
34 (defgroup fill-comments nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
35 "Indenting and filling of comments." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
36 :prefix "comment-" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
37 :group 'fill) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
38 |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
39 (defgroup paren-matching nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
40 "Highlight (un)matching of parens and expressions." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
41 :group 'matching) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
42 |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
43 |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
44 (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
|
45 "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
|
46 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
|
47 With arg, insert that many newlines. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
48 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
|
49 (interactive "*P") |
13137
a83a1515fd9b
(newline): Call barf-if-buffer-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
12975
diff
changeset
|
50 (barf-if-buffer-read-only) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
51 ;; 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
|
52 ;; 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
|
53 ;; 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
|
54 ;; the end of the previous line. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
55 (let ((flag (and (not (bobp)) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
56 (bolp) |
17214
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
57 ;; Make sure no functions want to be told about |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
58 ;; the range of the changes. |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
59 (not after-change-function) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
60 (not before-change-function) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
61 (not after-change-functions) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
62 (not before-change-functions) |
16417
fb6785d0c256
(newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents:
16408
diff
changeset
|
63 ;; Make sure there are no markers here. |
fb6785d0c256
(newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents:
16408
diff
changeset
|
64 (not (buffer-has-markers-at (1- (point)))) |
17214
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
65 ;; Make sure no text properties want to know |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
66 ;; where the change was. |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
67 (not (get-char-property (1- (point)) 'modification-hooks)) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
68 (not (get-char-property (1- (point)) 'insert-behind-hooks)) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
69 (or (eobp) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
70 (not (get-char-property (point) 'insert-in-front-hooks))) |
15605
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
71 ;; Make sure the newline before point isn't intangible. |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
72 (not (get-char-property (1- (point)) 'intangible)) |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
73 ;; Make sure the newline before point isn't read-only. |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
74 (not (get-char-property (1- (point)) 'read-only)) |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
75 ;; Make sure the newline before point isn't invisible. |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
76 (not (get-char-property (1- (point)) 'invisible)) |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
77 ;; Make sure the newline before point has the same |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
78 ;; properties as the char before it (if any). |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
79 (< (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
|
80 (- (point) 2)))) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
81 (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
|
82 (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
|
83 (beforepos (point))) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
84 (if flag (backward-char 1)) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
85 ;; 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
|
86 ;; 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
|
87 (let ((last-command-char ?\n) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
88 ;; 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
|
89 ;; 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
|
90 ;; 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
|
91 (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
|
92 (unwind-protect |
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
93 (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
|
94 ;; 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
|
95 (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
|
96 ;; 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
|
97 (if flag (backward-char 1)) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
98 ;; Mark the newline(s) `hard'. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
99 (if use-hard-newlines |
16018
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
100 (set-hard-newline-properties |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
101 (- (point) (if arg (prefix-numeric-value arg) 1)) (point))) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
102 ;; 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
|
103 ;; 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
|
104 (or flag |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
105 (save-excursion |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
106 (goto-char beforepos) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
107 (beginning-of-line) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
108 (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
|
109 (> (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
|
110 (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
|
111 (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
|
112 ;; 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
|
113 ;; 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
|
114 ;; 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
|
115 (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
|
116 (move-to-left-margin nil t))) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
117 nil) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
118 |
16018
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
119 (defun set-hard-newline-properties (from to) |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
120 (let ((sticky (get-text-property from 'rear-nonsticky))) |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
121 (put-text-property from to 'hard 't) |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
122 ;; If rear-nonsticky is not "t", add 'hard to rear-nonsticky list |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
123 (if (and (listp sticky) (not (memq 'hard sticky))) |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
124 (put-text-property from (point) 'rear-nonsticky |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
125 (cons 'hard sticky))))) |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
126 |
475 | 127 (defun open-line (arg) |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
128 "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
|
129 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
|
130 if the line would have been blank. |
1063
25b929c06f83
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1039
diff
changeset
|
131 With arg N, insert N newlines." |
475 | 132 (interactive "*p") |
1063
25b929c06f83
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1039
diff
changeset
|
133 (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
|
134 (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
|
135 (loc (point))) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
136 (newline arg) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
137 (goto-char loc) |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
138 (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
|
139 (cond ((bolp) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
140 (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
|
141 (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
|
142 (forward-line 1) |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
143 (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
|
144 (goto-char loc) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
145 (end-of-line))) |
475 | 146 |
147 (defun split-line () | |
148 "Split current line, moving portion beyond point vertically down." | |
149 (interactive "*") | |
150 (skip-chars-forward " \t") | |
151 (let ((col (current-column)) | |
152 (pos (point))) | |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
153 (newline 1) |
475 | 154 (indent-to col 0) |
155 (goto-char pos))) | |
156 | |
157 (defun quoted-insert (arg) | |
158 "Read next input character and insert it. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
159 This is useful for inserting control characters. |
18822
c9bb90fcf780
(quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18820
diff
changeset
|
160 |
c9bb90fcf780
(quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18820
diff
changeset
|
161 If the first character you type after this command is an octal digit, |
c9bb90fcf780
(quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18820
diff
changeset
|
162 you should type a sequence of octal digits which specify a character code. |
18825
36119d2da68a
(quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18822
diff
changeset
|
163 Any nondigit terminates the sequence. If the terminator is a RET, |
18822
c9bb90fcf780
(quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18820
diff
changeset
|
164 it is discarded; any other terminator is used itself as input. |
18825
36119d2da68a
(quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18822
diff
changeset
|
165 The variable `read-quoted-char-radix' specifies the radix for this feature; |
36119d2da68a
(quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18822
diff
changeset
|
166 set it to 10 or 16 to use decimal or hex instead of octal. |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
167 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
168 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
|
169 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
|
170 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
|
171 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
|
172 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
173 In binary overwrite mode, this function does overwrite, and octal |
18822
c9bb90fcf780
(quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18820
diff
changeset
|
174 digits are interpreted as a character code. This is intended to be |
c9bb90fcf780
(quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18820
diff
changeset
|
175 useful for editing binary files." |
475 | 176 (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
|
177 (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
|
178 (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
|
179 (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
|
180 (read-char)))) |
17589
4dca74d70b49
(quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17514
diff
changeset
|
181 ;; Assume character codes 0200 - 0377 stand for |
4dca74d70b49
(quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17514
diff
changeset
|
182 ;; European characters in Latin-1, and convert them |
4dca74d70b49
(quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17514
diff
changeset
|
183 ;; to Emacs characters. |
4dca74d70b49
(quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17514
diff
changeset
|
184 (and enable-multibyte-characters |
4dca74d70b49
(quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17514
diff
changeset
|
185 (>= char ?\200) |
17713
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
186 (<= char ?\377) |
17855
40a43a90976f
(do-auto-fill): Check enable-kinsoku and enable-multibyte-characters.
Richard M. Stallman <rms@gnu.org>
parents:
17713
diff
changeset
|
187 (setq char (+ nonascii-insert-offset char))) |
10779
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
188 (if (> arg 0) |
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
189 (if (eq overwrite-mode 'overwrite-mode-binary) |
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
190 (delete-char arg))) |
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
191 (while (> arg 0) |
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
192 (insert-and-inherit char) |
7d9423ce104d
(quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents:
10722
diff
changeset
|
193 (setq arg (1- arg))))) |
475 | 194 |
195 (defun delete-indentation (&optional arg) | |
196 "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
|
197 If there is a fill prefix, delete it from the beginning of this line. |
475 | 198 With argument, join this line to following line." |
199 (interactive "*P") | |
200 (beginning-of-line) | |
201 (if arg (forward-line 1)) | |
202 (if (eq (preceding-char) ?\n) | |
203 (progn | |
204 (delete-region (point) (1- (point))) | |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
205 ;; If the second line started with the fill prefix, |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
206 ;; delete the prefix. |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
207 (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
|
208 (<= (+ (point) (length fill-prefix)) (point-max)) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
209 (string= fill-prefix |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
210 (buffer-substring (point) |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
211 (+ (point) (length fill-prefix))))) |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
212 (delete-region (point) (+ (point) (length fill-prefix)))) |
475 | 213 (fixup-whitespace)))) |
214 | |
215 (defun fixup-whitespace () | |
216 "Fixup white space between objects around point. | |
217 Leave one space or none, according to the context." | |
218 (interactive "*") | |
219 (save-excursion | |
220 (delete-horizontal-space) | |
221 (if (or (looking-at "^\\|\\s)") | |
222 (save-excursion (forward-char -1) | |
223 (looking-at "$\\|\\s(\\|\\s'"))) | |
224 nil | |
225 (insert ?\ )))) | |
226 | |
227 (defun delete-horizontal-space () | |
228 "Delete all spaces and tabs around point." | |
229 (interactive "*") | |
230 (skip-chars-backward " \t") | |
231 (delete-region (point) (progn (skip-chars-forward " \t") (point)))) | |
232 | |
233 (defun just-one-space () | |
234 "Delete all spaces and tabs around point, leaving one space." | |
235 (interactive "*") | |
236 (skip-chars-backward " \t") | |
237 (if (= (following-char) ? ) | |
238 (forward-char 1) | |
239 (insert ? )) | |
240 (delete-region (point) (progn (skip-chars-forward " \t") (point)))) | |
241 | |
242 (defun delete-blank-lines () | |
243 "On blank line, delete all surrounding blank lines, leaving just one. | |
244 On isolated blank line, delete that one. | |
7817
d729f75fff04
(delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7762
diff
changeset
|
245 On nonblank line, delete any immediately following blank lines." |
475 | 246 (interactive "*") |
247 (let (thisblank singleblank) | |
248 (save-excursion | |
249 (beginning-of-line) | |
250 (setq thisblank (looking-at "[ \t]*$")) | |
715 | 251 ;; Set singleblank if there is just one blank line here. |
475 | 252 (setq singleblank |
253 (and thisblank | |
254 (not (looking-at "[ \t]*\n[ \t]*$")) | |
255 (or (bobp) | |
256 (progn (forward-line -1) | |
257 (not (looking-at "[ \t]*$"))))))) | |
715 | 258 ;; Delete preceding blank lines, and this one too if it's the only one. |
475 | 259 (if thisblank |
260 (progn | |
261 (beginning-of-line) | |
262 (if singleblank (forward-line 1)) | |
263 (delete-region (point) | |
264 (if (re-search-backward "[^ \t\n]" nil t) | |
265 (progn (forward-line 1) (point)) | |
266 (point-min))))) | |
715 | 267 ;; Delete following blank lines, unless the current line is blank |
268 ;; and there are no following blank lines. | |
475 | 269 (if (not (and thisblank singleblank)) |
270 (save-excursion | |
271 (end-of-line) | |
272 (forward-line 1) | |
273 (delete-region (point) | |
274 (if (re-search-forward "[^ \t\n]" nil t) | |
275 (progn (beginning-of-line) (point)) | |
715 | 276 (point-max))))) |
277 ;; Handle the special case where point is followed by newline and eob. | |
278 ;; Delete the line, leaving point at eob. | |
279 (if (looking-at "^[ \t]*\n\\'") | |
280 (delete-region (point) (point-max))))) | |
475 | 281 |
282 (defun back-to-indentation () | |
283 "Move point to the first non-whitespace character on this line." | |
284 (interactive) | |
285 (beginning-of-line 1) | |
286 (skip-chars-forward " \t")) | |
287 | |
288 (defun newline-and-indent () | |
289 "Insert a newline, then indent according to major mode. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
290 Indentation is done using the value of `indent-line-function'. |
475 | 291 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
|
292 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
|
293 column specified by the function `current-left-margin'." |
475 | 294 (interactive "*") |
295 (delete-region (point) (progn (skip-chars-backward " \t") (point))) | |
617 | 296 (newline) |
475 | 297 (indent-according-to-mode)) |
298 | |
299 (defun reindent-then-newline-and-indent () | |
300 "Reindent current line, insert newline, then indent the new line. | |
301 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
|
302 which means calling the current value of `indent-line-function'. |
475 | 303 In programming language modes, this is the same as TAB. |
304 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
|
305 column specified by the function `current-left-margin'." |
475 | 306 (interactive "*") |
307 (save-excursion | |
308 (delete-region (point) (progn (skip-chars-backward " \t") (point))) | |
309 (indent-according-to-mode)) | |
617 | 310 (newline) |
475 | 311 (indent-according-to-mode)) |
312 | |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
313 ;; 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
|
314 (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
|
315 (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
|
316 (if (eq arg '-) (setq arg -1)) |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
317 (kill-region (point) (forward-point arg))) |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
318 |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
319 ;; 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
|
320 (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
|
321 (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
|
322 (if (eq arg '-) (setq arg -1)) |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
323 (kill-region (point) (forward-point (- arg)))) |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
324 |
475 | 325 (defun backward-delete-char-untabify (arg &optional killp) |
326 "Delete characters backward, changing tabs into spaces. | |
327 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil. | |
328 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
|
329 and KILLP is t if a prefix arg was specified." |
475 | 330 (interactive "*p\nP") |
331 (let ((count arg)) | |
332 (save-excursion | |
333 (while (and (> count 0) (not (bobp))) | |
334 (if (= (preceding-char) ?\t) | |
335 (let ((col (current-column))) | |
336 (forward-char -1) | |
337 (setq col (- col (current-column))) | |
338 (insert-char ?\ col) | |
339 (delete-char 1))) | |
340 (forward-char -1) | |
341 (setq count (1- count))))) | |
14721
2630ac774647
(backward-delete-char-untabify):
Richard M. Stallman <rms@gnu.org>
parents:
14627
diff
changeset
|
342 (delete-backward-char arg killp)) |
475 | 343 |
344 (defun zap-to-char (arg char) | |
345 "Kill up to and including ARG'th occurrence of CHAR. | |
346 Goes backward if ARG is negative; error if CHAR not found." | |
347 (interactive "p\ncZap to char: ") | |
348 (kill-region (point) (progn | |
349 (search-forward (char-to-string char) nil nil arg) | |
350 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point)))) | |
351 (point)))) | |
352 | |
353 (defun beginning-of-buffer (&optional arg) | |
354 "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
|
355 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
|
356 |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
357 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
|
358 of the accessible part of the buffer. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
359 |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
360 Don't use this command in Lisp programs! |
475 | 361 \(goto-char (point-min)) is faster and avoids clobbering the mark." |
362 (interactive "P") | |
363 (push-mark) | |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
364 (let ((size (- (point-max) (point-min)))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
365 (goto-char (if arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
366 (+ (point-min) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
367 (if (> size 10000) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
368 ;; Avoid overflow for large buffer sizes! |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
369 (* (prefix-numeric-value arg) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
370 (/ size 10)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
371 (/ (+ 10 (* size (prefix-numeric-value arg))) 10))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
372 (point-min)))) |
475 | 373 (if arg (forward-line 1))) |
374 | |
375 (defun end-of-buffer (&optional arg) | |
376 "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
|
377 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
|
378 |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
379 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
|
380 of the accessible part of the buffer. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
381 |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
382 Don't use this command in Lisp programs! |
475 | 383 \(goto-char (point-max)) is faster and avoids clobbering the mark." |
384 (interactive "P") | |
385 (push-mark) | |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
386 (let ((size (- (point-max) (point-min)))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
387 (goto-char (if arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
388 (- (point-max) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
389 (if (> size 10000) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
390 ;; Avoid overflow for large buffer sizes! |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
391 (* (prefix-numeric-value arg) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
392 (/ size 10)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
393 (/ (* size (prefix-numeric-value arg)) 10))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
394 (point-max)))) |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
395 ;; 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
|
396 ;; adjust it to the beginning of a line. |
475 | 397 (if arg (forward-line 1) |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
398 ;; 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
|
399 ;; 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
|
400 (if (let ((old-point (point))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
401 (save-excursion |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
402 (goto-char (window-start)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
403 (vertical-motion (window-height)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
404 (< (point) old-point))) |
7877
0eb805c768af
(end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents:
7817
diff
changeset
|
405 (progn |
0eb805c768af
(end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents:
7817
diff
changeset
|
406 (overlay-recenter (point)) |
0eb805c768af
(end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents:
7817
diff
changeset
|
407 (recenter -3))))) |
475 | 408 |
409 (defun mark-whole-buffer () | |
715 | 410 "Put point at beginning and mark at end of buffer. |
411 You probably should not use this function in Lisp programs; | |
412 it is usually a mistake for a Lisp function to use any subroutine | |
413 that uses or sets the mark." | |
475 | 414 (interactive) |
415 (push-mark (point)) | |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
416 (push-mark (point-max) nil t) |
475 | 417 (goto-char (point-min))) |
418 | |
419 (defun count-lines-region (start end) | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3487
diff
changeset
|
420 "Print number of lines and characters in the region." |
475 | 421 (interactive "r") |
422 (message "Region has %d lines, %d characters" | |
423 (count-lines start end) (- end start))) | |
424 | |
425 (defun what-line () | |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
426 "Print the current buffer line number and narrowed line number of point." |
475 | 427 (interactive) |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
428 (let ((opoint (point)) start) |
475 | 429 (save-excursion |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
430 (save-restriction |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
431 (goto-char (point-min)) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
432 (widen) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
433 (beginning-of-line) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
434 (setq start (point)) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
435 (goto-char opoint) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
436 (beginning-of-line) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
437 (if (/= start 1) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
438 (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
|
439 (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
|
440 (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
|
441 (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
|
442 |
475 | 443 |
444 (defun count-lines (start end) | |
445 "Return number of lines between START and END. | |
446 This is usually the number of newlines between them, | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
447 but can be one more if START is not equal to END |
475 | 448 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
|
449 (save-excursion |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
450 (save-restriction |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
451 (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
|
452 (goto-char (point-min)) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
453 (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
|
454 (save-match-data |
2421
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
455 (let ((done 0)) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
456 (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
|
457 (setq done (+ 40 done))) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
458 (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
|
459 (setq done (+ 1 done))) |
5151
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
460 (goto-char (point-max)) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
461 (if (and (/= start end) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
462 (not (bolp))) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
463 (1+ done) |
9554
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
464 done))) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
465 (- (buffer-size) (forward-line (buffer-size))))))) |
475 | 466 |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
467 (defun what-cursor-position (&optional detail) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
468 "Print info on cursor position (on screen and within buffer). |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
469 With prefix argument, print detailed info of a character on cursor position." |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
470 (interactive "P") |
475 | 471 (let* ((char (following-char)) |
472 (beg (point-min)) | |
473 (end (point-max)) | |
474 (pos (point)) | |
475 (total (buffer-size)) | |
476 (percent (if (> total 50000) | |
477 ;; Avoid overflow from multiplying by 100! | |
478 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1)) | |
479 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1)))) | |
480 (hscroll (if (= (window-hscroll) 0) | |
481 "" | |
482 (format " Hscroll=%d" (window-hscroll)))) | |
483 (col (current-column))) | |
484 (if (= pos end) | |
485 (if (or (/= beg 1) (/= end (1+ total))) | |
486 (message "point=%d of %d(%d%%) <%d - %d> column %d %s" | |
487 pos total percent beg end col hscroll) | |
488 (message "point=%d of %d(%d%%) column %d %s" | |
489 pos total percent col hscroll)) | |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
490 (let ((str (if detail (format " %s" (split-char char)) ""))) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
491 (if (or (/= beg 1) (/= end (1+ total))) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
492 (message "Char: %s (0%o, %d, 0x%x) %s point=%d of %d(%d%%) <%d - %d> column %d %s" |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
493 (if (< char 256) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
494 (single-key-description char) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
495 (char-to-string char)) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
496 char char char str pos total percent beg end col hscroll) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
497 (message "Char: %s (0%o, %d, 0x%x)%s point=%d of %d(%d%%) column %d %s" |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
498 (if (< char 256) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
499 (single-key-description char) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
500 (char-to-string char)) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
501 char char char str pos total percent col hscroll)))))) |
475 | 502 |
503 (defun fundamental-mode () | |
504 "Major mode not specialized for anything in particular. | |
505 Other major modes are defined by comparison with this one." | |
506 (interactive) | |
507 (kill-all-local-variables)) | |
508 | |
4894
1574c6c6561f
(eval-expression): Fix typo: missing paren.
Roland McGrath <roland@gnu.org>
parents:
4886
diff
changeset
|
509 (defvar read-expression-map (cons 'keymap minibuffer-local-map) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
510 "Minibuffer keymap used for reading Lisp expressions.") |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
511 (define-key read-expression-map "\M-\t" 'lisp-complete-symbol) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
512 |
4289
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
513 (defvar read-expression-history nil) |
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
514 |
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
515 ;; We define this, rather than making `eval' interactive, |
475 | 516 ;; for the sake of completion of names like eval-region, eval-current-buffer. |
19514
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
517 (defun eval-expression (eval-expression-arg |
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
518 &optional eval-expression-insert-value) |
475 | 519 "Evaluate EXPRESSION and print value in minibuffer. |
954
9e51bb887797
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
921
diff
changeset
|
520 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
|
521 (interactive |
5068
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
522 (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
|
523 nil read-expression-map t |
19514
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
524 'read-expression-history) |
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
525 current-prefix-arg)) |
17133
fbdff0d0de3d
(eval-expression): No longer disabled, since M-: isn't
Karl Heuer <kwzh@gnu.org>
parents:
16999
diff
changeset
|
526 (setq values (cons (eval eval-expression-arg) values)) |
19514
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
527 (prin1 (car values) |
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
528 (if eval-expression-insert-value (current-buffer) t))) |
475 | 529 |
530 (defun edit-and-eval-command (prompt command) | |
531 "Prompting with PROMPT, let user edit COMMAND and eval result. | |
532 COMMAND is a Lisp expression. Let user edit that expression in | |
533 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
|
534 (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
|
535 (prin1-to-string command) |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
536 read-expression-map t |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
537 '(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
|
538 ;; 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
|
539 ;; 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
|
540 (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
|
541 (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
|
542 |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
543 ;; 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
|
544 ;; 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
|
545 (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
|
546 (setq command-history (cons command command-history))) |
475 | 547 (eval command))) |
548 | |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
549 (defun repeat-complex-command (arg) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
550 "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
|
551 A complex command is one which used the minibuffer. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
552 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
|
553 The result is executed, repeating the command as changed. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
554 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
|
555 it is added to the front of the command history. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
556 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
|
557 to get different commands to edit and resubmit." |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
558 (interactive "p") |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
559 (let ((elt (nth (1- arg) command-history)) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
560 newcmd) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
561 (if elt |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
562 (progn |
4821
2c16f99ef5dc
(edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents:
4765
diff
changeset
|
563 (setq newcmd |
16803
3d4a27ecfba9
(repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents:
16723
diff
changeset
|
564 (let ((print-level nil) |
3d4a27ecfba9
(repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents:
16723
diff
changeset
|
565 (minibuffer-history-position arg) |
3d4a27ecfba9
(repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents:
16723
diff
changeset
|
566 (minibuffer-history-sexp-flag t)) |
8734
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
567 (read-from-minibuffer |
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
568 "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
|
569 (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
|
570 |
5135
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
571 ;; 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
|
572 ;; 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
|
573 (if (stringp (car command-history)) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
574 (setq command-history (cdr command-history))) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
575 |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
576 ;; 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
|
577 ;; add it to the history. |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
578 (or (equal newcmd (car command-history)) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
579 (setq command-history (cons newcmd command-history))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
580 (eval newcmd)) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
581 (ding)))) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
582 |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
583 (defvar minibuffer-history nil |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
584 "Default minibuffer history list. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
585 This is used for all minibuffer input |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
586 except when an alternate history list is specified.") |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
587 (defvar minibuffer-history-sexp-flag nil |
7373
451602bf12e4
(minibuffer-history-sexp-flag): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
7333
diff
changeset
|
588 "Non-nil when doing history operations on `command-history'. |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
589 More generally, indicates that the history list being acted on |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
590 contains expressions rather than strings.") |
862
46630543d659
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
859
diff
changeset
|
591 (setq minibuffer-history-variable 'minibuffer-history) |
46630543d659
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
859
diff
changeset
|
592 (setq minibuffer-history-position nil) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
593 (defvar minibuffer-history-search-history nil) |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
594 |
921 | 595 (mapcar |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
596 (lambda (key-and-command) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
597 (mapcar |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
598 (lambda (keymap-and-completionp) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
599 ;; Arg is (KEYMAP-SYMBOL . COMPLETION-MAP-P). |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
600 ;; 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
|
601 ;; 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
|
602 (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
|
603 (car key-and-command) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
604 (let ((command (cdr key-and-command))) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
605 (if (consp command) |
1826
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
606 ;; (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
|
607 ;; 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
|
608 ;; 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
|
609 (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
|
610 (progn (error "EMACS BUG!") (cdr command)) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
611 (car command)) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
612 command)))) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
613 '((minibuffer-local-map . nil) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
614 (minibuffer-local-ns-map . nil) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
615 (minibuffer-local-completion-map . t) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
616 (minibuffer-local-must-match-map . t) |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
617 (read-expression-map . nil)))) |
1838
34da3c151be4
Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents:
1837
diff
changeset
|
618 '(("\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
|
619 ([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
|
620 ("\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
|
621 ([prior] . (previous-history-element . previous-complete-history-element)) |
921 | 622 ("\er" . previous-matching-history-element) |
623 ("\es" . next-matching-history-element))) | |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
624 |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
625 (defvar minibuffer-text-before-history nil |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
626 "Text that was in this minibuffer before any history commands. |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
627 This is nil if there have not yet been any history commands |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
628 in this use of the minibuffer.") |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
629 |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
630 (add-hook 'minibuffer-setup-hook 'minibuffer-history-initialize) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
631 |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
632 (defun minibuffer-history-initialize () |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
633 (setq minibuffer-text-before-history nil)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
634 |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
635 (defun previous-matching-history-element (regexp n) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
636 "Find the previous history element that matches REGEXP. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
637 \(Previous history elements refer to earlier actions.) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
638 With prefix argument N, search for Nth previous match. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
639 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
|
640 (interactive |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
641 (let* ((enable-recursive-minibuffers t) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
642 (minibuffer-history-sexp-flag nil) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
643 (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
|
644 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
645 minibuffer-local-map |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
646 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
647 'minibuffer-history-search-history))) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
648 ;; 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
|
649 (list (if (string= regexp "") |
11961
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
650 (if minibuffer-history-search-history |
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
651 (car minibuffer-history-search-history) |
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
652 (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
|
653 regexp) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
654 (prefix-numeric-value current-prefix-arg)))) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
655 (if (and (zerop minibuffer-history-position) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
656 (null minibuffer-text-before-history)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
657 (setq minibuffer-text-before-history (buffer-string))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
658 (let ((history (symbol-value minibuffer-history-variable)) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
659 prevpos |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
660 (pos minibuffer-history-position)) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
661 (while (/= n 0) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
662 (setq prevpos pos) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
663 (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
|
664 (if (= pos prevpos) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
665 (error (if (= pos 1) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
666 "No later matching history item" |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
667 "No earlier matching history item"))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
668 (if (string-match regexp |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
669 (if minibuffer-history-sexp-flag |
8734
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
670 (let ((print-level nil)) |
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
671 (prin1-to-string (nth (1- pos) history))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
672 (nth (1- pos) history))) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
673 (setq n (+ n (if (< n 0) 1 -1))))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
674 (setq minibuffer-history-position pos) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
675 (erase-buffer) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
676 (let ((elt (nth (1- pos) history))) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
677 (insert (if minibuffer-history-sexp-flag |
8734
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
678 (let ((print-level nil)) |
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
679 (prin1-to-string elt)) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
680 elt))) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
681 (goto-char (point-min))) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
682 (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
|
683 (eq (car (car command-history)) 'next-matching-history-element)) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
684 (setq command-history (cdr command-history)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
685 |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
686 (defun next-matching-history-element (regexp n) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
687 "Find the next history element that matches REGEXP. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
688 \(The next history element refers to a more recent action.) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
689 With prefix argument N, search for Nth next match. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
690 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
|
691 (interactive |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
692 (let* ((enable-recursive-minibuffers t) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
693 (minibuffer-history-sexp-flag nil) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
694 (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
|
695 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
696 minibuffer-local-map |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
697 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
698 'minibuffer-history-search-history))) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
699 ;; 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
|
700 (list (if (string= regexp "") |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
701 (setcar minibuffer-history-search-history |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
702 (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
|
703 regexp) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
704 (prefix-numeric-value current-prefix-arg)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
705 (previous-matching-history-element regexp (- n))) |
475 | 706 |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
707 (defun next-history-element (n) |
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
708 "Insert the next element of the minibuffer history into the minibuffer." |
475 | 709 (interactive "p") |
10722
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
710 (or (zerop n) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
711 (let ((narg (- minibuffer-history-position n)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
712 (minimum (if minibuffer-default -1 0)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
713 elt) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
714 (if (and (zerop minibuffer-history-position) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
715 (null minibuffer-text-before-history)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
716 (setq minibuffer-text-before-history (buffer-string))) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
717 (if (< narg minimum) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
718 (error "End of history; no next item")) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
719 (if (> narg (length (symbol-value minibuffer-history-variable))) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
720 (error "Beginning of history; no preceding item")) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
721 (erase-buffer) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
722 (setq minibuffer-history-position narg) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
723 (cond ((= narg -1) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
724 (setq elt minibuffer-default)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
725 ((= narg 0) |
19888
45a077538366
(next-history-element):
Richard M. Stallman <rms@gnu.org>
parents:
19514
diff
changeset
|
726 (setq elt (or minibuffer-text-before-history "")) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
727 (setq minibuffer-text-before-history nil)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
728 (t (setq elt (nth (1- minibuffer-history-position) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
729 (symbol-value minibuffer-history-variable))))) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
730 (insert |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
731 (if minibuffer-history-sexp-flag |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
732 (let ((print-level nil)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
733 (prin1-to-string elt)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
734 elt)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
735 (goto-char (point-min))))) |
475 | 736 |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
737 (defun previous-history-element (n) |
1145 | 738 "Inserts the previous element of the minibuffer history into the minibuffer." |
475 | 739 (interactive "p") |
859
5f325fbc093d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
858
diff
changeset
|
740 (next-history-element (- n))) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
741 |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
742 (defun next-complete-history-element (n) |
5324
f091cdec77e2
(next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5151
diff
changeset
|
743 "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
|
744 (interactive "p") |
1826
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
745 (let ((point-at-start (point))) |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
746 (next-matching-history-element |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
747 (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
|
748 ;; 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
|
749 ;; 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
|
750 ;; 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
|
751 (goto-char point-at-start))) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
752 |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
753 (defun previous-complete-history-element (n) |
5324
f091cdec77e2
(next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5151
diff
changeset
|
754 "\ |
f091cdec77e2
(next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5151
diff
changeset
|
755 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
|
756 (interactive "p") |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
757 (next-complete-history-element (- n))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
758 |
475 | 759 (defun goto-line (arg) |
760 "Goto line ARG, counting from line 1 at beginning of buffer." | |
761 (interactive "NGoto line: ") | |
9343
ee9866892683
(goto-line): Call prefix-numeric-value.
Richard M. Stallman <rms@gnu.org>
parents:
9065
diff
changeset
|
762 (setq arg (prefix-numeric-value arg)) |
475 | 763 (save-restriction |
764 (widen) | |
765 (goto-char 1) | |
766 (if (eq selective-display t) | |
767 (re-search-forward "[\n\C-m]" nil 'end (1- arg)) | |
768 (forward-line (1- arg))))) | |
769 | |
770 ;Put this on C-x u, so we can force that rather than C-_ into startup msg | |
16436
d2acc84badf4
Use defalias not define-function.
Richard M. Stallman <rms@gnu.org>
parents:
16417
diff
changeset
|
771 (defalias 'advertised-undo 'undo) |
475 | 772 |
773 (defun undo (&optional arg) | |
774 "Undo some previous changes. | |
775 Repeat this command to undo more changes. | |
776 A numeric argument serves as a repeat count." | |
777 (interactive "*p") | |
5935
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
778 ;; 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
|
779 ;; for the following command. |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
780 (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
|
781 (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
|
782 (recent-save (recent-auto-save-p))) |
582 | 783 (or (eq (selected-window) (minibuffer-window)) |
784 (message "Undo!")) | |
475 | 785 (or (eq last-command 'undo) |
786 (progn (undo-start) | |
787 (undo-more 1))) | |
788 (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
|
789 ;; 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
|
790 ;; 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
|
791 (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
|
792 done) |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
793 (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
|
794 (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
|
795 (progn |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
796 (setq done t) |
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
797 (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
|
798 (setq tail (cdr tail)))) |
475 | 799 (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
|
800 (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
|
801 ;; 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
|
802 (setq this-command 'undo)) |
475 | 803 |
2947
518509536741
(pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents:
2935
diff
changeset
|
804 (defvar pending-undo-list nil |
518509536741
(pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents:
2935
diff
changeset
|
805 "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
|
806 |
475 | 807 (defun undo-start () |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
808 "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
|
809 The next call to `undo-more' will undo the most recently made change." |
475 | 810 (if (eq buffer-undo-list t) |
811 (error "No undo information in this buffer")) | |
812 (setq pending-undo-list buffer-undo-list)) | |
813 | |
814 (defun undo-more (count) | |
815 "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
|
816 Call `undo-start' to get ready to undo recent changes, |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
817 then call `undo-more' one or more times to undo them." |
475 | 818 (or pending-undo-list |
819 (error "No further undo information")) | |
820 (setq pending-undo-list (primitive-undo count pending-undo-list))) | |
821 | |
4374
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
822 (defvar shell-command-history nil |
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
823 "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
|
824 |
9779
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
825 (defvar shell-command-switch "-c" |
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
826 "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
|
827 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
828 (defun shell-command (command &optional output-buffer) |
475 | 829 "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
|
830 |
475 | 831 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
|
832 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
|
833 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
|
834 |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
835 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
|
836 buffer `*Shell Command Output*'. |
11072
c5fbb6f272f2
(shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents:
11036
diff
changeset
|
837 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
|
838 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
|
839 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
|
840 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
|
841 then `*Shell Command Output*' is deleted. |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
842 |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
843 To specify a coding system for converting non-ASCII characters |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
844 in the shell command output, use \\[universal-coding-system-argument] |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
845 before this command. |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
846 |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
847 Noninteractive callers can specify coding systems by binding |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
848 `coding-system-for-read' and `coding-system-for-write'. |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
849 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
850 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
|
851 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
|
852 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
|
853 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
|
854 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
|
855 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
|
856 (interactive (list (read-from-minibuffer "Shell command: " |
b0a70d8d9af4
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
4477
diff
changeset
|
857 nil nil nil 'shell-command-history) |
b0a70d8d9af4
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
4477
diff
changeset
|
858 current-prefix-arg)) |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
859 ;; Look for a handler in case default-directory is a remote file name. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
860 (let ((handler |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
861 (find-file-name-handler (directory-file-name default-directory) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
862 'shell-command))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
863 (if handler |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
864 (funcall handler 'shell-command command output-buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
865 (if (and output-buffer |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
866 (not (or (bufferp output-buffer) (stringp output-buffer)))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
867 (progn (barf-if-buffer-read-only) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
868 (push-mark) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
869 ;; We do not use -f for csh; we will not support broken use of |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
870 ;; .cshrcs. Even the BSD csh manual says to use |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
871 ;; "if ($?prompt) exit" before things which are not useful |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
872 ;; non-interactively. Besides, if someone wants their other |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
873 ;; aliases for shell commands then they can still have them. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
874 (call-process shell-file-name nil t nil |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
875 shell-command-switch command) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
876 ;; This is like exchange-point-and-mark, but doesn't |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
877 ;; activate the mark. It is cleaner to avoid activation, |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
878 ;; even though the command loop would deactivate the mark |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
879 ;; because we inserted text. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
880 (goto-char (prog1 (mark t) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
881 (set-marker (mark-marker) (point) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
882 (current-buffer))))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
883 ;; Preserve the match data in case called from a program. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
884 (save-match-data |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
885 (if (string-match "[ \t]*&[ \t]*$" command) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
886 ;; Command ending with ampersand means asynchronous. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
887 (let ((buffer (get-buffer-create |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
888 (or output-buffer "*Async Shell Command*"))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
889 (directory default-directory) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
890 proc) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
891 ;; Remove the ampersand. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
892 (setq command (substring command 0 (match-beginning 0))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
893 ;; If will kill a process, query first. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
894 (setq proc (get-buffer-process buffer)) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
895 (if proc |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
896 (if (yes-or-no-p "A command is running. Kill it? ") |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
897 (kill-process proc) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
898 (error "Shell command in progress"))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
899 (save-excursion |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
900 (set-buffer buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
901 (setq buffer-read-only nil) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
902 (erase-buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
903 (display-buffer buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
904 (setq default-directory directory) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
905 (setq proc (start-process "Shell" buffer shell-file-name |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
906 shell-command-switch command)) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
907 (setq mode-line-process '(":%s")) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
908 (require 'shell) (shell-mode) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
909 (set-process-sentinel proc 'shell-command-sentinel) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
910 )) |
15876
d814bc72503f
(shell-command): Really use output-buffer in synchronous
Richard M. Stallman <rms@gnu.org>
parents:
15836
diff
changeset
|
911 (shell-command-on-region (point) (point) command output-buffer) |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
912 )))))) |
475 | 913 |
914 ;; We have a sentinel to prevent insertion of a termination message | |
915 ;; in the buffer itself. | |
916 (defun shell-command-sentinel (process signal) | |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
917 (if (memq (process-status process) '(exit signal)) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
918 (message "%s: %s." |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
919 (car (cdr (cdr (process-command process)))) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
920 (substring signal 0 -1)))) |
475 | 921 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
922 (defun shell-command-on-region (start end command |
19362
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
923 &optional output-buffer replace |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
924 error-buffer) |
475 | 925 "Execute string COMMAND in inferior shell with region as input. |
926 Normally display output (if any) in temp buffer `*Shell Command Output*'; | |
927 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
|
928 |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
929 To specify a coding system for converting non-ASCII characters |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
930 in the input and output to the shell command, use \\[universal-coding-system-argument] |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
931 before this command. By default, the input (from the current buffer) |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
932 is encoded in the same coding system that will be used to save the file, |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
933 `buffer-file-coding-system'. If the output is going to replace the region, |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
934 then it is decoded from that same coding system. |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
935 |
19362
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
936 The noninteractive arguments are START, END, COMMAND, OUTPUT-BUFFER, REPLACE, |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
937 ERROR-BUFFER. 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
|
938 in place of text from START to END, putting point and mark around it. |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
939 Noninteractive callers can specify coding systems by binding |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
940 `coding-system-for-read' and `coding-system-for-write'. |
475 | 941 |
942 If the output is one line, it is displayed in the echo area, | |
943 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
|
944 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
|
945 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
|
946 then `*Shell Command Output*' is deleted. |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
947 |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
948 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
|
949 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
|
950 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
|
951 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
|
952 insert output in the current buffer. |
19362
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
953 In either case, the output is inserted after point (leaving mark after it). |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
954 |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
955 If optional fifth argument ERROR-BUFFER is non-nil, it is a buffer |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
956 or buffer name to which to direct the command's standard error output. |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
957 If it is nil, error output is mingled with regular output." |
10805
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
958 (interactive (let ((string |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
959 ;; 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
|
960 ;; 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
|
961 ;; 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
|
962 (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
|
963 nil nil nil |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
964 'shell-command-history))) |
13482
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
965 ;; call-interactively recognizes region-beginning and |
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
966 ;; 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
|
967 (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
|
968 string |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
969 current-prefix-arg |
10912
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
970 current-prefix-arg))) |
19362
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
971 (let ((error-file |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
972 (if error-buffer |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
973 (concat (file-name-directory temp-file-name-pattern) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
974 (make-temp-name "scor")) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
975 nil))) |
10912
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
976 (if (or replace |
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
977 (and output-buffer |
13810
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
978 (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
|
979 (equal (buffer-name (current-buffer)) "*Shell Command Output*")) |
475 | 980 ;; 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
|
981 (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
|
982 ;; 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
|
983 (goto-char start) |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
984 (and replace (push-mark)) |
19362
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
985 (call-process-region start end shell-file-name t |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
986 (if error-file |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
987 (list t error-file) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
988 t) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
989 nil shell-command-switch command) |
8604
7fff44ad20c9
(shell-command-on-region): Don't delete current buffer.
Karl Heuer <kwzh@gnu.org>
parents:
8600
diff
changeset
|
990 (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
|
991 (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
|
992 (kill-buffer shell-buffer))) |
10912
be434b59c22e
(shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents:
10863
diff
changeset
|
993 ;; 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
|
994 (and replace swap (exchange-point-and-mark))) |
475 | 995 ;; No prefix argument: put the output in a temp buffer, |
996 ;; replacing its entire contents. | |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
997 (let ((buffer (get-buffer-create |
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
998 (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
|
999 (success nil)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1000 (unwind-protect |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1001 (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
|
1002 ;; 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
|
1003 ;; 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
|
1004 ;; 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
|
1005 (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
|
1006 (delete-region (max start end) (point-max)) |
15115
dd31d59ec31b
(shell-command-on-region): Start of region to keep is
Karl Heuer <kwzh@gnu.org>
parents:
14835
diff
changeset
|
1007 (delete-region (point-min) (min start end)) |
5635
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1008 (call-process-region (point-min) (point-max) |
19362
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1009 shell-file-name t |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1010 (if error-file |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1011 (list t error-file) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1012 t) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1013 nil 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
|
1014 (setq success t)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1015 ;; 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
|
1016 (save-excursion |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1017 (set-buffer buffer) |
9065
e321617e3fc6
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
8998
diff
changeset
|
1018 (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
|
1019 (erase-buffer)) |
19362
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1020 (call-process-region start end shell-file-name nil |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1021 (if error-file |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1022 (list buffer error-file) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1023 buffer) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1024 nil 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
|
1025 (setq success t)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1026 ;; 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
|
1027 (let ((lines (save-excursion |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1028 (set-buffer buffer) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1029 (if (= (buffer-size) 0) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1030 0 |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1031 (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
|
1032 (cond ((= lines 0) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1033 (if success |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1034 (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
|
1035 (kill-buffer buffer)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1036 ((and success (= lines 1)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1037 (message "%s" |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1038 (save-excursion |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1039 (set-buffer buffer) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1040 (goto-char (point-min)) |
82a127d7ef7d
(shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents:
5564
diff
changeset
|
1041 (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
|
1042 (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
|
1043 (t |
15305
29ba4949d3d5
(shell-command-on-region): In output buffer, display
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
1044 (save-excursion |
29ba4949d3d5
(shell-command-on-region): In output buffer, display
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
1045 (set-buffer buffer) |
29ba4949d3d5
(shell-command-on-region): In output buffer, display
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
1046 (goto-char (point-min))) |
19362
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1047 (display-buffer buffer))))))) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1048 (if (and error-file (file-exists-p error-file)) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1049 (save-excursion |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1050 (set-buffer (get-buffer-create error-buffer)) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1051 ;; Do no formatting while reading error file, for fear of looping. |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1052 (format-insert-file error-file nil) |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1053 (delete-file error-file))))) |
16312
20690a1ec100
(shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16018
diff
changeset
|
1054 |
20690a1ec100
(shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16018
diff
changeset
|
1055 (defun shell-command-to-string (command) |
20690a1ec100
(shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16018
diff
changeset
|
1056 "Execute shell command COMMAND and return its output as a string." |
20690a1ec100
(shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16018
diff
changeset
|
1057 (with-output-to-string |
16316
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
1058 (with-current-buffer |
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
1059 standard-output |
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
1060 (call-process shell-file-name nil t nil shell-command-switch command)))) |
475 | 1061 |
16685
26919ad3a4ad
Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16632
diff
changeset
|
1062 (defvar universal-argument-map |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1063 (let ((map (make-sparse-keymap))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1064 (define-key map [t] 'universal-argument-other-key) |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
1065 (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
|
1066 (define-key map [switch-frame] nil) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1067 (define-key map [?\C-u] 'universal-argument-more) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1068 (define-key map [?-] 'universal-argument-minus) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1069 (define-key map [?0] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1070 (define-key map [?1] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1071 (define-key map [?2] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1072 (define-key map [?3] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1073 (define-key map [?4] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1074 (define-key map [?5] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1075 (define-key map [?6] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1076 (define-key map [?7] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1077 (define-key map [?8] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1078 (define-key map [?9] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1079 map) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1080 "Keymap used while processing \\[universal-argument].") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1081 |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1082 (defvar universal-argument-num-events nil |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1083 "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
|
1084 `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
|
1085 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
|
1086 |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1087 (defun universal-argument () |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1088 "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
|
1089 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
|
1090 \\[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
|
1091 \\[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
|
1092 Repeating \\[universal-argument] without digits or minus sign |
16408
87f15c601f5a
(line-move): Ignore invisibility in `move-to-column'.
Richard M. Stallman <rms@gnu.org>
parents:
16316
diff
changeset
|
1093 multiplies the argument by 4 each time. |
87f15c601f5a
(line-move): Ignore invisibility in `move-to-column'.
Richard M. Stallman <rms@gnu.org>
parents:
16316
diff
changeset
|
1094 For some commands, just \\[universal-argument] by itself serves as a flag |
16445
c5ec4ef6203c
(universal-argument): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16436
diff
changeset
|
1095 which is different in effect from any particular numeric argument. |
c5ec4ef6203c
(universal-argument): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16436
diff
changeset
|
1096 These commands include \\[set-mark-command] and \\[start-kbd-macro]." |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1097 (interactive) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1098 (setq prefix-arg (list 4)) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1099 (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
|
1100 (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
|
1101 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1102 ;; 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
|
1103 ;; 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
|
1104 (defun universal-argument-more (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1105 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1106 (if (consp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1107 (setq prefix-arg (list (* 4 (car arg)))) |
17214
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
1108 (if (eq arg '-) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
1109 (setq prefix-arg (list -4)) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
1110 (setq prefix-arg arg) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
1111 (setq overriding-terminal-local-map nil))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1112 (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
|
1113 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1114 (defun negative-argument (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1115 "Begin a negative numeric argument for the next command. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1116 \\[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
|
1117 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1118 (cond ((integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1119 (setq prefix-arg (- arg))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1120 ((eq arg '-) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1121 (setq prefix-arg nil)) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1122 (t |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
1123 (setq prefix-arg '-))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1124 (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
|
1125 (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
|
1126 |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1127 (defun digit-argument (arg) |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1128 "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
|
1129 \\[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
|
1130 (interactive "P") |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1131 (let ((digit (- (logand last-command-char ?\177) ?0))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1132 (cond ((integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1133 (setq prefix-arg (+ (* arg 10) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1134 (if (< arg 0) (- digit) digit)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1135 ((eq arg '-) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1136 ;; Treat -0 as just -, so that -01 will work. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1137 (setq prefix-arg (if (zerop digit) '- (- digit)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1138 (t |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
1139 (setq prefix-arg digit)))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1140 (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
|
1141 (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
|
1142 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1143 ;; 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
|
1144 ;; command if digits have already been entered. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1145 (defun universal-argument-minus (arg) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1146 (interactive "P") |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1147 (if (integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1148 (universal-argument-other-key arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1149 (negative-argument arg))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1150 |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1151 ;; 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
|
1152 ;; executed as a command. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1153 (defun universal-argument-other-key (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1154 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1155 (setq prefix-arg arg) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1156 (let* ((key (this-command-keys)) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1157 (keylist (listify-key-sequence key))) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1158 (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
|
1159 (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
|
1160 unread-command-events))) |
12320
979836b1a1a9
(universal-argument-other-key): Call reset-this-command-lengths.
Richard M. Stallman <rms@gnu.org>
parents:
12313
diff
changeset
|
1161 (reset-this-command-lengths) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1162 (setq overriding-terminal-local-map nil)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1163 |
475 | 1164 (defun forward-to-indentation (arg) |
1165 "Move forward ARG lines and position at first nonblank character." | |
1166 (interactive "p") | |
1167 (forward-line arg) | |
1168 (skip-chars-forward " \t")) | |
1169 | |
1170 (defun backward-to-indentation (arg) | |
1171 "Move backward ARG lines and position at first nonblank character." | |
1172 (interactive "p") | |
1173 (forward-line (- arg)) | |
1174 (skip-chars-forward " \t")) | |
1175 | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1176 (defcustom kill-whole-line nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1177 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1178 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1179 :group 'killing) |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1180 |
475 | 1181 (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
|
1182 "Kill the rest of the current line; if no nonblanks there, kill thru newline. |
475 | 1183 With prefix argument, kill that many lines from point. |
1184 Negative arguments kill lines backward. | |
1185 | |
1186 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
|
1187 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
|
1188 |
18593
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1189 To kill a whole line, when point is not at the beginning, type \ |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1190 \\[beginning-of-line] \\[kill-line] \\[kill-line]. |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1191 |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1192 If `kill-whole-line' is non-nil, then this command kills the whole line |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1193 including its terminating newline, when used at the beginning of a line |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1194 with no argument. As a consequence, you can always kill a whole line |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1195 by typing \\[beginning-of-line] \\[kill-line]." |
475 | 1196 (interactive "P") |
1197 (kill-region (point) | |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1198 ;; 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
|
1199 ;; 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
|
1200 ;; 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
|
1201 ;; 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
|
1202 ;; 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
|
1203 (progn |
475 | 1204 (if arg |
17713
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1205 (forward-visible-line (prefix-numeric-value arg)) |
475 | 1206 (if (eobp) |
1207 (signal 'end-of-buffer nil)) | |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1208 (if (or (looking-at "[ \t]*$") (and kill-whole-line (bolp))) |
17713
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1209 (forward-visible-line 1) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1210 (end-of-visible-line))) |
475 | 1211 (point)))) |
17713
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1212 |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1213 (defun forward-visible-line (arg) |
18498
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1214 "Move forward by ARG lines, ignoring currently invisible newlines only. |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1215 If ARG is negative, move backward -ARG lines. |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1216 If ARG is zero, move to the beginning of the current line." |
17713
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1217 (condition-case nil |
18731
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1218 (if (> arg 0) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1219 (while (> arg 0) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1220 (or (zerop (forward-line 1)) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1221 (signal 'end-of-buffer nil)) |
18498
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1222 ;; If the following character is currently invisible, |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1223 ;; skip all characters with that same `invisible' property value, |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1224 ;; then find the next newline. |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1225 (while (and (not (eobp)) |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1226 (let ((prop |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1227 (get-char-property (point) 'invisible))) |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1228 (if (eq buffer-invisibility-spec t) |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1229 prop |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1230 (or (memq prop buffer-invisibility-spec) |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1231 (assq prop buffer-invisibility-spec))))) |
19326
14681d10a973
(forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents:
19227
diff
changeset
|
1232 (goto-char |
14681d10a973
(forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents:
19227
diff
changeset
|
1233 (if (get-text-property (point) 'invisible) |
14681d10a973
(forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents:
19227
diff
changeset
|
1234 (or (next-single-property-change (point) 'invisible) |
14681d10a973
(forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents:
19227
diff
changeset
|
1235 (point-max)) |
14681d10a973
(forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents:
19227
diff
changeset
|
1236 (next-overlay-change (point)))) |
18498
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1237 (or (zerop (forward-line 1)) |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1238 (signal 'end-of-buffer nil))) |
78a8721a690c
(forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents:
18379
diff
changeset
|
1239 (setq arg (1- arg))) |
18731
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1240 (let ((first t)) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1241 (while (or first (< arg 0)) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1242 (if (zerop arg) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1243 (beginning-of-line) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1244 (or (zerop (forward-line -1)) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1245 (signal 'beginning-of-buffer nil))) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1246 (while (and (not (bobp)) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1247 (let ((prop |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1248 (get-char-property (1- (point)) 'invisible))) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1249 (if (eq buffer-invisibility-spec t) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1250 prop |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1251 (or (memq prop buffer-invisibility-spec) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1252 (assq prop buffer-invisibility-spec))))) |
19326
14681d10a973
(forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents:
19227
diff
changeset
|
1253 (goto-char |
14681d10a973
(forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents:
19227
diff
changeset
|
1254 (if (get-text-property (1- (point)) 'invisible) |
14681d10a973
(forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents:
19227
diff
changeset
|
1255 (or (previous-single-property-change (point) 'invisible) |
14681d10a973
(forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents:
19227
diff
changeset
|
1256 (point-min)) |
14681d10a973
(forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents:
19227
diff
changeset
|
1257 (previous-overlay-change (point)))) |
18731
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1258 (or (zerop (forward-line -1)) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1259 (signal 'beginning-of-buffer nil))) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1260 (setq first nil) |
2b3632471f92
(forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents:
18629
diff
changeset
|
1261 (setq arg (1+ arg))))) |
17713
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1262 ((beginning-of-buffer end-of-buffer) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1263 nil))) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1264 |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1265 (defun end-of-visible-line () |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1266 "Move to end of current visible line." |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1267 (end-of-line) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1268 ;; If the following character is currently invisible, |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1269 ;; skip all characters with that same `invisible' property value, |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1270 ;; then find the next newline. |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1271 (while (and (not (eobp)) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1272 (let ((prop |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1273 (get-char-property (point) 'invisible))) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1274 (if (eq buffer-invisibility-spec t) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1275 prop |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1276 (or (memq prop buffer-invisibility-spec) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1277 (assq prop buffer-invisibility-spec))))) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1278 (if (get-text-property (point) 'invisible) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1279 (goto-char (next-single-property-change (point) 'invisible)) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1280 (goto-char (next-overlay-change (point)))) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1281 (forward-char 1) |
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
1282 (end-of-line))) |
475 | 1283 |
715 | 1284 ;;;; Window system cut and paste hooks. |
1285 | |
1286 (defvar interprogram-cut-function nil | |
1287 "Function to call to make a killed region available to other programs. | |
1288 | |
1289 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
|
1290 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
|
1291 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
|
1292 is put in the kill ring, to make the new kill available to other |
715 | 1293 programs. |
1294 | |
3034
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1295 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
|
1296 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
|
1297 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
|
1298 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
|
1299 nil means appending to an \"old\" kill.") |
715 | 1300 |
1301 (defvar interprogram-paste-function nil | |
1302 "Function to call to get text cut from other programs. | |
1303 | |
1304 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
|
1305 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
|
1306 This variable holds a function that Emacs calls to obtain |
715 | 1307 text that other programs have provided for pasting. |
1308 | |
1309 The function should be called with no arguments. If the function | |
1310 returns nil, then no other program has provided such text, and the top | |
1311 of the Emacs kill ring should be used. If the function returns a | |
727 | 1312 string, that string should be put in the kill ring as the latest kill. |
1313 | |
1314 Note that the function should return a string only if a program other | |
1315 than Emacs has provided a string for pasting; if Emacs provided the | |
1316 most recent string, the function should return nil. If it is | |
1317 difficult to tell whether Emacs or some other program provided the | |
1318 current string, it is probably good enough to return nil if the string | |
1319 is equal (according to `string=') to the last text Emacs provided.") | |
715 | 1320 |
1321 | |
1322 | |
1323 ;;;; The kill ring data structure. | |
475 | 1324 |
1325 (defvar kill-ring nil | |
715 | 1326 "List of killed text sequences. |
1327 Since the kill ring is supposed to interact nicely with cut-and-paste | |
1328 facilities offered by window systems, use of this variable should | |
1329 interact nicely with `interprogram-cut-function' and | |
1330 `interprogram-paste-function'. The functions `kill-new', | |
1331 `kill-append', and `current-kill' are supposed to implement this | |
1332 interaction; you may want to use them instead of manipulating the kill | |
1333 ring directly.") | |
475 | 1334 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1335 (defcustom kill-ring-max 30 |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1336 "*Maximum length of kill ring before oldest elements are thrown away." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1337 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1338 :group 'killing) |
475 | 1339 |
1340 (defvar kill-ring-yank-pointer nil | |
1341 "The tail of the kill ring whose car is the last thing yanked.") | |
1342 | |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1343 (defun kill-new (string &optional replace) |
715 | 1344 "Make STRING the latest kill in the kill ring. |
1345 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
|
1346 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
|
1347 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
|
1348 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
|
1349 (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
|
1350 (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
|
1351 (if replace |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1352 (setcar kill-ring string) |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1353 (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
|
1354 (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
|
1355 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))) |
715 | 1356 (setq kill-ring-yank-pointer kill-ring) |
1357 (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
|
1358 (funcall interprogram-cut-function string (not replace)))) |
715 | 1359 |
475 | 1360 (defun kill-append (string before-p) |
715 | 1361 "Append STRING to the end of the latest kill in the kill ring. |
1362 If BEFORE-P is non-nil, prepend STRING to the kill. | |
1760 | 1363 If `interprogram-cut-function' is set, pass the resulting kill to |
715 | 1364 it." |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1365 (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
|
1366 (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
|
1367 (concat (car kill-ring) string)) t)) |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
1368 |
715 | 1369 (defun current-kill (n &optional do-not-move) |
1370 "Rotate the yanking point by N places, and then return that kill. | |
1371 If N is zero, `interprogram-paste-function' is set, and calling it | |
1372 returns a string, then that string is added to the front of the | |
1373 kill ring and returned as the latest kill. | |
1374 If optional arg DO-NOT-MOVE is non-nil, then don't actually move the | |
1375 yanking point; just return the Nth kill forward." | |
1376 (let ((interprogram-paste (and (= n 0) | |
1377 interprogram-paste-function | |
1378 (funcall interprogram-paste-function)))) | |
1379 (if interprogram-paste | |
1380 (progn | |
1381 ;; Disable the interprogram cut function when we add the new | |
1382 ;; text to the kill ring, so Emacs doesn't try to own the | |
1383 ;; selection, with identical text. | |
1384 (let ((interprogram-cut-function nil)) | |
1385 (kill-new interprogram-paste)) | |
1386 interprogram-paste) | |
1387 (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
|
1388 (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
|
1389 (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
|
1390 (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
|
1391 kill-ring))) |
715 | 1392 (or do-not-move |
1393 (setq kill-ring-yank-pointer ARGth-kill-element)) | |
1394 (car ARGth-kill-element))))) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
1395 |
715 | 1396 |
1397 | |
1398 ;;;; Commands for manipulating the kill ring. | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
1399 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1400 (defcustom kill-read-only-ok nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1401 "*Non-nil means don't signal an error for killing read-only text." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1402 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1403 :group 'killing) |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1404 |
14507
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1405 (put 'text-read-only 'error-conditions |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1406 '(text-read-only buffer-read-only error)) |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1407 (put 'text-read-only 'error-message "Text is read-only") |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1408 |
475 | 1409 (defun kill-region (beg end) |
1410 "Kill between point and mark. | |
1411 The text is deleted but saved in the kill ring. | |
1412 The command \\[yank] can retrieve it from there. | |
1413 \(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
|
1414 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
|
1415 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
|
1416 you can use the killing commands to copy text from a read-only buffer. |
475 | 1417 |
1418 This is the primitive for programs to kill text (as opposed to deleting it). | |
1419 Supply two arguments, character numbers indicating the stretch of text | |
1420 to be killed. | |
1421 Any command that calls this function is a \"kill command\". | |
1422 If the previous command was also a kill command, | |
1423 the text killed this time appends to the text killed last time | |
1424 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
|
1425 (interactive "r") |
715 | 1426 (cond |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1427 |
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1428 ;; 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
|
1429 ;; 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
|
1430 ;; the region's text in the kill ring, anyway. |
15892
6a4227841dec
(kill-region): inhibit-read-only overrides text props too.
Richard M. Stallman <rms@gnu.org>
parents:
15876
diff
changeset
|
1431 ((and (not inhibit-read-only) |
6a4227841dec
(kill-region): inhibit-read-only overrides text props too.
Richard M. Stallman <rms@gnu.org>
parents:
15876
diff
changeset
|
1432 (or buffer-read-only |
6a4227841dec
(kill-region): inhibit-read-only overrides text props too.
Richard M. Stallman <rms@gnu.org>
parents:
15876
diff
changeset
|
1433 (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
|
1434 (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
|
1435 ;; 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
|
1436 (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
|
1437 (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
|
1438 (setq this-command 'kill-region) |
14507
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1439 ;; Signal an error if the buffer is read-only. |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1440 (barf-if-buffer-read-only) |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1441 ;; If the buffer isn't read-only, the text is. |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1442 (signal 'text-read-only (list (current-buffer))))) |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1443 |
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1444 ;; 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
|
1445 ;; ring to share the same string object. This code does that. |
715 | 1446 ((not (or (eq buffer-undo-list t) |
1447 (eq last-command 'kill-region) | |
10034
1c6132b72da9
(kill-region): Use = to compare positions.
Richard M. Stallman <rms@gnu.org>
parents:
10012
diff
changeset
|
1448 ;; 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
|
1449 (= beg end))) |
715 | 1450 ;; 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
|
1451 (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
|
1452 (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
|
1453 tail) |
715 | 1454 (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
|
1455 ;; 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
|
1456 ;; 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
|
1457 (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
|
1458 (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
|
1459 (setq tail (cdr tail))) |
715 | 1460 ;; Take the same string recorded for undo |
1461 ;; and put it in the kill-ring. | |
10012
4b936f4cad5c
(kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents:
9876
diff
changeset
|
1462 (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
|
1463 |
715 | 1464 (t |
475 | 1465 (copy-region-as-kill beg end) |
10012
4b936f4cad5c
(kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents:
9876
diff
changeset
|
1466 (delete-region beg end))) |
4b936f4cad5c
(kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents:
9876
diff
changeset
|
1467 (setq this-command 'kill-region)) |
475 | 1468 |
9876
75ecf866cfb8
Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents:
9870
diff
changeset
|
1469 ;; 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
|
1470 ;; 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
|
1471 ;; then corrects it with the intended C-w. |
475 | 1472 (defun copy-region-as-kill (beg end) |
1473 "Save the region as if killed, but don't kill it. | |
617 | 1474 If `interprogram-cut-function' is non-nil, also save the text for a window |
1475 system cut and paste." | |
475 | 1476 (interactive "r") |
1477 (if (eq last-command 'kill-region) | |
1478 (kill-append (buffer-substring beg end) (< end beg)) | |
715 | 1479 (kill-new (buffer-substring beg end))) |
475 | 1480 nil) |
1481 | |
1482 (defun kill-ring-save (beg end) | |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
1483 "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
|
1484 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
|
1485 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
|
1486 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
|
1487 system cut and paste." |
475 | 1488 (interactive "r") |
1489 (copy-region-as-kill beg end) | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
1490 (if (interactive-p) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1491 (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
|
1492 (opoint (point)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1493 ;; 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
|
1494 ;; 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
|
1495 (inhibit-quit t)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1496 (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
|
1497 (progn |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1498 ;; Swap point and mark. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1499 (set-marker (mark-marker) (point) (current-buffer)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1500 (goto-char other-end) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1501 (sit-for 1) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1502 ;; Swap back. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1503 (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
|
1504 (goto-char opoint) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1505 ;; If user quit, deactivate the mark |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1506 ;; 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
|
1507 (and quit-flag mark-active |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1508 (deactivate-mark))) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1509 (let* ((killed-text (current-kill 0)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1510 (message-len (min (length killed-text) 40))) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1511 (if (= (point) beg) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1512 ;; Don't say "killed"; that is misleading. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1513 (message "Saved text until \"%s\"" |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1514 (substring killed-text (- message-len))) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1515 (message "Saved text from \"%s\"" |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1516 (substring killed-text 0 message-len)))))))) |
475 | 1517 |
1518 (defun append-next-kill () | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1519 "Cause following command, if it kills, to append to previous kill." |
475 | 1520 (interactive) |
1521 (if (interactive-p) | |
1522 (progn | |
1523 (setq this-command 'kill-region) | |
1524 (message "If the next command is a kill, it will append")) | |
1525 (setq last-command 'kill-region))) | |
1526 | |
1527 (defun yank-pop (arg) | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1528 "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
|
1529 This command is allowed only immediately after a `yank' or a `yank-pop'. |
475 | 1530 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
|
1531 previously-killed text. `yank-pop' deletes that text and inserts in its |
475 | 1532 place a different stretch of killed text. |
1533 | |
1534 With no argument, the previous kill is inserted. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1535 With argument N, insert the Nth previous kill. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1536 If N is negative, this is a more recent kill. |
475 | 1537 |
1538 The sequence of kills wraps around, so that after the oldest one | |
1539 comes the newest one." | |
1540 (interactive "*p") | |
1541 (if (not (eq last-command 'yank)) | |
1542 (error "Previous command was not a yank")) | |
1543 (setq this-command 'yank) | |
14507
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1544 (let ((inhibit-read-only t) |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1545 (before (< (point) (mark t)))) |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1546 (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
|
1547 (set-marker (mark-marker) (point) (current-buffer)) |
18902
7ce2d04d5561
(yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents:
18825
diff
changeset
|
1548 (let ((opoint (point))) |
18820
ac2b130c513a
(yank, yank-pop): Clear out read-only prop.
Richard M. Stallman <rms@gnu.org>
parents:
18731
diff
changeset
|
1549 (insert (current-kill arg)) |
18902
7ce2d04d5561
(yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents:
18825
diff
changeset
|
1550 (let ((inhibit-read-only t)) |
7ce2d04d5561
(yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents:
18825
diff
changeset
|
1551 (remove-text-properties opoint (point) '(read-only nil)))) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1552 (if before |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1553 ;; 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
|
1554 ;; 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
|
1555 ;; 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
|
1556 (goto-char (prog1 (mark t) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1557 (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
|
1558 nil) |
475 | 1559 |
1560 (defun yank (&optional arg) | |
1561 "Reinsert the last stretch of killed text. | |
1562 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
|
1563 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
|
1564 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
|
1565 With argument N, reinsert the Nth most recently killed stretch of killed |
475 | 1566 text. |
1567 See also the command \\[yank-pop]." | |
1568 (interactive "*P") | |
5935
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
1569 ;; 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
|
1570 ;; for the following command. |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
1571 (setq this-command t) |
475 | 1572 (push-mark (point)) |
18902
7ce2d04d5561
(yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents:
18825
diff
changeset
|
1573 (let ((opoint (point))) |
18820
ac2b130c513a
(yank, yank-pop): Clear out read-only prop.
Richard M. Stallman <rms@gnu.org>
parents:
18731
diff
changeset
|
1574 (insert (current-kill (cond |
ac2b130c513a
(yank, yank-pop): Clear out read-only prop.
Richard M. Stallman <rms@gnu.org>
parents:
18731
diff
changeset
|
1575 ((listp arg) 0) |
ac2b130c513a
(yank, yank-pop): Clear out read-only prop.
Richard M. Stallman <rms@gnu.org>
parents:
18731
diff
changeset
|
1576 ((eq arg '-) -1) |
ac2b130c513a
(yank, yank-pop): Clear out read-only prop.
Richard M. Stallman <rms@gnu.org>
parents:
18731
diff
changeset
|
1577 (t (1- arg))))) |
18902
7ce2d04d5561
(yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents:
18825
diff
changeset
|
1578 (let ((inhibit-read-only t)) |
7ce2d04d5561
(yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents:
18825
diff
changeset
|
1579 (remove-text-properties opoint (point) '(read-only nil)))) |
475 | 1580 (if (consp arg) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1581 ;; 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
|
1582 ;; 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
|
1583 ;; 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
|
1584 (goto-char (prog1 (mark t) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1585 (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
|
1586 ;; 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
|
1587 (setq this-command 'yank) |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
1588 nil) |
715 | 1589 |
1590 (defun rotate-yank-pointer (arg) | |
1591 "Rotate the yanking point in the kill ring. | |
1592 With argument, rotate that many kills forward (or backward, if negative)." | |
1593 (interactive "p") | |
1594 (current-kill arg)) | |
1595 | |
475 | 1596 |
1597 (defun insert-buffer (buffer) | |
1598 "Insert after point the contents of BUFFER. | |
1599 Puts mark after the inserted text. | |
1600 BUFFER may be a buffer or a buffer name." | |
14835
eb78ddcff331
(insert-buffer): Fix typo in previous change.
Erik Naggum <erik@naggum.no>
parents:
14834
diff
changeset
|
1601 (interactive |
14834
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
1602 (list |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
1603 (progn |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
1604 (barf-if-buffer-read-only) |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
1605 (read-buffer "Insert buffer: " |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
1606 (if (eq (selected-window) (next-window (selected-window))) |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
1607 (other-buffer (current-buffer)) |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
1608 (window-buffer (next-window (selected-window)))) |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
1609 t)))) |
475 | 1610 (or (bufferp buffer) |
1611 (setq buffer (get-buffer buffer))) | |
1612 (let (start end newmark) | |
1613 (save-excursion | |
1614 (save-excursion | |
1615 (set-buffer buffer) | |
1616 (setq start (point-min) end (point-max))) | |
1617 (insert-buffer-substring buffer start end) | |
1618 (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
|
1619 (push-mark newmark)) |
d65c1fefc636
* simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents:
1838
diff
changeset
|
1620 nil) |
475 | 1621 |
1622 (defun append-to-buffer (buffer start end) | |
1623 "Append to specified buffer the text of the region. | |
1624 It is inserted into that buffer before its point. | |
1625 | |
1626 When calling from a program, give three arguments: | |
1627 BUFFER (or buffer name), START and END. | |
1628 START and END specify the portion of the current buffer to be copied." | |
715 | 1629 (interactive |
10048
db01a04d2afb
(append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents:
10034
diff
changeset
|
1630 (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
|
1631 (region-beginning) (region-end))) |
475 | 1632 (let ((oldbuf (current-buffer))) |
1633 (save-excursion | |
1634 (set-buffer (get-buffer-create buffer)) | |
1635 (insert-buffer-substring oldbuf start end)))) | |
1636 | |
1637 (defun prepend-to-buffer (buffer start end) | |
1638 "Prepend to specified buffer the text of the region. | |
1639 It is inserted into that buffer after its point. | |
1640 | |
1641 When calling from a program, give three arguments: | |
1642 BUFFER (or buffer name), START and END. | |
1643 START and END specify the portion of the current buffer to be copied." | |
1644 (interactive "BPrepend to buffer: \nr") | |
1645 (let ((oldbuf (current-buffer))) | |
1646 (save-excursion | |
1647 (set-buffer (get-buffer-create buffer)) | |
1648 (save-excursion | |
1649 (insert-buffer-substring oldbuf start end))))) | |
1650 | |
1651 (defun copy-to-buffer (buffer start end) | |
1652 "Copy to specified buffer the text of the region. | |
1653 It is inserted into that buffer, replacing existing text there. | |
1654 | |
1655 When calling from a program, give three arguments: | |
1656 BUFFER (or buffer name), START and END. | |
1657 START and END specify the portion of the current buffer to be copied." | |
1658 (interactive "BCopy to buffer: \nr") | |
1659 (let ((oldbuf (current-buffer))) | |
1660 (save-excursion | |
1661 (set-buffer (get-buffer-create buffer)) | |
1662 (erase-buffer) | |
1663 (save-excursion | |
1664 (insert-buffer-substring oldbuf start end))))) | |
1665 | |
4040
d06d7295d3eb
Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents:
3967
diff
changeset
|
1666 (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
|
1667 (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
|
1668 |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1669 (defun mark (&optional force) |
3487 | 1670 "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
|
1671 If optional argument FORCE is non-nil, access the mark value |
3487 | 1672 even if the mark is not currently active, and return nil |
1673 if there is no mark at all. | |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1674 |
475 | 1675 If you are using this in an editing command, you are most likely making |
1676 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
|
1677 (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
|
1678 (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
|
1679 (signal 'mark-inactive nil))) |
475 | 1680 |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1681 ;; 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
|
1682 ;; run deactivate-mark-hook. This shorthand should simplify. |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1683 (defsubst deactivate-mark () |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1684 "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
|
1685 \(That makes a difference only in Transient Mark mode.) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1686 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
|
1687 (if transient-mark-mode |
0998ca7d922c
(deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents:
7698
diff
changeset
|
1688 (progn |
0998ca7d922c
(deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents:
7698
diff
changeset
|
1689 (setq mark-active nil) |
0998ca7d922c
(deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents:
7698
diff
changeset
|
1690 (run-hooks 'deactivate-mark-hook)))) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
1691 |
475 | 1692 (defun set-mark (pos) |
1693 "Set this buffer's mark to POS. Don't use this function! | |
1694 That is to say, don't use this function unless you want | |
1695 the user to see that the mark has moved, and you want the previous | |
1696 mark position to be lost. | |
1697 | |
1698 Normally, when a new mark is set, the old one should go on the stack. | |
1699 This is why most applications should use push-mark, not set-mark. | |
1700 | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1701 Novice Emacs Lisp programmers often try to use the mark for the wrong |
475 | 1702 purposes. The mark saves a location for the user's convenience. |
1703 Most editing commands should not alter the mark. | |
1704 To remember a location for internal use in the Lisp program, | |
1705 store it in a Lisp variable. Example: | |
1706 | |
1707 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))." | |
1708 | |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1709 (if pos |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1710 (progn |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1711 (setq mark-active t) |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1712 (run-hooks 'activate-mark-hook) |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1713 (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
|
1714 ;; 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
|
1715 ;; 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
|
1716 ;; 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
|
1717 (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
|
1718 (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
|
1719 (set-marker (mark-marker) nil))) |
475 | 1720 |
1721 (defvar mark-ring nil | |
8695
0f702e9ab06d
(mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8660
diff
changeset
|
1722 "The list of former marks of the current buffer, most recent first.") |
475 | 1723 (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
|
1724 (put 'mark-ring 'permanent-local t) |
475 | 1725 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1726 (defcustom mark-ring-max 16 |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1727 "*Maximum size of mark ring. Start discarding off end if gets this big." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1728 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1729 :group 'editing-basics) |
475 | 1730 |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1731 (defvar global-mark-ring nil |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1732 "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
|
1733 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1734 (defcustom global-mark-ring-max 16 |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1735 "*Maximum size of global mark ring. \ |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1736 Start discarding off end if gets this big." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1737 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1738 :group 'editing-basics) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1739 |
475 | 1740 (defun set-mark-command (arg) |
1741 "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
|
1742 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
|
1743 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
|
1744 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
|
1745 \(does not affect global mark ring\). |
475 | 1746 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1747 Novice Emacs Lisp programmers often try to use the mark for the wrong |
475 | 1748 purposes. See the documentation of `set-mark' for more information." |
1749 (interactive "P") | |
1750 (if (null arg) | |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1751 (progn |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1752 (push-mark nil nil t)) |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1753 (if (null (mark t)) |
475 | 1754 (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
|
1755 (goto-char (mark t)) |
475 | 1756 (pop-mark)))) |
1757 | |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1758 (defun push-mark (&optional location nomsg activate) |
475 | 1759 "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
|
1760 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
|
1761 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
|
1762 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
|
1763 In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil. |
475 | 1764 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1765 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
|
1766 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
|
1767 |
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1768 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
|
1769 (if (null (mark t)) |
475 | 1770 nil |
1771 (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring)) | |
1772 (if (> (length mark-ring) mark-ring-max) | |
1773 (progn | |
1774 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil) | |
1775 (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
|
1776 (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
|
1777 ;; 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
|
1778 (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
|
1779 (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
|
1780 ;; 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
|
1781 ;; 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
|
1782 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
|
1783 (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
|
1784 (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
|
1785 (progn |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1786 (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
|
1787 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
|
1788 (setcdr (nthcdr (1- global-mark-ring-max) global-mark-ring) nil)))) |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
15263
diff
changeset
|
1789 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0) |
475 | 1790 (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
|
1791 (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
|
1792 (set-mark (mark t))) |
475 | 1793 nil) |
1794 | |
1795 (defun pop-mark () | |
1796 "Pop off mark ring into the buffer's actual mark. | |
1797 Does not set point. Does nothing if mark ring is empty." | |
1798 (if mark-ring | |
1799 (progn | |
1800 (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
|
1801 (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
|
1802 (deactivate-mark) |
475 | 1803 (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
|
1804 (if (null (mark t)) (ding)) |
475 | 1805 (setq mark-ring (cdr mark-ring))))) |
1806 | |
16436
d2acc84badf4
Use defalias not define-function.
Richard M. Stallman <rms@gnu.org>
parents:
16417
diff
changeset
|
1807 (defalias 'exchange-dot-and-mark 'exchange-point-and-mark) |
475 | 1808 (defun exchange-point-and-mark () |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1809 "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
|
1810 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
|
1811 and it reactivates the mark." |
475 | 1812 (interactive nil) |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
1813 (let ((omark (mark t))) |
475 | 1814 (if (null omark) |
1815 (error "No mark set in this buffer")) | |
1816 (set-mark (point)) | |
1817 (goto-char omark) | |
1818 nil)) | |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1819 |
17514 | 1820 (defun transient-mark-mode (arg) |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1821 "Toggle Transient Mark mode. |
2935
653e14f61220
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
2850
diff
changeset
|
1822 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
|
1823 |
5372
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
1824 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
|
1825 Changing the buffer \"deactivates\" the mark. |
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
1826 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
|
1827 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
|
1828 incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]." |
17514 | 1829 (interactive "P") |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1830 (setq transient-mark-mode |
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1831 (if (null arg) |
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
1832 (not transient-mark-mode) |
17513
ea3acb6b992a
(transient-mark-mode): Print message if used interactively.
Richard M. Stallman <rms@gnu.org>
parents:
17471
diff
changeset
|
1833 (> (prefix-numeric-value arg) 0))) |
17514 | 1834 (if (interactive-p) |
1835 (if transient-mark-mode | |
1836 (message "Transient Mark mode enabled") | |
1837 (message "Transient Mark mode disabled")))) | |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1838 |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1839 (defun pop-global-mark () |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1840 "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
|
1841 (interactive) |
7881
4ab8723cd491
(pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents:
7877
diff
changeset
|
1842 ;; 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
|
1843 (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
|
1844 (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
|
1845 (or global-mark-ring |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1846 (error "No global mark set")) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1847 (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
|
1848 (buffer (marker-buffer marker)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1849 (position (marker-position marker))) |
10351
e34cbd5276bd
(pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents:
10284
diff
changeset
|
1850 (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
|
1851 (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
|
1852 (set-buffer buffer) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1853 (or (and (>= position (point-min)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1854 (<= position (point-max))) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1855 (widen)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1856 (goto-char position) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
1857 (switch-to-buffer buffer))) |
475 | 1858 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1859 (defcustom next-line-add-newlines t |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1860 "*If non-nil, `next-line' inserts newline to avoid `end of buffer' error." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1861 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1862 :group 'editing-basics) |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
1863 |
475 | 1864 (defun next-line (arg) |
1865 "Move cursor vertically down ARG lines. | |
1866 If there is no character in the target line exactly under the current column, | |
1867 the cursor is positioned after the character in that line which spans this | |
1868 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
|
1869 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
|
1870 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
|
1871 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
|
1872 cursor to the end of the buffer. |
475 | 1873 |
1874 The command \\[set-goal-column] can be used to create | |
18593
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1875 a semipermanent goal column for this command. |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1876 Then instead of trying to move exactly vertically (or as close as possible), |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1877 this command moves to the specified goal column (or as close as possible). |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1878 The goal column is stored in the variable `goal-column', which is nil |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1879 when there is no goal column. |
475 | 1880 |
1881 If you are thinking of using this in a Lisp program, consider | |
1882 using `forward-line' instead. It is usually easier to use | |
1883 and more reliable (no dependence on goal column, etc.)." | |
1884 (interactive "p") | |
5675
3191bf405867
(next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents:
5635
diff
changeset
|
1885 (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
|
1886 (let ((opoint (point))) |
8309
a4dbf8e6c78f
(line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents:
8203
diff
changeset
|
1887 (end-of-line) |
a4dbf8e6c78f
(line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents:
8203
diff
changeset
|
1888 (if (eobp) |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
1889 (newline 1) |
5675
3191bf405867
(next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents:
5635
diff
changeset
|
1890 (goto-char opoint) |
3191bf405867
(next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents:
5635
diff
changeset
|
1891 (line-move arg))) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1892 (if (interactive-p) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1893 (condition-case nil |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1894 (line-move arg) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1895 ((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
|
1896 (line-move arg))) |
475 | 1897 nil) |
1898 | |
1899 (defun previous-line (arg) | |
1900 "Move cursor vertically up ARG lines. | |
1901 If there is no character in the target line exactly over the current column, | |
1902 the cursor is positioned after the character in that line which spans this | |
1903 column, or at the end of the line if it is not long enough. | |
1904 | |
1905 The command \\[set-goal-column] can be used to create | |
18593
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1906 a semipermanent goal column for this command. |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1907 Then instead of trying to move exactly vertically (or as close as possible), |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1908 this command moves to the specified goal column (or as close as possible). |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1909 The goal column is stored in the variable `goal-column', which is nil |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
1910 when there is no goal column. |
475 | 1911 |
1912 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
|
1913 `forward-line' with a negative argument instead. It is usually easier |
475 | 1914 to use and more reliable (no dependence on goal column, etc.)." |
1915 (interactive "p") | |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1916 (if (interactive-p) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1917 (condition-case nil |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1918 (line-move (- arg)) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
1919 ((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
|
1920 (line-move (- arg))) |
475 | 1921 nil) |
1922 | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1923 (defcustom track-eol nil |
475 | 1924 "*Non-nil means vertical motion starting at end of line keeps to ends of lines. |
1925 This means moving to the end of each line moved onto. | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1926 The beginning of a blank line does not count as the end of a line." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1927 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1928 :group 'editing-basics) |
475 | 1929 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1930 (defcustom goal-column nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1931 "*Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1932 :type '(choice integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1933 (const :tag "None" nil)) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1934 :group 'editing-basics) |
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
|
1935 (make-variable-buffer-local 'goal-column) |
475 | 1936 |
1937 (defvar temporary-goal-column 0 | |
1938 "Current goal column for vertical motion. | |
1939 It is the column where point was | |
1940 at the start of current run of vertical motion commands. | |
513 | 1941 When the `track-eol' feature is doing its job, the value is 9999.") |
475 | 1942 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1943 (defcustom line-move-ignore-invisible nil |
10949
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
1944 "*Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines. |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1945 Outline mode sets this." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1946 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1947 :group 'editing-basics) |
10949
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
1948 |
11326
0d5ebc078c51
(line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents:
11324
diff
changeset
|
1949 ;; 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
|
1950 ;; Arg says how many lines to move. |
475 | 1951 (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
|
1952 ;; 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
|
1953 ;; for intermediate positions. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1954 (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
|
1955 (opoint (point)) |
19003
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
1956 new line-end line-beg) |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1957 (unwind-protect |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1958 (progn |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1959 (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
|
1960 (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
|
1961 (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
|
1962 (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
|
1963 ;; 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
|
1964 ;; 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
|
1965 (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
|
1966 9999 |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1967 (current-column)))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1968 (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
|
1969 (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
|
1970 ;; 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
|
1971 (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
|
1972 (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
|
1973 ;; 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
|
1974 ;; 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
|
1975 ;; 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
|
1976 (end-of-line) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1977 (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
|
1978 (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
|
1979 (bolp))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1980 (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
|
1981 'beginning-of-buffer |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1982 'end-of-buffer) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1983 nil)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1984 ;; 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
|
1985 (while (> arg 0) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1986 (end-of-line) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1987 (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
|
1988 (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
|
1989 ;; 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
|
1990 ;; 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
|
1991 (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
|
1992 (let ((prop |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1993 (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
|
1994 (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
|
1995 prop |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
1996 (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
|
1997 (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
|
1998 (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
|
1999 (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
|
2000 (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
|
2001 (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
|
2002 (while (< arg 0) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2003 (beginning-of-line) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2004 (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
|
2005 (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
|
2006 (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
|
2007 (let ((prop |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2008 (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
|
2009 (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
|
2010 prop |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2011 (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
|
2012 (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
|
2013 (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
|
2014 (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
|
2015 (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
|
2016 (setq arg (1+ arg)))) |
16408
87f15c601f5a
(line-move): Ignore invisibility in `move-to-column'.
Richard M. Stallman <rms@gnu.org>
parents:
16316
diff
changeset
|
2017 (let ((buffer-invisibility-spec nil)) |
87f15c601f5a
(line-move): Ignore invisibility in `move-to-column'.
Richard M. Stallman <rms@gnu.org>
parents:
16316
diff
changeset
|
2018 (move-to-column (or goal-column temporary-goal-column)))) |
18034
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2019 (setq new (point)) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2020 ;; If we are moving into some intangible text, |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2021 ;; look for following text on the same line which isn't intangible |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2022 ;; and move there. |
19003
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2023 (setq line-end (save-excursion (end-of-line) (point))) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2024 (setq line-beg (save-excursion (beginning-of-line) (point))) |
18034
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2025 (let ((after (and (< new (point-max)) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2026 (get-char-property new 'intangible))) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2027 (before (and (> new (point-min)) |
19003
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2028 (get-char-property (1- new) 'intangible)))) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2029 (when (and before (eq before after) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2030 (not (bolp))) |
18034
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2031 (goto-char (point-min)) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2032 (let ((inhibit-point-motion-hooks nil)) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2033 (goto-char new)) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2034 (if (<= new line-end) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2035 (setq new (point))))) |
19003
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2036 ;; NEW is where we want to move to. |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2037 ;; LINE-BEG and LINE-END are the beginning and end of the line. |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2038 ;; Move there in just one step, from our starting position, |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2039 ;; with intangibility and point-motion hooks enabled this time. |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2040 (goto-char opoint) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2041 (setq inhibit-point-motion-hooks nil) |
19003
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2042 (goto-char new) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2043 ;; If intangibility processing moved us to a different line, |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2044 ;; readjust the horizontal position within the line we ended up at. |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2045 (when (or (< (point) line-beg) (> (point) line-end)) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2046 (setq new (point)) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2047 (setq inhibit-point-motion-hooks t) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2048 (setq line-end (save-excursion (end-of-line) (point))) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2049 (beginning-of-line) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2050 (setq line-beg (point)) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2051 (let ((buffer-invisibility-spec nil)) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2052 (move-to-column (or goal-column temporary-goal-column))) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2053 (if (<= (point) line-end) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2054 (setq new (point))) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2055 (goto-char (point-min)) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2056 (setq inhibit-point-motion-hooks nil) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2057 (goto-char new) |
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2058 ))) |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2059 nil) |
475 | 2060 |
1771
3f0f18d4eb8c
* simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents:
1760
diff
changeset
|
2061 ;;; 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
|
2062 ;;; 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
|
2063 (put 'set-goal-column 'disabled t) |
475 | 2064 |
2065 (defun set-goal-column (arg) | |
2066 "Set the current horizontal position as a goal for \\[next-line] and \\[previous-line]. | |
2067 Those commands will move to this position in the line moved to | |
2068 rather than trying to keep the same horizontal position. | |
2069 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
|
2070 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
|
2071 The goal column is stored in the variable `goal-column'." |
475 | 2072 (interactive "P") |
2073 (if arg | |
2074 (progn | |
2075 (setq goal-column nil) | |
2076 (message "No goal column")) | |
2077 (setq goal-column (current-column)) | |
2078 (message (substitute-command-keys | |
2079 "Goal column %d (use \\[set-goal-column] with an arg to unset it)") | |
2080 goal-column)) | |
2081 nil) | |
2082 | |
2597
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
2083 ;;; Partial support for horizontal autoscrolling. Someday, this feature |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
2084 ;;; 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
|
2085 ;;; will go away. |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
2086 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2087 (defcustom hscroll-step 0 |
2597
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
2088 "*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
|
2089 If that fails to bring point back on frame, point is centered instead. |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2090 If this is zero, point is always centered after it moves off frame." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2091 :type '(choice (const :tag "Alway Center" 0) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2092 (integer :format "%v" 1)) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2093 :group 'editing-basics) |
2597
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
2094 |
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
2095 (defun hscroll-point-visible () |
6743
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2096 "Scrolls the selected window horizontally to make point visible." |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2097 (save-excursion |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2098 (set-buffer (window-buffer)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2099 (if (not (or truncate-lines |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2100 (> (window-hscroll) 0) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2101 (and truncate-partial-width-windows |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2102 (< (window-width) (frame-width))))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2103 ;; Point is always visible when lines are wrapped. |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2104 () |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2105 ;; 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
|
2106 ;; 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
|
2107 (and (< (point) (window-start)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2108 (let ((ws-bol (save-excursion |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2109 (goto-char (window-start)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2110 (beginning-of-line) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2111 (point)))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2112 (and (>= (point) ws-bol) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2113 (set-window-start nil ws-bol)))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2114 (let* ((here (hscroll-window-column)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2115 (left (min (window-hscroll) 1)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2116 (right (1- (window-width)))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2117 ;; 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
|
2118 (if (not (and (= here right) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2119 (= (following-char) ?\n))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2120 (setq right (1- right))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2121 (cond |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2122 ;; 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
|
2123 ;; white space off the end of the line. |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2124 ((or (< here (- left hscroll-step)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2125 (> here (+ right hscroll-step))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2126 (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
|
2127 (scroll-left (min (- here (/ (window-width) 2)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2128 (- eol (window-width) -5))))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2129 ;; 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
|
2130 ((< here left) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2131 (scroll-right hscroll-step)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2132 ((> here right) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2133 (scroll-left hscroll-step))))))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2134 |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2135 ;; 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
|
2136 ;; 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
|
2137 ;; 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
|
2138 ;; 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
|
2139 ;; 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
|
2140 ;; 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
|
2141 ;; 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
|
2142 (defun hscroll-window-column () |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2143 (let* ((hscroll (window-hscroll)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2144 (startpos (save-excursion |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2145 (beginning-of-line) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2146 (if (= (point) (save-excursion |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2147 (goto-char (window-start)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2148 (beginning-of-line) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2149 (point))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2150 (goto-char (window-start))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2151 (point))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2152 (hpos (+ (if (and (eq (selected-window) (minibuffer-window)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2153 (= 1 (window-start)) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2154 (= startpos (point-min))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2155 (minibuffer-prompt-width) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2156 0) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2157 (min 0 (- 1 hscroll)))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2158 val) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2159 (car (cdr (compute-motion startpos (cons hpos 0) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2160 (point) (cons 0 1) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2161 1000000 (cons hscroll 0) nil))))) |
77349221ca81
(hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6696
diff
changeset
|
2162 |
2597
562d2dea4f05
(hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2577
diff
changeset
|
2163 |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
2164 ;; 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
|
2165 ;; 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
|
2166 ;; (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
|
2167 ;; 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
|
2168 ;; 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
|
2169 |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
2170 ;;;;; 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
|
2171 ;;;;; 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
|
2172 ;;;;; 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
|
2173 ;;;;; 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
|
2174 ;;;;; events in loaddefs.el. |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
2175 |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
2176 ;;(defun right-arrow (arg) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
2177 ;; "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
|
2178 ;;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
|
2179 ;; (interactive "P") |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
2180 ;; (forward-char arg) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
2181 ;; (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
|
2182 |
2608
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
2183 ;;(defun left-arrow (arg) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
2184 ;; "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
|
2185 ;;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
|
2186 ;; (interactive "P") |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
2187 ;; (backward-char arg) |
cd5e799be39b
(up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents:
2597
diff
changeset
|
2188 ;; (hscroll-point-visible)) |
8006
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2189 |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2190 (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
|
2191 "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
|
2192 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
|
2193 (interactive "P") |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2194 (scroll-other-window |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2195 ;; Just invert the argument's meaning. |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2196 ;; 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
|
2197 (if (eq lines '-) nil |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2198 (if (null lines) '- |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2199 (- (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
|
2200 (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
|
2201 |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2202 (defun beginning-of-buffer-other-window (arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2203 "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
|
2204 Leave mark at previous position. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2205 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
|
2206 (interactive "P") |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2207 (let ((orig-window (selected-window)) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2208 (window (other-window-for-scrolling))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2209 ;; 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
|
2210 ;; 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
|
2211 (unwind-protect |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2212 (progn |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2213 (select-window window) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2214 ;; 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
|
2215 (beginning-of-buffer arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2216 ;; Set point accordingly. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2217 (recenter '(t))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2218 (select-window orig-window)))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2219 |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2220 (defun end-of-buffer-other-window (arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2221 "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
|
2222 Leave mark at previous position. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2223 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
|
2224 (interactive "P") |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2225 ;; See beginning-of-buffer-other-window for comments. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2226 (let ((orig-window (selected-window)) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2227 (window (other-window-for-scrolling))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2228 (unwind-protect |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2229 (progn |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2230 (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
|
2231 (end-of-buffer arg) |
8057
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2232 (recenter '(t))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2233 (select-window orig-window)))) |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
2234 |
475 | 2235 (defun transpose-chars (arg) |
2236 "Interchange characters around point, moving forward one character. | |
2237 With prefix arg ARG, effect is to take character before point | |
2238 and drag it forward past ARG other characters (backward if ARG negative). | |
2239 If no argument and at end of line, the previous two chars are exchanged." | |
2240 (interactive "*P") | |
2241 (and (null arg) (eolp) (forward-char -1)) | |
2242 (transpose-subr 'forward-char (prefix-numeric-value arg))) | |
2243 | |
2244 (defun transpose-words (arg) | |
2245 "Interchange words around point, leaving point at end of them. | |
2246 With prefix arg ARG, effect is to take word before or around point | |
2247 and drag it forward past ARG other words (backward if ARG negative). | |
2248 If ARG is zero, the words around or after point and around or after mark | |
2249 are interchanged." | |
2250 (interactive "*p") | |
2251 (transpose-subr 'forward-word arg)) | |
2252 | |
2253 (defun transpose-sexps (arg) | |
2254 "Like \\[transpose-words] but applies to sexps. | |
2255 Does not work on a sexp that point is in the middle of | |
2256 if it is a list or string." | |
2257 (interactive "*p") | |
2258 (transpose-subr 'forward-sexp arg)) | |
2259 | |
2260 (defun transpose-lines (arg) | |
2261 "Exchange current line and previous line, leaving point after both. | |
2262 With argument ARG, takes previous line and moves it past ARG lines. | |
2263 With argument 0, interchanges line point is in with line mark is in." | |
2264 (interactive "*p") | |
2265 (transpose-subr (function | |
2266 (lambda (arg) | |
2267 (if (= arg 1) | |
2268 (progn | |
2269 ;; Move forward over a line, | |
2270 ;; but create a newline if none exists yet. | |
2271 (end-of-line) | |
2272 (if (eobp) | |
2273 (newline) | |
2274 (forward-char 1))) | |
2275 (forward-line arg)))) | |
2276 arg)) | |
2277 | |
2278 (defun transpose-subr (mover arg) | |
2279 (let (start1 end1 start2 end2) | |
2280 (if (= arg 0) | |
2281 (progn | |
2282 (save-excursion | |
2283 (funcall mover 1) | |
2284 (setq end2 (point)) | |
2285 (funcall mover -1) | |
2286 (setq start2 (point)) | |
2287 (goto-char (mark)) | |
2288 (funcall mover 1) | |
2289 (setq end1 (point)) | |
2290 (funcall mover -1) | |
2291 (setq start1 (point)) | |
2292 (transpose-subr-1)) | |
2293 (exchange-point-and-mark))) | |
2294 (while (> arg 0) | |
2295 (funcall mover -1) | |
2296 (setq start1 (point)) | |
2297 (funcall mover 1) | |
2298 (setq end1 (point)) | |
2299 (funcall mover 1) | |
2300 (setq end2 (point)) | |
2301 (funcall mover -1) | |
2302 (setq start2 (point)) | |
2303 (transpose-subr-1) | |
2304 (goto-char end2) | |
2305 (setq arg (1- arg))) | |
2306 (while (< arg 0) | |
2307 (funcall mover -1) | |
2308 (setq start2 (point)) | |
2309 (funcall mover -1) | |
2310 (setq start1 (point)) | |
2311 (funcall mover 1) | |
2312 (setq end1 (point)) | |
2313 (funcall mover 1) | |
2314 (setq end2 (point)) | |
2315 (transpose-subr-1) | |
2316 (setq arg (1+ arg))))) | |
2317 | |
2318 (defun transpose-subr-1 () | |
2319 (if (> (min end1 end2) (max start1 start2)) | |
2320 (error "Don't have two things to transpose")) | |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
2321 (let* ((word1 (buffer-substring start1 end1)) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
2322 (len1 (length word1)) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
2323 (word2 (buffer-substring start2 end2)) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
2324 (len2 (length word2))) |
475 | 2325 (delete-region start2 end2) |
2326 (goto-char start2) | |
2327 (insert word1) | |
2328 (goto-char (if (< start1 start2) start1 | |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
2329 (+ start1 (- len1 len2)))) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
2330 (delete-region (point) (+ (point) len1)) |
475 | 2331 (insert word2))) |
2332 | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2333 (defcustom comment-column 32 |
475 | 2334 "*Column to indent right-margin comments to. |
1581
9de0900ca56a
* simple.el (comment-column): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1556
diff
changeset
|
2335 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
|
2336 Each mode establishes a different default value for this variable; you |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2337 can set the value for a particular mode using that mode's hook." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2338 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2339 :group 'fill-comments) |
475 | 2340 (make-variable-buffer-local 'comment-column) |
2341 | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2342 (defcustom comment-start nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2343 "*String to insert to start a new comment, or nil if no comment syntax." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2344 :type '(choice (const :tag "None" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2345 string) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2346 :group 'fill-comments) |
475 | 2347 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2348 (defcustom comment-start-skip nil |
475 | 2349 "*Regexp to match the start of a comment plus everything up to its body. |
2350 If there are any \\(...\\) pairs, the comment delimiter text is held to begin | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2351 at the place matched by the close of the first pair." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2352 :type '(choice (const :tag "None" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2353 regexp) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2354 :group 'fill-comments) |
475 | 2355 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2356 (defcustom comment-end "" |
475 | 2357 "*String to insert to end a new comment. |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2358 Should be an empty string if comments are terminated by end-of-line." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2359 :type 'string |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2360 :group 'fill-comments) |
475 | 2361 |
16685
26919ad3a4ad
Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16632
diff
changeset
|
2362 (defvar comment-indent-hook nil |
2299
53abb56a18fa
* simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents:
2215
diff
changeset
|
2363 "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
|
2364 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
|
2365 the comment's starting delimiter.") |
53abb56a18fa
* simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents:
2215
diff
changeset
|
2366 |
16685
26919ad3a4ad
Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16632
diff
changeset
|
2367 (defvar comment-indent-function |
475 | 2368 '(lambda () comment-column) |
2369 "Function to compute desired indentation for a comment. | |
2370 This function is called with no args with point at the beginning of | |
2371 the comment's starting delimiter.") | |
2372 | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2373 (defcustom block-comment-start nil |
10983
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2374 "*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
|
2375 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
|
2376 Note that the regular expression `comment-start-skip' should skip this string |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2377 as well as the `comment-start' string." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2378 :type '(choice (const :tag "Use comment-start" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2379 string) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2380 :group 'fill-comments) |
10983
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2381 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2382 (defcustom block-comment-end nil |
10983
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2383 "*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
|
2384 Should be an empty string if comments are terminated by end-of-line. |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2385 If nil, use `comment-end' instead." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2386 :type '(choice (const :tag "Use comment-end" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2387 string) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2388 :group 'fill-comments) |
10983
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2389 |
475 | 2390 (defun indent-for-comment () |
2391 "Indent this line's comment to comment column, or insert an empty comment." | |
2392 (interactive "*") | |
10983
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2393 (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
|
2394 (looking-at "[ \t]*$"))) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2395 (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
|
2396 (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
|
2397 (if (null starter) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2398 (error "No comment syntax defined") |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2399 (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
|
2400 cpos indent begpos) |
11975
dd80dd6aa77f
(indent-for-comment): move to beginning of line only
Karl Heuer <kwzh@gnu.org>
parents:
11961
diff
changeset
|
2401 (beginning-of-line) |
10983
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2402 (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
|
2403 (progn (setq cpos (point-marker)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2404 ;; 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
|
2405 ;; 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
|
2406 ;; 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
|
2407 (if (match-end 1) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2408 (goto-char (match-end 1)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2409 ;; 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
|
2410 ;; 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
|
2411 ;; 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
|
2412 ;; 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
|
2413 ;; beginning of what was matched. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2414 (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
|
2415 (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
|
2416 (setq begpos (point)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2417 ;; Compute desired indent. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2418 (if (= (current-column) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2419 (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
|
2420 (funcall comment-indent-hook) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2421 (funcall comment-indent-function)))) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2422 (goto-char begpos) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2423 ;; 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
|
2424 (skip-chars-backward " \t") |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2425 (delete-region (point) begpos) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2426 (indent-to indent)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2427 ;; An existing comment? |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2428 (if cpos |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2429 (progn (goto-char cpos) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2430 (set-marker cpos nil)) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2431 ;; No, insert one. |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2432 (insert starter) |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2433 (save-excursion |
8ad27030d73f
(block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents:
10959
diff
changeset
|
2434 (insert ender))))))) |
475 | 2435 |
2436 (defun set-comment-column (arg) | |
2437 "Set the comment column based on point. | |
2438 With no arg, set the comment column to the current column. | |
2439 With just minus as arg, kill any comment on this line. | |
2440 With any other arg, set comment column to indentation of the previous comment | |
2441 and then align or create a comment on this line at that column." | |
2442 (interactive "P") | |
2443 (if (eq arg '-) | |
2444 (kill-comment nil) | |
2445 (if arg | |
2446 (progn | |
2447 (save-excursion | |
2448 (beginning-of-line) | |
2449 (re-search-backward comment-start-skip) | |
2450 (beginning-of-line) | |
2451 (re-search-forward comment-start-skip) | |
2452 (goto-char (match-beginning 0)) | |
2453 (setq comment-column (current-column)) | |
2454 (message "Comment column set to %d" comment-column)) | |
2455 (indent-for-comment)) | |
2456 (setq comment-column (current-column)) | |
2457 (message "Comment column set to %d" comment-column)))) | |
2458 | |
2459 (defun kill-comment (arg) | |
2460 "Kill the comment on this line, if any. | |
2461 With argument, kill comments on that many lines starting with this one." | |
2462 ;; this function loses in a lot of situations. it incorrectly recognises | |
2463 ;; comment delimiters sometimes (ergo, inside a string), doesn't work | |
2464 ;; with multi-line comments, can kill extra whitespace if comment wasn't | |
2465 ;; through end-of-line, et cetera. | |
2466 (interactive "P") | |
2467 (or comment-start-skip (error "No comment syntax defined")) | |
2468 (let ((count (prefix-numeric-value arg)) endc) | |
2469 (while (> count 0) | |
2470 (save-excursion | |
2471 (end-of-line) | |
2472 (setq endc (point)) | |
2473 (beginning-of-line) | |
2474 (and (string< "" comment-end) | |
2475 (setq endc | |
2476 (progn | |
2477 (re-search-forward (regexp-quote comment-end) endc 'move) | |
2478 (skip-chars-forward " \t") | |
2479 (point)))) | |
2480 (beginning-of-line) | |
2481 (if (re-search-forward comment-start-skip endc t) | |
2482 (progn | |
2483 (goto-char (match-beginning 0)) | |
2484 (skip-chars-backward " \t") | |
2485 (kill-region (point) endc) | |
2486 ;; to catch comments a line beginnings | |
2487 (indent-according-to-mode)))) | |
2488 (if arg (forward-line 1)) | |
2489 (setq count (1- count))))) | |
2490 | |
2491 (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
|
2492 "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
|
2493 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
|
2494 Numeric prefix arg ARG means use ARG comment characters. |
475 | 2495 If ARG is negative, delete that many comment characters instead. |
2496 Comments are terminated on each line, even for syntax in which newline does | |
2497 not end the comment. Blank lines do not get comments." | |
2498 ;; if someone wants it to only put a comment-start at the beginning and | |
2499 ;; comment-end at the end then typing it, C-x C-x, closing it, C-x C-x | |
2500 ;; is easy enough. No option is made here for other than commenting | |
2501 ;; every line. | |
5730
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2502 (interactive "r\nP") |
475 | 2503 (or comment-start (error "No comment syntax is defined")) |
2504 (if (> beg end) (let (mid) (setq mid beg beg end end mid))) | |
2505 (save-excursion | |
2506 (save-restriction | |
5730
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2507 (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
|
2508 numarg) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2509 (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
|
2510 (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
|
2511 ;; 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
|
2512 ;; 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
|
2513 (while (> numarg 1) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2514 (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
|
2515 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
|
2516 (setq numarg (1- numarg)))) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2517 ;; Loop over all lines from BEG to END. |
475 | 2518 (narrow-to-region beg end) |
2519 (goto-char beg) | |
2520 (while (not (eobp)) | |
5730
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2521 (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
|
2522 (progn |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2523 ;; 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
|
2524 (if (eq numarg t) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2525 (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
|
2526 (delete-char (length cs))) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2527 (let ((count numarg)) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2528 (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
|
2529 (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
|
2530 (delete-char (length cs))))) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2531 ;; 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
|
2532 (if (string= "" ce) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2533 nil |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2534 (if (eq numarg t) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2535 (progn |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2536 (end-of-line) |
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2537 ;; 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
|
2538 ;; 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
|
2539 ;; though. |
16508
fd19350c1405
(comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents:
16445
diff
changeset
|
2540 (while (progn (skip-chars-backward " \t") |
fd19350c1405
(comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents:
16445
diff
changeset
|
2541 (and (>= (- (point) (point-min)) (length ce)) |
fd19350c1405
(comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents:
16445
diff
changeset
|
2542 (save-excursion |
fd19350c1405
(comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents:
16445
diff
changeset
|
2543 (backward-char (length ce)) |
fd19350c1405
(comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents:
16445
diff
changeset
|
2544 (looking-at (regexp-quote ce))))) |
5730
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2545 (delete-char (- (length ce))))) |
5767
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2546 (let ((count numarg)) |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2547 (while (> 1 (setq count (1+ count))) |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2548 (end-of-line) |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2549 ;; 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
|
2550 ;; that is pretty brain-damaged though |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2551 (skip-chars-backward " \t") |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2552 (save-excursion |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2553 (backward-char (length ce)) |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2554 (if (looking-at (regexp-quote ce)) |
8fef255fe6b3
(comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5764
diff
changeset
|
2555 (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
|
2556 (forward-line 1)) |
5730
5810e7311c05
(comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents:
5675
diff
changeset
|
2557 ;; Insert at beginning and at end. |
475 | 2558 (if (looking-at "[ \t]*$") () |
2559 (insert cs) | |
2560 (if (string= "" ce) () | |
2561 (end-of-line) | |
2562 (insert ce))) | |
2563 (search-forward "\n" nil 'move))))))) | |
2564 | |
2565 (defun backward-word (arg) | |
2566 "Move backward until encountering the end of a word. | |
2567 With argument, do this that many times. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2568 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
|
2569 (interactive "p") |
475 | 2570 (forward-word (- arg))) |
2571 | |
2572 (defun mark-word (arg) | |
2573 "Set mark arg words away from point." | |
2574 (interactive "p") | |
2575 (push-mark | |
2576 (save-excursion | |
2577 (forward-word arg) | |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
2578 (point)) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
2579 nil t)) |
475 | 2580 |
2581 (defun kill-word (arg) | |
2582 "Kill characters forward until encountering the end of a word. | |
2583 With argument, do this that many times." | |
2584 (interactive "p") | |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
2585 (kill-region (point) (progn (forward-word arg) (point)))) |
475 | 2586 |
2587 (defun backward-kill-word (arg) | |
2588 "Kill characters backward until encountering the end of a word. | |
2589 With argument, do this that many times." | |
2590 (interactive "p") | |
2591 (kill-word (- arg))) | |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2592 |
6174
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2593 (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
|
2594 "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
|
2595 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
|
2596 or adjacent to a word." |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2597 (save-excursion |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2598 (let ((oldpoint (point)) (start (point)) (end (point))) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2599 (skip-syntax-backward "w_") (setq start (point)) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2600 (goto-char oldpoint) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2601 (skip-syntax-forward "w_") (setq end (point)) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2602 (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
|
2603 ;; 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
|
2604 (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
|
2605 (progn |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2606 ;; 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
|
2607 (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
|
2608 (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
|
2609 (point))) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2610 (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
|
2611 ;; 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
|
2612 ;; 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
|
2613 (progn |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2614 (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
|
2615 (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
|
2616 (point))) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2617 (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
|
2618 (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
|
2619 (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
|
2620 (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
|
2621 (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
|
2622 (setq start (point))) |
18379
1dd6f63f0ea3
(paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18334
diff
changeset
|
2623 (buffer-substring-no-properties start end))) |
1dd6f63f0ea3
(paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18334
diff
changeset
|
2624 (buffer-substring-no-properties start end))))) |
475 | 2625 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2626 (defcustom fill-prefix nil |
475 | 2627 "*String for filling to insert at front of new line, or nil for none. |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2628 Setting this variable automatically makes it local to the current buffer." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2629 :type '(choice (const :tag "None" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2630 string) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2631 :group 'fill) |
475 | 2632 (make-variable-buffer-local 'fill-prefix) |
2633 | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2634 (defcustom auto-fill-inhibit-regexp nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2635 "*Regexp to match lines which should not be auto-filled." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2636 :type '(choice (const :tag "None" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2637 regexp) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2638 :group 'fill) |
475 | 2639 |
19160
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2640 (defvar comment-line-break-function 'indent-new-comment-line |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2641 "*Mode-specific function which line breaks and continues a comment. |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2642 |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2643 This function is only called during auto-filling of a comment section. |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2644 The function should take a single optional argument, which is a flag |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2645 indicating whether it should use soft newlines. |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2646 |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2647 Setting this variable automatically makes it local to the current buffer.") |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2648 |
15263
0d7899c372ed
(do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents:
15115
diff
changeset
|
2649 ;; This function is the auto-fill-function of a buffer |
0d7899c372ed
(do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents:
15115
diff
changeset
|
2650 ;; when Auto-Fill mode is enabled. |
0d7899c372ed
(do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents:
15115
diff
changeset
|
2651 ;; It returns t if it really did any work. |
475 | 2652 (defun do-auto-fill () |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2653 (let (fc justify bol give-up |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2654 (fill-prefix fill-prefix)) |
10471
3eb77f03f53e
(do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents:
10469
diff
changeset
|
2655 (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
|
2656 (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
|
2657 (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
|
2658 (<= (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
|
2659 (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
|
2660 (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
|
2661 (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
|
2662 (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
|
2663 nil ;; Auto-filling not required |
10813
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
2664 (if (memq justify '(full center right)) |
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
2665 (save-excursion (unjustify-current-line))) |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2666 |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2667 ;; Choose a fill-prefix automatically. |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2668 (if (and adaptive-fill-mode |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2669 (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
|
2670 (let ((prefix |
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2671 (fill-context-prefix |
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2672 (save-excursion (backward-paragraph 1) (point)) |
18034
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
2673 (save-excursion (forward-paragraph 1) (point))))) |
13587
a0c1c62e2c4a
(do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents:
13525
diff
changeset
|
2674 (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
|
2675 (setq fill-prefix prefix)))) |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
2676 |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2677 (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
|
2678 ;; Determine where to split the line. |
19343
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2679 (let* (after-prefix |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2680 (fill-point |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2681 (let ((opoint (point)) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2682 bounce |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2683 (first t)) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2684 (save-excursion |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2685 (beginning-of-line) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2686 (setq after-prefix (point)) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2687 (and fill-prefix |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2688 (looking-at (regexp-quote fill-prefix)) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2689 (setq after-prefix (match-end 0))) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2690 (move-to-column (1+ fc)) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2691 ;; Move back to the point where we can break the |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2692 ;; line at. We break the line between word or |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2693 ;; after/before the character which has character |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2694 ;; category `|'. We search space, \c| followed by |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2695 ;; a character, or \c| follwoing a character. If |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2696 ;; not found, place the point at beginning of line. |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2697 (while (or first |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2698 ;; If this is after period and a single space, |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2699 ;; move back once more--we don't want to break |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2700 ;; the line there and make it look like a |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2701 ;; sentence end. |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2702 (and (not (bobp)) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2703 (not bounce) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2704 sentence-end-double-space |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2705 (save-excursion (forward-char -1) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2706 (and (looking-at "\\. ") |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2707 (not (looking-at "\\. ")))))) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2708 (setq first nil) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2709 (re-search-backward "[ \t]\\|\\c|.\\|.\\c|\\|^") |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2710 ;; If we find nowhere on the line to break it, |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2711 ;; break after one word. Set bounce to t |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2712 ;; so we will not keep going in this while loop. |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2713 (if (<= (point) after-prefix) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2714 (progn |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2715 (goto-char after-prefix) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2716 (re-search-forward "[ \t]" opoint t) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2717 (setq bounce t)) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2718 (if (looking-at "[ \t]") |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2719 ;; Break the line at word boundary. |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2720 (skip-chars-backward " \t") |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2721 ;; Break the line after/before \c|. |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2722 (forward-char 1)))) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2723 (if (and enable-kinsoku enable-multibyte-characters) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2724 (kinsoku (save-excursion |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2725 (forward-line 0) (point)))) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2726 ;; Let fill-point be set to the place where we end up. |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2727 (point))))) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2728 |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2729 ;; See whether the place we found is any good. |
12718
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2730 (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
|
2731 (goto-char fill-point) |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2732 (and (not (bolp)) |
19343
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2733 ;; There is no use breaking at end of line. |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2734 (not (save-excursion (skip-chars-forward " ") (eolp))) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2735 ;; It is futile to split at the end of the prefix |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2736 ;; since we would just insert the prefix again. |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2737 (not (and after-prefix (<= (point) after-prefix))) |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2738 ;; Don't split right after a comment starter |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2739 ;; since we would just make another comment starter. |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2740 (not (and comment-start-skip |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2741 (let ((limit (point))) |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2742 (beginning-of-line) |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2743 (and (re-search-forward comment-start-skip |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2744 limit t) |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2745 (eq (point) limit))))))) |
19343
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2746 ;; Ok, we have a useful place to break the line. Do it. |
12718
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2747 (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
|
2748 ;; 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
|
2749 ;; 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
|
2750 ;; 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
|
2751 (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
|
2752 (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
|
2753 (= (point) fill-point)) |
19160
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2754 (funcall comment-line-break-function t) |
12718
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2755 (save-excursion |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2756 (goto-char fill-point) |
19160
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
2757 (funcall comment-line-break-function t))) |
12718
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2758 ;; 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
|
2759 (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
|
2760 (save-excursion |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2761 (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
|
2762 (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
|
2763 ;; 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
|
2764 ;; 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
|
2765 ;; 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
|
2766 (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
|
2767 (setq give-up t))) |
19343
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
2768 ;; No good place to break => stop trying. |
12718
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
2769 (setq give-up t)))) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2770 ;; Justify last line. |
15263
0d7899c372ed
(do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents:
15115
diff
changeset
|
2771 (justify-current-line justify t t) |
0d7899c372ed
(do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents:
15115
diff
changeset
|
2772 t))) |
475 | 2773 |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2774 (defvar normal-auto-fill-function 'do-auto-fill |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2775 "The function to use for `auto-fill-function' if Auto Fill mode is turned on. |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2776 Some major modes set this.") |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2777 |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2778 (defun auto-fill-mode (&optional arg) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2779 "Toggle Auto Fill mode. |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2780 With arg, turn Auto Fill mode on if and only if arg is positive. |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2781 In Auto Fill mode, inserting a space at a column beyond `current-fill-column' |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2782 automatically breaks the line at a previous space. |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2783 |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2784 The value of `normal-auto-fill-function' specifies the function to use |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2785 for `auto-fill-function' when turning Auto Fill mode on." |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2786 (interactive "P") |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2787 (prog1 (setq auto-fill-function |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2788 (if (if (null arg) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2789 (not auto-fill-function) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2790 (> (prefix-numeric-value arg) 0)) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
2791 normal-auto-fill-function |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2792 nil)) |
11572
09d49f6e0af9
(auto-fill-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11479
diff
changeset
|
2793 (force-mode-line-update))) |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2794 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2795 ;; 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
|
2796 (defun auto-fill-function () |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2797 "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
|
2798 nil) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2799 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2800 (defun turn-on-auto-fill () |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2801 "Unconditionally turn on Auto Fill mode." |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2802 (auto-fill-mode 1)) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2803 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2804 (defun set-fill-column (arg) |
15431
68cca71d69bd
(set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents:
15305
diff
changeset
|
2805 "Set `fill-column' to specified argument. |
68cca71d69bd
(set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents:
15305
diff
changeset
|
2806 Just \\[universal-argument] as argument means to use the current column." |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2807 (interactive "P") |
17874
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
2808 (if (consp arg) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
2809 (setq arg (current-column))) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
2810 (if (not (integerp arg)) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
2811 ;; Disallow missing argument; it's probably a typo for C-x C-f. |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
2812 (error "set-fill-column requires an explicit argument") |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
2813 (message "Fill column set to %d (was %d)" arg fill-column) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
2814 (setq fill-column arg))) |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
2815 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2816 (defcustom comment-multi-line nil |
475 | 2817 "*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
|
2818 on new line, with no new terminator or starter. |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2819 This is obsolete because you might as well use \\[newline-and-indent]." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2820 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2821 :group 'fill-comments) |
475 | 2822 |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
2823 (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
|
2824 "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
|
2825 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
|
2826 under the previous comment line. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2827 |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2828 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
|
2829 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
|
2830 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
|
2831 |
12624
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2832 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
|
2833 or comment indentation. |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2834 |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
2835 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
|
2836 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
|
2837 (interactive) |
475 | 2838 (let (comcol comstart) |
2839 (skip-chars-backward " \t") | |
2840 (delete-region (point) | |
2841 (progn (skip-chars-forward " \t") | |
2842 (point))) | |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
2843 (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
|
2844 (if fill-prefix |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2845 (progn |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2846 (indent-to-left-margin) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2847 (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
|
2848 (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
|
2849 (save-excursion |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2850 (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
|
2851 (let ((opoint (point))) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2852 (forward-line -1) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2853 (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
|
2854 ;; 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
|
2855 ;; 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
|
2856 ;; 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
|
2857 ;; 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
|
2858 |
12624
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2859 ;; 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
|
2860 ;; 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
|
2861 (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
|
2862 (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
|
2863 (let (opoint) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2864 (beginning-of-line) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2865 (setq opoint (point)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2866 (forward-line -1) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2867 (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
|
2868 (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
|
2869 ;; 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
|
2870 (goto-char win) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2871 (setq comcol (current-column)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2872 (setq comstart |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2873 (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
|
2874 (if comcol |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2875 (let ((comment-column comcol) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2876 (comment-start comstart) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2877 (comment-end comment-end)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2878 (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
|
2879 ; (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
|
2880 (progn |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2881 (forward-char -1) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2882 (insert comment-end) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2883 (forward-char 1)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2884 ; (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
|
2885 ; comment-start "") |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2886 ; ) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2887 ) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2888 (if (not (eolp)) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2889 (setq comment-end "")) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2890 (insert-and-inherit ?\n) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2891 (forward-char -1) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2892 (indent-for-comment) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2893 (save-excursion |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2894 ;; 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
|
2895 (end-of-line) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2896 (delete-char 1))) |
8ba65cbc8abe
(indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents:
12565
diff
changeset
|
2897 (indent-according-to-mode))))) |
475 | 2898 |
2899 (defun set-selective-display (arg) | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2900 "Set `selective-display' to ARG; clear it if no arg. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2901 When the value of `selective-display' is a number > 0, |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2902 lines whose indentation is >= that value are not displayed. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2903 The variable `selective-display' has a separate value for each buffer." |
475 | 2904 (interactive "P") |
2905 (if (eq selective-display t) | |
2906 (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
|
2907 (let ((current-vpos |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2908 (save-restriction |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2909 (narrow-to-region (point-min) (point)) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2910 (goto-char (window-start)) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2911 (vertical-motion (window-height))))) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2912 (setq selective-display |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2913 (and arg (prefix-numeric-value arg))) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2914 (recenter current-vpos)) |
475 | 2915 (set-window-start (selected-window) (window-start (selected-window))) |
2916 (princ "selective-display set to " t) | |
2917 (prin1 selective-display t) | |
2918 (princ "." t)) | |
2919 | |
17471
f383bfae3202
(overwrite-mode-binary, overwrite-mode-textual): Use defvar.
Richard M. Stallman <rms@gnu.org>
parents:
17355
diff
changeset
|
2920 (defvar overwrite-mode-textual " Ovwrt" |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2921 "The string displayed in the mode line when in overwrite mode.") |
17471
f383bfae3202
(overwrite-mode-binary, overwrite-mode-textual): Use defvar.
Richard M. Stallman <rms@gnu.org>
parents:
17355
diff
changeset
|
2922 (defvar overwrite-mode-binary " Bin Ovwrt" |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2923 "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
|
2924 |
475 | 2925 (defun overwrite-mode (arg) |
2926 "Toggle overwrite mode. | |
2927 With arg, turn overwrite mode on iff arg is positive. | |
2928 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
|
2929 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
|
2930 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
|
2931 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
|
2932 \\[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
|
2933 is supposed to make it easier to insert characters when necessary." |
475 | 2934 (interactive "P") |
2935 (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
|
2936 (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
|
2937 (> (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
|
2938 '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
|
2939 (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
|
2940 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2941 (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
|
2942 "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
|
2943 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
|
2944 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
|
2945 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
|
2946 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
|
2947 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
|
2948 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
|
2949 \\[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
|
2950 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
|
2951 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2952 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
|
2953 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
|
2954 `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
|
2955 (interactive "P") |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
2956 (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
|
2957 (if (if (null arg) |
2301
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2958 (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
|
2959 (> (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
|
2960 '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
|
2961 (force-mode-line-update)) |
475 | 2962 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2963 (defcustom line-number-mode t |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2964 "*Non-nil means display line number in mode line." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2965 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2966 :group 'editing-basics) |
2301
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2967 |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2968 (defun line-number-mode (arg) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2969 "Toggle Line Number mode. |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2970 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
|
2971 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
|
2972 in the mode line." |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2973 (interactive "P") |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2974 (setq line-number-mode |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2975 (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
|
2976 (> (prefix-numeric-value arg) 0))) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2977 (force-mode-line-update)) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
2978 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2979 (defcustom column-number-mode nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2980 "*Non-nil means display column number in mode line." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2981 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2982 :group 'editing-basics) |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2983 |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2984 (defun column-number-mode (arg) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2985 "Toggle Column Number mode. |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2986 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
|
2987 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
|
2988 in the mode line." |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2989 (interactive "P") |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2990 (setq column-number-mode |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2991 (if (null arg) (not column-number-mode) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2992 (> (prefix-numeric-value arg) 0))) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2993 (force-mode-line-update)) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2994 |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
2995 (defgroup paren-blinking nil |
18379
1dd6f63f0ea3
(paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18334
diff
changeset
|
2996 "Blinking matching of parens and expressions." |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
2997 :prefix "blink-matching-" |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
2998 :group 'paren-matching) |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
2999 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3000 (defcustom blink-matching-paren t |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3001 "*Non-nil means show matching open-paren when close-paren is inserted." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3002 :type 'boolean |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3003 :group 'paren-blinking) |
475 | 3004 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3005 (defcustom blink-matching-paren-on-screen t |
13810
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
3006 "*Non-nil means show matching open-paren when it is on screen. |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3007 If nil, means don't show it (but the open-paren can still be shown |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3008 when it is off screen)." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3009 :type 'boolean |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3010 :group 'paren-blinking) |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3011 |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3012 (defcustom blink-matching-paren-distance (* 25 1024) |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3013 "*If non-nil, is maximum distance to search for matching open-paren." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3014 :type 'integer |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3015 :group 'paren-blinking) |
475 | 3016 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3017 (defcustom blink-matching-delay 1 |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3018 "*Time in seconds to delay after showing a matching paren." |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3019 :type 'number |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3020 :group 'paren-blinking) |
9771
3a51735d4a55
(blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9750
diff
changeset
|
3021 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3022 (defcustom blink-matching-paren-dont-ignore-comments nil |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3023 "*Non-nil means `blink-matching-paren' will not ignore comments." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3024 :type 'boolean |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3025 :group 'paren-blinking) |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3026 |
475 | 3027 (defun blink-matching-open () |
3028 "Move cursor momentarily to the beginning of the sexp before point." | |
3029 (interactive) | |
3030 (and (> (point) (1+ (point-min))) | |
3031 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
|
3032 ;; 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
|
3033 (= 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
|
3034 (save-excursion |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
3035 (forward-char -1) |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
3036 (skip-syntax-backward "/\\") |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
3037 (point))))) |
475 | 3038 (let* ((oldpos (point)) |
3039 (blinkpos) | |
3040 (mismatch)) | |
3041 (save-excursion | |
3042 (save-restriction | |
3043 (if blink-matching-paren-distance | |
3044 (narrow-to-region (max (point-min) | |
3045 (- (point) blink-matching-paren-distance)) | |
3046 oldpos)) | |
3047 (condition-case () | |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3048 (let ((parse-sexp-ignore-comments |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3049 (and parse-sexp-ignore-comments |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3050 (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
|
3051 (setq blinkpos (scan-sexps oldpos -1))) |
475 | 3052 (error nil))) |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3053 (and blinkpos |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3054 (/= (char-syntax (char-after blinkpos)) |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3055 ?\$) |
475 | 3056 (setq mismatch |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3057 (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
|
3058 (/= (char-after (1- oldpos)) |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3059 (matching-paren (char-after blinkpos)))))) |
475 | 3060 (if mismatch (setq blinkpos nil)) |
3061 (if blinkpos | |
3062 (progn | |
3063 (goto-char blinkpos) | |
3064 (if (pos-visible-in-window-p) | |
13810
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
3065 (and blink-matching-paren-on-screen |
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
3066 (sit-for blink-matching-delay)) |
475 | 3067 (goto-char blinkpos) |
3068 (message | |
3069 "Matches %s" | |
6539
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3070 ;; Show what precedes the open in its line, if anything. |
475 | 3071 (if (save-excursion |
3072 (skip-chars-backward " \t") | |
3073 (not (bolp))) | |
3074 (buffer-substring (progn (beginning-of-line) (point)) | |
3075 (1+ blinkpos)) | |
6539
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3076 ;; 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
|
3077 (if (save-excursion |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3078 (forward-char 1) |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3079 (skip-chars-forward " \t") |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3080 (not (eolp))) |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3081 (buffer-substring blinkpos |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3082 (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
|
3083 ;; 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
|
3084 ;; if there is one. |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3085 (if (save-excursion |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3086 (skip-chars-backward "\n \t") |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3087 (not (bobp))) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3088 (concat |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3089 (buffer-substring (progn |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3090 (skip-chars-backward "\n \t") |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3091 (beginning-of-line) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3092 (point)) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3093 (progn (end-of-line) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3094 (skip-chars-backward " \t") |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3095 (point))) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3096 ;; 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
|
3097 "..." |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3098 (buffer-substring blinkpos (1+ blinkpos))) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3099 ;; 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
|
3100 (buffer-substring blinkpos (1+ blinkpos)))))))) |
475 | 3101 (cond (mismatch |
3102 (message "Mismatched parentheses")) | |
3103 ((not blink-matching-paren-distance) | |
3104 (message "Unmatched parenthesis")))))))) | |
3105 | |
3106 ;Turned off because it makes dbx bomb out. | |
3107 (setq blink-paren-function 'blink-matching-open) | |
3108 | |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
3109 ;; 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
|
3110 ;; 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
|
3111 ;; that happens in the QUIT macro at the C code level. |
475 | 3112 (defun keyboard-quit () |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
3113 "Signal a quit condition. |
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
3114 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
|
3115 At top-level, as an editor command, this simply beeps." |
475 | 3116 (interactive) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3117 (deactivate-mark) |
475 | 3118 (signal 'quit nil)) |
3119 | |
3120 (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
|
3121 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3122 (defvar buffer-quit-function nil |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3123 "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
|
3124 \\[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
|
3125 \(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
|
3126 |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3127 (defun keyboard-escape-quit () |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3128 "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
|
3129 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
|
3130 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
|
3131 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
|
3132 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
|
3133 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
|
3134 (interactive) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3135 (cond ((eq last-command 'mode-exited) nil) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3136 ((> (minibuffer-depth) 0) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3137 (abort-recursive-edit)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3138 (current-prefix-arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3139 nil) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3140 ((and transient-mark-mode |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3141 mark-active) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3142 (deactivate-mark)) |
17355
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
3143 ((> (recursion-depth) 0) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
3144 (exit-recursive-edit)) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3145 (buffer-quit-function |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3146 (funcall buffer-quit-function)) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3147 ((not (one-window-p t)) |
17355
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
3148 (delete-other-windows)) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
3149 ((string-match "^ \\*" (buffer-name (current-buffer))) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
3150 (bury-buffer)))) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3151 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3152 (define-key global-map "\e\e\e" 'keyboard-escape-quit) |
475 | 3153 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3154 (defcustom mail-user-agent 'sendmail-user-agent |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3155 "*Your preference for a mail composition package. |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3156 Various Emacs Lisp packages (e.g. reporter) require you to compose an |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3157 outgoing email message. This variable lets you specify which |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3158 mail-sending package you prefer. |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3159 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3160 Valid values include: |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3161 |
16624
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3162 sendmail-user-agent -- use the default Emacs Mail package |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3163 mh-e-user-agent -- use the Emacs interface to the MH mail system |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3164 message-user-agent -- use the GNUS mail sending package |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3165 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3166 Additional valid symbols may be available; check with the author of |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3167 your package for details." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3168 :type '(radio (function-item :tag "Default Emacs mail" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3169 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3170 sendmail-user-agent) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3171 (function-item :tag "Emacs interface to MH" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3172 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3173 mh-e-user-agent) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3174 (function-item :tag "Gnus mail sending package" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3175 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3176 message-user-agent) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3177 (function :tag "Other")) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3178 :group 'mail) |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3179 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3180 (defun define-mail-user-agent (symbol composefunc sendfunc |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3181 &optional abortfunc hookvar) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3182 "Define a symbol to identify a mail-sending package for `mail-user-agent'. |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3183 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3184 SYMBOL can be any Lisp symbol. Its function definition and/or |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3185 value as a variable do not matter for this usage; we use only certain |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3186 properties on its property list, to encode the rest of the arguments. |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3187 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3188 COMPOSEFUNC is program callable function that composes an outgoing |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3189 mail message buffer. This function should set up the basics of the |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3190 buffer without requiring user interaction. It should populate the |
16624
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3191 standard mail headers, leaving the `to:' and `subject:' headers blank |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3192 by default. |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3193 |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3194 COMPOSEFUNC should accept several optional arguments--the same |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3195 arguments that `compose-mail' takes. See that function's documentation. |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3196 |
16624
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3197 SENDFUNC is the command a user would run to send the message. |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3198 |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3199 Optional ABORTFUNC is the command a user would run to abort the |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3200 message. For mail packages that don't have a separate abort function, |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3201 this can be `kill-buffer' (the equivalent of omitting this argument). |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3202 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3203 Optional HOOKVAR is a hook variable that gets run before the message |
16624
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3204 is actually sent. Callers that use the `mail-user-agent' may |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3205 install a hook function temporarily on this hook variable. |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3206 If HOOKVAR is nil, `mail-send-hook' is used. |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3207 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3208 The properties used on SYMBOL are `composefunc', `sendfunc', |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3209 `abortfunc', and `hookvar'." |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3210 (put symbol 'composefunc composefunc) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3211 (put symbol 'sendfunc sendfunc) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3212 (put symbol 'abortfunc (or abortfunc 'kill-buffer)) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3213 (put symbol 'hookvar (or hookvar 'mail-send-hook))) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3214 |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3215 (defun assoc-ignore-case (key alist) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3216 "Like `assoc', but assumes KEY is a string and ignores case when comparing." |
17713
be8005fce86f
(quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents:
17663
diff
changeset
|
3217 (setq key (downcase key)) |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3218 (let (element) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3219 (while (and alist (not element)) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3220 (if (equal key (downcase (car (car alist)))) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3221 (setq element (car alist))) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3222 (setq alist (cdr alist))) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3223 element)) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3224 |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3225 (define-mail-user-agent 'sendmail-user-agent |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3226 'sendmail-user-agent-compose |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3227 'mail-send-and-exit) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3228 |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3229 (defun sendmail-user-agent-compose (&optional to subject other-headers continue |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3230 switch-function yank-action |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3231 send-actions) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3232 (if switch-function |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3233 (let ((special-display-buffer-names nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3234 (special-display-regexps nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3235 (same-window-buffer-names nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3236 (same-window-regexps nil)) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3237 (funcall switch-function "*mail*"))) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3238 (let ((cc (cdr (assoc-ignore-case "cc" other-headers))) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3239 (in-reply-to (cdr (assoc-ignore-case "in-reply-to" other-headers)))) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3240 (or (mail continue to subject in-reply-to cc yank-action send-actions) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3241 continue |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3242 (error "Message aborted")) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3243 (save-excursion |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3244 (goto-char (point-min)) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3245 (search-forward mail-header-separator) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3246 (beginning-of-line) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3247 (while other-headers |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3248 (if (not (member (car (car other-headers)) '("in-reply-to" "cc"))) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3249 (insert (car (car other-headers)) ": " |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3250 (cdr (car other-headers)) "\n")) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3251 (setq other-headers (cdr other-headers))) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3252 t))) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3253 |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3254 (define-mail-user-agent 'mh-e-user-agent |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3255 'mh-smail-batch 'mh-send-letter 'mh-fully-kill-draft |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3256 'mh-before-send-letter-hook) |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3257 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3258 (defun compose-mail (&optional to subject other-headers continue |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3259 switch-function yank-action send-actions) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3260 "Start composing a mail message to send. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3261 This uses the user's chosen mail composition package |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3262 as selected with the variable `mail-user-agent'. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3263 The optional arguments TO and SUBJECT specify recipients |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3264 and the initial Subject field, respectively. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3265 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3266 OTHER-HEADERS is an alist specifying additional |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3267 header fields. Elements look like (HEADER . VALUE) where both |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3268 HEADER and VALUE are strings. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3269 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3270 CONTINUE, if non-nil, says to continue editing a message already |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3271 being composed. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3272 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3273 SWITCH-FUNCTION, if non-nil, is a function to use to |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3274 switch to and display the buffer used for mail composition. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3275 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3276 YANK-ACTION, if non-nil, is an action to perform, if and when necessary, |
16717
18d451689307
(compose-mail): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16685
diff
changeset
|
3277 to insert the raw text of the message being replied to. |
18d451689307
(compose-mail): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16685
diff
changeset
|
3278 It has the form (FUNCTION . ARGS). The user agent will apply |
18d451689307
(compose-mail): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16685
diff
changeset
|
3279 FUNCTION to ARGS, to insert the raw text of the original message. |
18d451689307
(compose-mail): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16685
diff
changeset
|
3280 \(The user agent will also run `mail-citation-hook', *after* the |
18d451689307
(compose-mail): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16685
diff
changeset
|
3281 original text has been inserted in this way.) |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3282 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3283 SEND-ACTIONS is a list of actions to call when the message is sent. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3284 Each action has the form (FUNCTION . ARGS)." |
17594
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3285 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3286 (list nil nil nil current-prefix-arg)) |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3287 (let ((function (get mail-user-agent 'composefunc))) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3288 (funcall function to subject other-headers continue |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3289 switch-function yank-action send-actions))) |
17594
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3290 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3291 (defun compose-mail-other-window (&optional to subject other-headers continue |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3292 yank-action send-actions) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3293 "Like \\[compose-mail], but edit the outgoing message in another window." |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3294 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3295 (list nil nil nil current-prefix-arg)) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3296 (compose-mail to subject other-headers continue |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3297 'switch-to-buffer-other-window yank-action send-actions)) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3298 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3299 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3300 (defun compose-mail-other-frame (&optional to subject other-headers continue |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3301 yank-action send-actions) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3302 "Like \\[compose-mail], but edit the outgoing message in another frame." |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3303 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3304 (list nil nil nil current-prefix-arg)) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3305 (compose-mail to subject other-headers continue |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3306 'switch-to-buffer-other-frame yank-action send-actions)) |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3307 |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3308 (defvar set-variable-value-history nil |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3309 "History of values entered with `set-variable'.") |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3310 |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3311 (defun set-variable (var val) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3312 "Set VARIABLE to VALUE. VALUE is a Lisp object. |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3313 When using this interactively, enter a Lisp object for VALUE. |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3314 If you want VALUE to be a string, you must surround it with doublequotes. |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3315 VALUE is used literally, not evaluated. |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3316 |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3317 If VARIABLE has a `variable-interactive' property, that is used as if |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3318 it were the arg to `interactive' (which see) to interactively read VALUE. |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3319 |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3320 If VARIABLE has been defined with `defcustom', then the type information |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3321 in the definition is used to check that VALUE is valid." |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3322 (interactive (let* ((var (read-variable "Set variable: ")) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3323 (minibuffer-help-form '(describe-variable var)) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3324 (prop (get var 'variable-interactive)) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3325 (prompt (format "Set %s to value: " var)) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3326 (val (if prop |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3327 ;; Use VAR's `variable-interactive' property |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3328 ;; as an interactive spec for prompting. |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3329 (call-interactively `(lambda (arg) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3330 (interactive ,prop) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3331 arg)) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3332 (read |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3333 (read-string prompt nil |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3334 'set-variable-value-history))))) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3335 (list var val))) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3336 |
17613
7dadfa677617
(set-variable): Simplify previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17606
diff
changeset
|
3337 (let ((type (get var 'custom-type))) |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3338 (when type |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3339 ;; Match with custom type. |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3340 (require 'wid-edit) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3341 (setq type (widget-convert type)) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3342 (unless (widget-apply type :match val) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3343 (error "Value `%S' does not match type %S of %S" |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3344 val (car type) var)))) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3345 (set var val)) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3346 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3347 ;; Define the major mode for lists of completions. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3348 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3349 (defvar completion-list-mode-map nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3350 "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
|
3351 (or completion-list-mode-map |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3352 (let ((map (make-sparse-keymap))) |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3353 (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
|
3354 (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
|
3355 (define-key map "\C-m" 'choose-completion) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3356 (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
|
3357 (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
|
3358 (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
|
3359 (setq completion-list-mode-map map))) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3360 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3361 ;; 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
|
3362 (put 'completion-list-mode 'mode-class 'special) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3363 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3364 (defvar completion-reference-buffer nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3365 "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
|
3366 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
|
3367 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
|
3368 |
16924
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3369 (defvar completion-no-auto-exit nil |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3370 "Non-nil means `choose-completion-string' should never exit the minibuffer. |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3371 This also applies to other functions such as `choose-completion' |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3372 and `mouse-choose-completion'.") |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3373 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3374 (defvar completion-base-size nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3375 "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
|
3376 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
|
3377 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
|
3378 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
|
3379 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
|
3380 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3381 (defun delete-completion-window () |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3382 "Delete the completion list window. |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3383 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
|
3384 (interactive) |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3385 (let ((buf completion-reference-buffer)) |
16851
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3386 (if (one-window-p t) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3387 (if (window-dedicated-p (selected-window)) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3388 (delete-frame (selected-frame))) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3389 (delete-window (selected-window)) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3390 (if (get-buffer-window buf) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3391 (select-window (get-buffer-window buf)))))) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3392 |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3393 (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
|
3394 "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
|
3395 (interactive "p") |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3396 (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
|
3397 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3398 (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
|
3399 "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
|
3400 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
|
3401 (interactive "p") |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3402 (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
|
3403 (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
|
3404 (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
|
3405 ;; 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
|
3406 (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
|
3407 (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
|
3408 ;; 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
|
3409 (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
|
3410 (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
|
3411 (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
|
3412 (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
|
3413 (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
|
3414 ;; 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
|
3415 (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
|
3416 (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
|
3417 (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
|
3418 ;; 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
|
3419 (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
|
3420 ;; 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
|
3421 (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
|
3422 (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
|
3423 |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3424 (defun choose-completion () |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3425 "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
|
3426 (interactive) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3427 (let (beg end completion (buffer completion-reference-buffer) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3428 (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
|
3429 (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
|
3430 (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
|
3431 (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
|
3432 (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
|
3433 (if (null beg) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
3434 (error "No completion here")) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
3435 (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
|
3436 (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
|
3437 (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
|
3438 (let ((owindow (selected-window))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
3439 (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
|
3440 (window-dedicated-p (selected-window))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
3441 ;; 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
|
3442 (iconify-frame (selected-frame)) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
3443 (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
|
3444 (bury-buffer))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
3445 (select-window owindow)) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3446 (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
|
3447 |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3448 ;; 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
|
3449 ;; that can be found before POINT. |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3450 (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
|
3451 (let ((opoint (point)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3452 (len (min (length string) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3453 (- (point) (point-min))))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3454 (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
|
3455 (if completion-ignore-case |
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
3456 (setq string (downcase string))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3457 (while (and (> len 0) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3458 (let ((tail (buffer-substring (point) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3459 (+ (point) len)))) |
7574
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
3460 (if completion-ignore-case |
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
3461 (setq tail (downcase tail))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3462 (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
|
3463 (setq len (1- len)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3464 (forward-char 1)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3465 (delete-char len))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3466 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3467 ;; 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
|
3468 ;; 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
|
3469 ;; to keep. If it is nil, use choose-completion-delete-max-match instead. |
15484
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3470 |
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3471 ;; If BUFFER is the minibuffer, exit the minibuffer |
16924
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3472 ;; unless it is reading a file name and CHOICE is a directory, |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3473 ;; or completion-no-auto-exit is non-nil. |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3474 (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
|
3475 (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
|
3476 ;; 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
|
3477 ;; active minibuffer. |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3478 (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
|
3479 (or (not (active-minibuffer-window)) |
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
3480 (not (equal buffer |
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
3481 (window-buffer (active-minibuffer-window)))))) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3482 (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
|
3483 ;; 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
|
3484 (set-buffer buffer) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3485 (if base-size |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3486 (delete-region (+ base-size (point-min)) (point)) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3487 (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
|
3488 (insert choice) |
7697
b52a92ea3796
(choose-completion-string): Clear mouse-face property.
Richard M. Stallman <rms@gnu.org>
parents:
7594
diff
changeset
|
3489 (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
|
3490 '(mouse-face nil)) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3491 ;; 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
|
3492 (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
|
3493 (set-window-point window (point))) |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3494 ;; If completing for the minibuffer, exit it with this choice. |
16924
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3495 (and (not completion-no-auto-exit) |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3496 (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
|
3497 minibuffer-completion-table |
15484
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3498 ;; If this is reading a file name, and the file name chosen |
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3499 ;; is a directory, don't exit the minibuffer. |
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3500 (if (and (eq minibuffer-completion-table 'read-file-name-internal) |
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3501 (file-directory-p (buffer-string))) |
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3502 (select-window (active-minibuffer-window)) |
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3503 (exit-minibuffer)))))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3504 |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
3505 (defun completion-list-mode () |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3506 "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
|
3507 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
|
3508 to select the completion near point. |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3509 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
|
3510 with the mouse." |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3511 (interactive) |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3512 (kill-all-local-variables) |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
3513 (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
|
3514 (setq mode-name "Completion List") |
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
3515 (setq major-mode 'completion-list-mode) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3516 (make-local-variable 'completion-base-size) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3517 (setq completion-base-size nil) |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
3518 (run-hooks 'completion-list-mode-hook)) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3519 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3520 (defvar completion-fixup-function nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3521 "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
|
3522 `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
|
3523 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
|
3524 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
|
3525 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
|
3526 |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3527 ;; 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
|
3528 ;; 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
|
3529 |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3530 (defun completion-setup-function () |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3531 (save-excursion |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3532 (let ((mainbuf (current-buffer))) |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3533 (set-buffer standard-output) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3534 (completion-list-mode) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3535 (make-local-variable 'completion-reference-buffer) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3536 (setq completion-reference-buffer mainbuf) |
18034
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3537 (if (eq minibuffer-completion-table 'read-file-name-internal) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3538 ;; For file name completion, |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3539 ;; use the number of chars before the start of the |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3540 ;; last file name component. |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3541 (setq completion-base-size |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3542 (save-excursion |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3543 (set-buffer mainbuf) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3544 (goto-char (point-max)) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3545 (skip-chars-backward (format "^%c" directory-sep-char)) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3546 (- (point) (point-min)))) |
19227
84c681e58fd5
(completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents:
19160
diff
changeset
|
3547 ;; Otherwise, in minibuffer, the whole input is being completed. |
84c681e58fd5
(completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents:
19160
diff
changeset
|
3548 (save-match-data |
84c681e58fd5
(completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents:
19160
diff
changeset
|
3549 (if (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" |
84c681e58fd5
(completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents:
19160
diff
changeset
|
3550 (buffer-name mainbuf)) |
84c681e58fd5
(completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents:
19160
diff
changeset
|
3551 (setq completion-base-size 0)))) |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3552 (goto-char (point-min)) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3553 (if window-system |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3554 (insert (substitute-command-keys |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3555 "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
|
3556 (insert (substitute-command-keys |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3557 "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
|
3558 select the completion near point.\n\n")) |
7ada27b4bf3c
(completion-setup-function): Add mouse-face properties.
Karl Heuer <kwzh@gnu.org>
parents:
6549
diff
changeset
|
3559 (forward-line 1) |
8203
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
3560 (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
|
3561 (let ((beg (match-beginning 0)) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
3562 (end (point))) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
3563 (if completion-fixup-function |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
3564 (funcall completion-fixup-function)) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
3565 (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
|
3566 (goto-char end)))))) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3567 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3568 (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
|
3569 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3570 (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
|
3571 '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
|
3572 (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
|
3573 '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
|
3574 (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
|
3575 '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
|
3576 (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
|
3577 '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
|
3578 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3579 (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
|
3580 "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
|
3581 (interactive) |
12483
ec77cb3940f1
(switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents:
12428
diff
changeset
|
3582 ;; 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
|
3583 (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
|
3584 (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
|
3585 (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
|
3586 (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
|
3587 (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
|
3588 (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
|
3589 |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3590 ;; Support keyboard commands to turn on various modifiers. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3591 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3592 ;; 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
|
3593 ;; to the following event. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3594 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3595 (defun event-apply-alt-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3596 (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
|
3597 (defun event-apply-super-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3598 (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
|
3599 (defun event-apply-hyper-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3600 (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
|
3601 (defun event-apply-shift-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3602 (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
|
3603 (defun event-apply-control-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3604 (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
|
3605 (defun event-apply-meta-modifier (ignore-prompt) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3606 (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
|
3607 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3608 (defun event-apply-modifier (event symbol lshiftby prefix) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3609 "Apply a modifier flag to event EVENT. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3610 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
|
3611 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
|
3612 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
|
3613 (if (numberp event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3614 (cond ((eq symbol 'control) |
11201
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3615 (if (and (<= (downcase event) ?z) |
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3616 (>= (downcase event) ?a)) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3617 (- (downcase event) ?a -1) |
11201
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3618 (if (and (<= (downcase event) ?Z) |
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3619 (>= (downcase event) ?A)) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3620 (- (downcase event) ?A -1) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3621 (logior (lsh 1 lshiftby) event)))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3622 ((eq symbol 'shift) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3623 (if (and (<= (downcase event) ?z) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3624 (>= (downcase event) ?a)) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3625 (upcase event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3626 (logior (lsh 1 lshiftby) event))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3627 (t |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3628 (logior (lsh 1 lshiftby) event))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3629 (if (memq symbol (event-modifiers event)) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3630 event |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3631 (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
|
3632 (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
|
3633 (if (symbolp event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3634 event-type |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3635 (cons event-type (cdr event))))))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3636 |
11206
60b7ab7d4fec
Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents:
11201
diff
changeset
|
3637 (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
|
3638 (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
|
3639 (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
|
3640 (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
|
3641 (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
|
3642 (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
|
3643 |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3644 ;;;; Keypad support. |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3645 |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3646 ;;; 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
|
3647 ;;; 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
|
3648 ;;; 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
|
3649 ;;; bindings. |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3650 |
5342
f38861038093
(setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents:
5324
diff
changeset
|
3651 ;; 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
|
3652 (mapcar |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3653 (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
|
3654 (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
|
3655 (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
|
3656 (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
|
3657 (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
|
3658 '((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
|
3659 (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
|
3660 (kp-space ?\ ) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3661 (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
|
3662 (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
|
3663 (kp-multiply ?*) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3664 (kp-add ?+) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3665 (kp-separator ?,) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3666 (kp-subtract ?-) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3667 (kp-decimal ?.) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3668 (kp-divide ?/) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3669 (kp-equal ?=))) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3670 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3671 ;;; simple.el ends here |