annotate lisp/simple.el @ 21960:79c7369b9ab4

(which-function-mode): New alias.
author Richard M. Stallman <rms@gnu.org>
date Wed, 06 May 1998 19:43:11 +0000
parents 2ee50035ee1b
children 632fc074e4d7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
21222
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
3 ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 1998
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4 ;; Free Software Foundation, Inc.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6 ;; This file is part of GNU Emacs.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 ;; GNU Emacs is free software; you can redistribute it and/or modify
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11 ;; any later version.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 ;; GNU Emacs is distributed in the hope that it will be useful,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 ;; GNU General Public License for more details.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13960
diff changeset
19 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13960
diff changeset
20 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13960
diff changeset
21 ;; Boston, MA 02111-1307, USA.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
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))))
21459
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
65 (not (buffer-has-markers-at (point)))
17214
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
66 ;; 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
67 ;; 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
68 (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
69 (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
70 (or (eobp)
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
71 (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
72 ;; 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
73 (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
74 ;; 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
75 (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
76 ;; 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
77 (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
78 ;; 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
79 ;; 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
80 (< (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
81 (- (point) 2))))
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
82 (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
83 (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
84 (beforepos (point)))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
85 (if flag (backward-char 1))
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
86 ;; 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
87 ;; 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
88 (let ((last-command-char ?\n)
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
89 ;; 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
90 ;; 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
91 ;; 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
92 (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
93 (unwind-protect
9e7727cdbb68 (newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents: 12355
diff changeset
94 (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
95 ;; 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
96 (if flag (forward-char 1))))
21459
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
97 ;; Even if we did *not* get an error, keep that forward-char;
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
98 ;; all further processing should apply to the newline that the user
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
99 ;; thinks he inserted.
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
100
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
101 ;; Mark the newline(s) `hard'.
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
102 (if use-hard-newlines
21459
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
103 (set-hard-newline-properties
16018
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
104 (- (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
105 ;; 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
106 ;; 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
107 (or flag
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
108 (save-excursion
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
109 (goto-char beforepos)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
110 (beginning-of-line)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
111 (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
112 (> (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
113 (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
114 ;; 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
115 ;; 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
116 ;; 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
117 (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
118 (move-to-left-margin nil t)))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
119 nil)
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
120
16018
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
121 (defun set-hard-newline-properties (from to)
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
122 (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
123 (put-text-property from to 'hard 't)
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
124 ;; 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
125 (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
126 (put-text-property from (point) 'rear-nonsticky
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
127 (cons 'hard sticky)))))
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
128
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
129 (defun open-line (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
130 "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
131 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
132 if the line would have been blank.
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
133 With arg N, insert N newlines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
134 (interactive "*p")
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
135 (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
136 (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
137 (loc (point)))
11324
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
138 (newline arg)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
139 (goto-char loc)
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
140 (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
141 (cond ((bolp)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
142 (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
143 (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
144 (forward-line 1)
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
145 (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
146 (goto-char loc)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
147 (end-of-line)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
148
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
149 (defun split-line ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
150 "Split current line, moving portion beyond point vertically down."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
151 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152 (skip-chars-forward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 (let ((col (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 (pos (point)))
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
155 (newline 1)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156 (indent-to col 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
157 (goto-char pos)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
159 (defun quoted-insert (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
160 "Read next input character and insert it.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
161 This is useful for inserting control characters.
18822
c9bb90fcf780 (quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18820
diff changeset
162
c9bb90fcf780 (quoted-insert): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18820
diff changeset
163 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
164 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
165 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
166 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
167 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
168 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
169
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
170 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
171 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
172 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
173 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
174
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
175 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
176 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
177 useful for editing binary files."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
178 (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
179 (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
180 (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
181 (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
182 (read-char))))
21040
290a1c16d25d (quoted-insert): Allow direct insertion of codes in
Kenichi Handa <handa@m17n.org>
parents: 20663
diff changeset
183 ;; Assume character codes 0240 - 0377 stand for characters in some
290a1c16d25d (quoted-insert): Allow direct insertion of codes in
Kenichi Handa <handa@m17n.org>
parents: 20663
diff changeset
184 ;; single-byte character set, and convert them to Emacs
290a1c16d25d (quoted-insert): Allow direct insertion of codes in
Kenichi Handa <handa@m17n.org>
parents: 20663
diff changeset
185 ;; characters.
290a1c16d25d (quoted-insert): Allow direct insertion of codes in
Kenichi Handa <handa@m17n.org>
parents: 20663
diff changeset
186 (if (and enable-multibyte-characters
290a1c16d25d (quoted-insert): Allow direct insertion of codes in
Kenichi Handa <handa@m17n.org>
parents: 20663
diff changeset
187 (>= char ?\240)
290a1c16d25d (quoted-insert): Allow direct insertion of codes in
Kenichi Handa <handa@m17n.org>
parents: 20663
diff changeset
188 (<= char ?\377))
290a1c16d25d (quoted-insert): Allow direct insertion of codes in
Kenichi Handa <handa@m17n.org>
parents: 20663
diff changeset
189 (setq char (unibyte-char-to-multibyte char)))
10779
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
190 (if (> arg 0)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
191 (if (eq overwrite-mode 'overwrite-mode-binary)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
192 (delete-char arg)))
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
193 (while (> arg 0)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
194 (insert-and-inherit char)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
195 (setq arg (1- arg)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197 (defun delete-indentation (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198 "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
199 If there is a fill prefix, delete it from the beginning of this line.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200 With argument, join this line to following line."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
202 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
203 (if arg (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
204 (if (eq (preceding-char) ?\n)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 (delete-region (point) (1- (point)))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
207 ;; If the second line started with the fill prefix,
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
208 ;; delete the prefix.
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
209 (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
210 (<= (+ (point) (length fill-prefix)) (point-max))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
211 (string= fill-prefix
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
212 (buffer-substring (point)
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
213 (+ (point) (length fill-prefix)))))
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
214 (delete-region (point) (+ (point) (length fill-prefix))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215 (fixup-whitespace))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 (defun fixup-whitespace ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
218 "Fixup white space between objects around point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 Leave one space or none, according to the context."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222 (delete-horizontal-space)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223 (if (or (looking-at "^\\|\\s)")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 (save-excursion (forward-char -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225 (looking-at "$\\|\\s(\\|\\s'")))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227 (insert ?\ ))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 (defun delete-horizontal-space ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230 "Delete all spaces and tabs around point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 (defun just-one-space ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 "Delete all spaces and tabs around point, leaving one space."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
239 (if (= (following-char) ? )
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
240 (forward-char 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241 (insert ? ))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 (defun delete-blank-lines ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
245 "On blank line, delete all surrounding blank lines, leaving just one.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
246 On isolated blank line, delete that one.
7817
d729f75fff04 (delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7762
diff changeset
247 On nonblank line, delete any immediately following blank lines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
248 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
249 (let (thisblank singleblank)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
250 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
251 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
252 (setq thisblank (looking-at "[ \t]*$"))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
253 ;; Set singleblank if there is just one blank line here.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
254 (setq singleblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
255 (and thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
256 (not (looking-at "[ \t]*\n[ \t]*$"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
257 (or (bobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
258 (progn (forward-line -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
259 (not (looking-at "[ \t]*$")))))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
260 ;; Delete preceding blank lines, and this one too if it's the only one.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
261 (if thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
262 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
263 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
264 (if singleblank (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
265 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
266 (if (re-search-backward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
267 (progn (forward-line 1) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
268 (point-min)))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
269 ;; Delete following blank lines, unless the current line is blank
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
270 ;; and there are no following blank lines.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
271 (if (not (and thisblank singleblank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
273 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
274 (forward-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
275 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
276 (if (re-search-forward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
277 (progn (beginning-of-line) (point))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
278 (point-max)))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
279 ;; Handle the special case where point is followed by newline and eob.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
280 ;; Delete the line, leaving point at eob.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
281 (if (looking-at "^[ \t]*\n\\'")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
282 (delete-region (point) (point-max)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
283
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
284 (defun back-to-indentation ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
285 "Move point to the first non-whitespace character on this line."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
286 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
287 (beginning-of-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
288 (skip-chars-forward " \t"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
289
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
290 (defun newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
291 "Insert a newline, then indent according to major mode.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
292 Indentation is done using the value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
293 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
294 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
295 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
296 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
297 (delete-region (point) (progn (skip-chars-backward " \t") (point)))
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
298 (newline)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
299 (indent-according-to-mode))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
300
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
301 (defun reindent-then-newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
302 "Reindent current line, insert newline, then indent the new line.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
303 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
304 which means calling the current value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
305 In programming language modes, this is the same as TAB.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
306 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
307 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
308 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
309 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
310 (delete-region (point) (progn (skip-chars-backward " \t") (point)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
311 (indent-according-to-mode))
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
312 (newline)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
313 (indent-according-to-mode))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
314
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
315 ;; 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
316 (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
317 (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
318 (if (eq arg '-) (setq arg -1))
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
319 (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
320
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
321 ;; 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
322 (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
323 (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
324 (if (eq arg '-) (setq arg -1))
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
325 (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
326
21074
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
327 (defcustom backward-delete-char-untabify-method 'untabify
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
328 "*The method for untabifying when deleting backward.
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
329 Can be `untabify' -- turn a tab to many spaces, then delete one space.
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
330 `hungry' -- delete all whitespace, both tabs and spaces.
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
331 nil -- just delete one character."
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
332 :type '(choice (const untabify) (const hungry) (const nil))
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
333 :group 'killing)
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
334
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
335 (defun backward-delete-char-untabify (arg &optional killp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
336 "Delete characters backward, changing tabs into spaces.
21074
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
337 The exact behavior depends on `backward-delete-char-untabify-method'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
338 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
339 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
340 and KILLP is t if a prefix arg was specified."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
341 (interactive "*p\nP")
21074
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
342 (when (eq backward-delete-char-untabify-method 'untabify)
21122
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
343 (let ((count arg))
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
344 (save-excursion
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
345 (while (and (> count 0) (not (bobp)))
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
346 (if (= (preceding-char) ?\t)
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
347 (let ((col (current-column)))
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
348 (forward-char -1)
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
349 (setq col (- col (current-column)))
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
350 (insert-char ?\ col)
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
351 (delete-char 1)))
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
352 (forward-char -1)
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
353 (setq count (1- count))))))
21074
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
354 (delete-backward-char
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
355 (if (eq backward-delete-char-untabify-method 'hungry)
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
356 (let ((wh (- (point) (save-excursion (skip-chars-backward " \t")
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
357 (point)))))
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
358 (+ arg (if (zerop wh) 0 (1- wh))))
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
359 arg)
926d7b2358dc (backward-delete-char-untabify-method): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 21040
diff changeset
360 killp))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
361
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
362 (defun zap-to-char (arg char)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
363 "Kill up to and including ARG'th occurrence of CHAR.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
364 Goes backward if ARG is negative; error if CHAR not found."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
365 (interactive "p\ncZap to char: ")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
366 (kill-region (point) (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
367 (search-forward (char-to-string char) nil nil arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
368 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
369 (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
370
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
371 (defun beginning-of-buffer (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372 "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
373 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
374
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
375 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
376 of the accessible part of the buffer.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
377
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
378 Don't use this command in Lisp programs!
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
379 \(goto-char (point-min)) is faster and avoids clobbering the mark."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
380 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
381 (push-mark)
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
382 (let ((size (- (point-max) (point-min))))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
383 (goto-char (if arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
384 (+ (point-min)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
385 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
386 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
387 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
388 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
389 (/ (+ 10 (* size (prefix-numeric-value arg))) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
390 (point-min))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
391 (if arg (forward-line 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
392
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
393 (defun end-of-buffer (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
394 "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
395 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
396
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
397 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
398 of the accessible part of the buffer.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
399
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
400 Don't use this command in Lisp programs!
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
401 \(goto-char (point-max)) is faster and avoids clobbering the mark."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
402 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
403 (push-mark)
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
404 (let ((size (- (point-max) (point-min))))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
405 (goto-char (if arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
406 (- (point-max)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
407 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
408 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
409 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
410 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
411 (/ (* size (prefix-numeric-value arg)) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
412 (point-max))))
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
413 ;; 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
414 ;; adjust it to the beginning of a line.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
415 (if arg (forward-line 1)
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
416 ;; 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
417 ;; 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
418 (if (let ((old-point (point)))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
419 (save-excursion
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
420 (goto-char (window-start))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
421 (vertical-motion (window-height))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
422 (< (point) old-point)))
7877
0eb805c768af (end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents: 7817
diff changeset
423 (progn
0eb805c768af (end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents: 7817
diff changeset
424 (overlay-recenter (point))
0eb805c768af (end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents: 7817
diff changeset
425 (recenter -3)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
426
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
427 (defun mark-whole-buffer ()
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
428 "Put point at beginning and mark at end of buffer.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
429 You probably should not use this function in Lisp programs;
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
430 it is usually a mistake for a Lisp function to use any subroutine
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
431 that uses or sets the mark."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
432 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
433 (push-mark (point))
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
434 (push-mark (point-max) nil t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
435 (goto-char (point-min)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
436
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
437 (defun count-lines-region (start end)
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3487
diff changeset
438 "Print number of lines and characters in the region."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
439 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440 (message "Region has %d lines, %d characters"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
441 (count-lines start end) (- end start)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
442
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
443 (defun what-line ()
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
444 "Print the current buffer line number and narrowed line number of point."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
445 (interactive)
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
446 (let ((opoint (point)) start)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
447 (save-excursion
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
448 (save-restriction
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
449 (goto-char (point-min))
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
450 (widen)
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
451 (beginning-of-line)
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
452 (setq start (point))
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
453 (goto-char opoint)
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
454 (beginning-of-line)
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
455 (if (/= start 1)
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
456 (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
457 (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
458 (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
459 (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
460
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
461
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
462 (defun count-lines (start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 "Return number of lines between START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464 This is usually the number of newlines between them,
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
465 but can be one more if START is not equal to END
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
466 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
467 (save-excursion
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
468 (save-restriction
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
469 (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
470 (goto-char (point-min))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
471 (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
472 (save-match-data
2421
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
473 (let ((done 0))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
474 (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
475 (setq done (+ 40 done)))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
476 (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
477 (setq done (+ 1 done)))
5151
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
478 (goto-char (point-max))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
479 (if (and (/= start end)
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
480 (not (bolp)))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
481 (1+ done)
9554
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
482 done)))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
483 (- (buffer-size) (forward-line (buffer-size)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
485 (defun what-cursor-position (&optional detail)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
486 "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
487 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
488 (interactive "P")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
489 (let* ((char (following-char))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
490 (beg (point-min))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
491 (end (point-max))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
492 (pos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
493 (total (buffer-size))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
494 (percent (if (> total 50000)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
495 ;; Avoid overflow from multiplying by 100!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
496 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
497 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
498 (hscroll (if (= (window-hscroll) 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
499 ""
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
500 (format " Hscroll=%d" (window-hscroll))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
501 (col (current-column)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
502 (if (= pos end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
503 (if (or (/= beg 1) (/= end (1+ total)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
504 (message "point=%d of %d(%d%%) <%d - %d> column %d %s"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
505 pos total percent beg end col hscroll)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
506 (message "point=%d of %d(%d%%) column %d %s"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
507 pos total percent col hscroll))
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
508 (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
509 (if (or (/= beg 1) (/= end (1+ total)))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
510 (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
511 (if (< char 256)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
512 (single-key-description char)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
513 (char-to-string char))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
514 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
515 (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
516 (if (< char 256)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
517 (single-key-description char)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
518 (char-to-string char))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
519 char char char str pos total percent col hscroll))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
520
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
521 (defun fundamental-mode ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
522 "Major mode not specialized for anything in particular.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
523 Other major modes are defined by comparison with this one."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
524 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
525 (kill-all-local-variables))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
526
4894
1574c6c6561f (eval-expression): Fix typo: missing paren.
Roland McGrath <roland@gnu.org>
parents: 4886
diff changeset
527 (defvar read-expression-map (cons 'keymap minibuffer-local-map)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
528 "Minibuffer keymap used for reading Lisp expressions.")
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
529 (define-key read-expression-map "\M-\t" 'lisp-complete-symbol)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
530
4289
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
531 (defvar read-expression-history nil)
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
532
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
533 ;; We define this, rather than making `eval' interactive,
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
534 ;; 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
535 (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
536 &optional eval-expression-insert-value)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
537 "Evaluate EXPRESSION and print value in minibuffer.
954
9e51bb887797 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 921
diff changeset
538 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
539 (interactive
5068
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
540 (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
541 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
542 'read-expression-history)
9f6b375ce842 (eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 19362
diff changeset
543 current-prefix-arg))
17133
fbdff0d0de3d (eval-expression): No longer disabled, since M-: isn't
Karl Heuer <kwzh@gnu.org>
parents: 16999
diff changeset
544 (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
545 (prin1 (car values)
9f6b375ce842 (eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 19362
diff changeset
546 (if eval-expression-insert-value (current-buffer) t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
547
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
548 (defun edit-and-eval-command (prompt command)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
549 "Prompting with PROMPT, let user edit COMMAND and eval result.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
550 COMMAND is a Lisp expression. Let user edit that expression in
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
551 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
552 (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
553 (prin1-to-string command)
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
554 read-expression-map t
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
555 '(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
556 ;; 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
557 ;; 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
558 (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
559 (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
560
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
561 ;; 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
562 ;; 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
563 (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
564 (setq command-history (cons command command-history)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
565 (eval command)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
566
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
567 (defun repeat-complex-command (arg)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
568 "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
569 A complex command is one which used the minibuffer.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
570 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
571 The result is executed, repeating the command as changed.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
572 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
573 it is added to the front of the command history.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
574 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
575 to get different commands to edit and resubmit."
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
576 (interactive "p")
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
577 (let ((elt (nth (1- arg) command-history))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
578 newcmd)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
579 (if elt
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
580 (progn
4821
2c16f99ef5dc (edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents: 4765
diff changeset
581 (setq newcmd
16803
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
582 (let ((print-level nil)
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
583 (minibuffer-history-position arg)
20022
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
584 (minibuffer-history-sexp-flag (1+ (minibuffer-depth))))
8734
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
585 (read-from-minibuffer
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
586 "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
587 (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
588
5135
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
589 ;; 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
590 ;; 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
591 (if (stringp (car command-history))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
592 (setq command-history (cdr command-history)))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
593
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
594 ;; 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
595 ;; add it to the history.
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
596 (or (equal newcmd (car command-history))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
597 (setq command-history (cons newcmd command-history)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
598 (eval newcmd))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
599 (ding))))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
600
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
601 (defvar minibuffer-history nil
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
602 "Default minibuffer history list.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
603 This is used for all minibuffer input
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
604 except when an alternate history list is specified.")
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
605 (defvar minibuffer-history-sexp-flag nil
7373
451602bf12e4 (minibuffer-history-sexp-flag): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 7333
diff changeset
606 "Non-nil when doing history operations on `command-history'.
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
607 More generally, indicates that the history list being acted on
20022
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
608 contains expressions rather than strings.
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
609 It is only valid if its value equals the current minibuffer depth,
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
610 to handle recursive uses of the minibuffer.")
862
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
611 (setq minibuffer-history-variable 'minibuffer-history)
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
612 (setq minibuffer-history-position nil)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
613 (defvar minibuffer-history-search-history nil)
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
614
921
c5c4c2ee8f26 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 892
diff changeset
615 (mapcar
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
616 (lambda (key-and-command)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
617 (mapcar
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
618 (lambda (keymap-and-completionp)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
619 ;; Arg is (KEYMAP-SYMBOL . COMPLETION-MAP-P).
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
620 ;; 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
621 ;; 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
622 (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
623 (car key-and-command)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
624 (let ((command (cdr key-and-command)))
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
625 (if (consp command)
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
626 ;; (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
627 ;; 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
628 ;; 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
629 (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
630 (progn (error "EMACS BUG!") (cdr command))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
631 (car command))
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
632 command))))
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
633 '((minibuffer-local-map . nil)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
634 (minibuffer-local-ns-map . nil)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
635 (minibuffer-local-completion-map . t)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
636 (minibuffer-local-must-match-map . t)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
637 (read-expression-map . nil))))
1838
34da3c151be4 Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents: 1837
diff changeset
638 '(("\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
639 ([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
640 ("\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
641 ([prior] . (previous-history-element . previous-complete-history-element))
921
c5c4c2ee8f26 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 892
diff changeset
642 ("\er" . previous-matching-history-element)
c5c4c2ee8f26 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 892
diff changeset
643 ("\es" . next-matching-history-element)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
644
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
645 (defvar minibuffer-text-before-history nil
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
646 "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
647 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
648 in this use of the minibuffer.")
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
649
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
650 (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
651
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
652 (defun minibuffer-history-initialize ()
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
653 (setq minibuffer-text-before-history nil))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
654
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
655 (defun previous-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
656 "Find the previous history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
657 \(Previous history elements refer to earlier actions.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
658 With prefix argument N, search for Nth previous match.
20510
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
659 If N is negative, find the next or Nth next match.
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
660 An uppercase letter in REGEXP makes the search case-sensitive."
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
661 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
662 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
663 (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
664 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
665 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
666 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
667 'minibuffer-history-search-history)))
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
668 ;; 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
669 (list (if (string= regexp "")
11961
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
670 (if minibuffer-history-search-history
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
671 (car minibuffer-history-search-history)
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
672 (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
673 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
674 (prefix-numeric-value current-prefix-arg))))
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
675 (if (and (zerop minibuffer-history-position)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
676 (null minibuffer-text-before-history))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
677 (setq minibuffer-text-before-history (buffer-string)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
678 (let ((history (symbol-value minibuffer-history-variable))
20510
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
679 (case-fold-search
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
680 (if (isearch-no-upper-case-p regexp t) ; assume isearch.el is dumped
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
681 ;; Respect the user's setting for case-fold-search:
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
682 case-fold-search
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
683 nil))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
684 prevpos
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
685 (pos minibuffer-history-position))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
686 (while (/= n 0)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
687 (setq prevpos pos)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
688 (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
689 (if (= pos prevpos)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
690 (error (if (= pos 1)
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
691 "No later matching history item"
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
692 "No earlier matching history item")))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
693 (if (string-match regexp
20022
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
694 (if (eq minibuffer-history-sexp-flag
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
695 (minibuffer-depth))
8734
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
696 (let ((print-level nil))
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
697 (prin1-to-string (nth (1- pos) history)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
698 (nth (1- pos) history)))
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
699 (setq n (+ n (if (< n 0) 1 -1)))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
700 (setq minibuffer-history-position pos)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
701 (erase-buffer)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
702 (let ((elt (nth (1- pos) history)))
20022
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
703 (insert (if (eq minibuffer-history-sexp-flag (minibuffer-depth))
8734
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
704 (let ((print-level nil))
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
705 (prin1-to-string elt))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
706 elt)))
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
707 (goto-char (point-min)))
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
708 (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
709 (eq (car (car command-history)) 'next-matching-history-element))
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
710 (setq command-history (cdr command-history))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
711
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
712 (defun next-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
713 "Find the next history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
714 \(The next history element refers to a more recent action.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
715 With prefix argument N, search for Nth next match.
20510
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
716 If N is negative, find the previous or Nth previous match.
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
717 An uppercase letter in REGEXP makes the search case-sensitive."
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
718 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
719 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
720 (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
721 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
722 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
723 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
724 'minibuffer-history-search-history)))
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
725 ;; 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
726 (list (if (string= regexp "")
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
727 (setcar minibuffer-history-search-history
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
728 (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
729 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
730 (prefix-numeric-value current-prefix-arg))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
731 (previous-matching-history-element regexp (- n)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
732
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
733 (defun next-history-element (n)
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
734 "Insert the next element of the minibuffer history into the minibuffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
735 (interactive "p")
10722
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
736 (or (zerop n)
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
737 (let ((narg (- minibuffer-history-position n))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
738 (minimum (if minibuffer-default -1 0))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
739 elt)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
740 (if (and (zerop minibuffer-history-position)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
741 (null minibuffer-text-before-history))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
742 (setq minibuffer-text-before-history (buffer-string)))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
743 (if (< narg minimum)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
744 (error "End of history; no next item"))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
745 (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
746 (error "Beginning of history; no preceding item"))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
747 (erase-buffer)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
748 (setq minibuffer-history-position narg)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
749 (cond ((= narg -1)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
750 (setq elt minibuffer-default))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
751 ((= narg 0)
19888
45a077538366 (next-history-element):
Richard M. Stallman <rms@gnu.org>
parents: 19514
diff changeset
752 (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
753 (setq minibuffer-text-before-history nil))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
754 (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
755 (symbol-value minibuffer-history-variable)))))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
756 (insert
20022
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
757 (if (eq minibuffer-history-sexp-flag (minibuffer-depth))
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
758 (let ((print-level nil))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
759 (prin1-to-string elt))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
760 elt))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
761 (goto-char (point-min)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
762
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
763 (defun previous-history-element (n)
1145
e6cefcaba564 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 1135
diff changeset
764 "Inserts the previous element of the minibuffer history into the minibuffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
765 (interactive "p")
859
5f325fbc093d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 858
diff changeset
766 (next-history-element (- n)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
767
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
768 (defun next-complete-history-element (n)
5324
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
769 "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
770 (interactive "p")
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
771 (let ((point-at-start (point)))
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
772 (next-matching-history-element
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
773 (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
774 ;; 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
775 ;; 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
776 ;; 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
777 (goto-char point-at-start)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
778
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
779 (defun previous-complete-history-element (n)
5324
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
780 "\
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
781 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
782 (interactive "p")
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
783 (next-complete-history-element (- n)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
784
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
785 (defun goto-line (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
786 "Goto line ARG, counting from line 1 at beginning of buffer."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
787 (interactive "NGoto line: ")
9343
ee9866892683 (goto-line): Call prefix-numeric-value.
Richard M. Stallman <rms@gnu.org>
parents: 9065
diff changeset
788 (setq arg (prefix-numeric-value arg))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
789 (save-restriction
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
790 (widen)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
791 (goto-char 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
792 (if (eq selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
793 (re-search-forward "[\n\C-m]" nil 'end (1- arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
794 (forward-line (1- arg)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
795
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
796 ;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
797 (defalias 'advertised-undo 'undo)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
798
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
799 (defun undo (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
800 "Undo some previous changes.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
801 Repeat this command to undo more changes.
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
802 A numeric argument serves as a repeat count.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
803
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
804 Just C-u as argument requests selective undo,
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
805 limited to changes within the current region.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
806 Likewise in Transient Mark mode when the mark is active."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
807 (interactive "*P")
5935
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
808 ;; 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
809 ;; for the following command.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
810 (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
811 (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
812 (recent-save (recent-auto-save-p)))
582
a9c4bc19b2aa *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 513
diff changeset
813 (or (eq (selected-window) (minibuffer-window))
a9c4bc19b2aa *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 513
diff changeset
814 (message "Undo!"))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
815 (or (eq last-command 'undo)
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
816 (progn (if (or arg (and transient-mark-mode mark-active))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
817 (undo-start (region-beginning) (region-end))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
818 (undo-start))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
819 (undo-more 1)))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
820 (undo-more (if arg (prefix-numeric-value arg) 1))
6386
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
821 ;; 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
822 ;; 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
823 (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
824 done)
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
825 (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
826 (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
827 (progn
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
828 (setq done t)
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
829 (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
830 (setq tail (cdr tail))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
831 (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
832 (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
833 ;; 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
834 (setq this-command 'undo))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
835
2947
518509536741 (pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents: 2935
diff changeset
836 (defvar pending-undo-list nil
518509536741 (pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents: 2935
diff changeset
837 "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
838
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
839 (defun undo-more (count)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
840 "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
841 Call `undo-start' to get ready to undo recent changes,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
842 then call `undo-more' one or more times to undo them."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
843 (or pending-undo-list
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
844 (error "No further undo information"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
845 (setq pending-undo-list (primitive-undo count pending-undo-list)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
846
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
847 ;; Deep copy of a list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
848 (defun undo-copy-list (list)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
849 "Make a copy of undo list LIST."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
850 (mapcar 'undo-copy-list-1 list))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
851
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
852 (defun undo-copy-list-1 (elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
853 (if (consp elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
854 (cons (car elt) (undo-copy-list-1 (cdr elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
855 elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
856
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
857 (defun undo-start (&optional beg end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
858 "Set `pending-undo-list' to the front of the undo list.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
859 The next call to `undo-more' will undo the most recently made change.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
860 If BEG and END are specified, then only undo elements
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
861 that apply to text between BEG and END are used; other undo elements
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
862 are ignored. If BEG and END are nil, all undo elements are used."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
863 (if (eq buffer-undo-list t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
864 (error "No undo information in this buffer"))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
865 (setq pending-undo-list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
866 (if (and beg end (not (= beg end)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
867 (undo-make-selective-list (min beg end) (max beg end))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
868 buffer-undo-list)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
869
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
870 (defvar undo-adjusted-markers)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
871
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
872 (defun undo-make-selective-list (start end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
873 "Return a list of undo elements for the region START to END.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
874 The elements come from `buffer-undo-list', but we keep only
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
875 the elements inside this region, and discard those outside this region.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
876 If we find an element that crosses an edge of this region,
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
877 we stop and ignore all further elements."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
878 (let ((undo-list-copy (undo-copy-list buffer-undo-list))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
879 (undo-list (list nil))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
880 undo-adjusted-markers
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
881 some-rejected
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
882 undo-elt undo-elt temp-undo-list delta)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
883 (while undo-list-copy
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
884 (setq undo-elt (car undo-list-copy))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
885 (let ((keep-this
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
886 (cond ((and (consp undo-elt) (eq (car undo-elt) t))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
887 ;; This is a "was unmodified" element.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
888 ;; Keep it if we have kept everything thus far.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
889 (not some-rejected))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
890 (t
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
891 (undo-elt-in-region undo-elt start end)))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
892 (if keep-this
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
893 (progn
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
894 (setq end (+ end (cdr (undo-delta undo-elt))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
895 ;; Don't put two nils together in the list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
896 (if (not (and (eq (car undo-list) nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
897 (eq undo-elt nil)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
898 (setq undo-list (cons undo-elt undo-list))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
899 (if (undo-elt-crosses-region undo-elt start end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
900 (setq undo-list-copy nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
901 (setq some-rejected t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
902 (setq temp-undo-list (cdr undo-list-copy))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
903 (setq delta (undo-delta undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
904
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
905 (when (/= (cdr delta) 0)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
906 (let ((position (car delta))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
907 (offset (cdr delta)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
908
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
909 ;; Loop down the earlier events adjusting their buffer positions
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
910 ;; to reflect the fact that a change to the buffer isn't being
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
911 ;; undone. We only need to process those element types which
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
912 ;; undo-elt-in-region will return as being in the region since
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
913 ;; only those types can ever get into the output
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
914
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
915 (while temp-undo-list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
916 (setq undo-elt (car temp-undo-list))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
917 (cond ((integerp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
918 (if (>= undo-elt position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
919 (setcar temp-undo-list (- undo-elt offset))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
920 ((atom undo-elt) nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
921 ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
922 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
923 (let ((text-pos (abs (cdr undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
924 (point-at-end (< (cdr undo-elt) 0 )))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
925 (if (>= text-pos position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
926 (setcdr undo-elt (* (if point-at-end -1 1)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
927 (- text-pos offset))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
928 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
929 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
930 (when (>= (car undo-elt) position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
931 (setcar undo-elt (- (car undo-elt) offset))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
932 (setcdr undo-elt (- (cdr undo-elt) offset))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
933 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
934 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
935 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
936 (when (>= (car tail) position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
937 (setcar tail (- (car tail) offset))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
938 (setcdr tail (- (cdr tail) offset))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
939 (setq temp-undo-list (cdr temp-undo-list))))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
940 (setq undo-list-copy (cdr undo-list-copy)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
941 (nreverse undo-list)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
942
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
943 (defun undo-elt-in-region (undo-elt start end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
944 "Determine whether UNDO-ELT falls inside the region START ... END.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
945 If it crosses the edge, we return nil."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
946 (cond ((integerp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
947 (and (>= undo-elt start)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
948 (< undo-elt end)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
949 ((eq undo-elt nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
950 t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
951 ((atom undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
952 nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
953 ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
954 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
955 (and (>= (abs (cdr undo-elt)) start)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
956 (< (abs (cdr undo-elt)) end)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
957 ((and (consp undo-elt) (markerp (car undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
958 ;; This is a marker-adjustment element (MARKER . ADJUSTMENT).
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
959 ;; See if MARKER is inside the region.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
960 (let ((alist-elt (assq (car undo-elt) undo-adjusted-markers)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
961 (unless alist-elt
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
962 (setq alist-elt (cons (car undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
963 (marker-position (car undo-elt))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
964 (setq undo-adjusted-markers
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
965 (cons alist-elt undo-adjusted-markers)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
966 (and (cdr alist-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
967 (>= (cdr alist-elt) start)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
968 (< (cdr alist-elt) end))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
969 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
970 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
971 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
972 (and (>= (car tail) start)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
973 (< (cdr tail) end))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
974 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
975 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
976 (and (>= (car undo-elt) start)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
977 (< (cdr undo-elt) end)))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
978
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
979 (defun undo-elt-crosses-region (undo-elt start end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
980 "Test whether UNDO-ELT crosses one edge of that region START ... END.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
981 This assumes we have already decided that UNDO-ELT
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
982 is not *inside* the region START...END."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
983 (cond ((atom undo-elt) nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
984 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
985 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
986 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
987 (not (or (< (car tail) end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
988 (> (cdr tail) start)))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
989 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
990 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
991 (not (or (< (car undo-elt) end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
992 (> (cdr undo-elt) start))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
993
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
994 ;; Return the first affected buffer position and the delta for an undo element
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
995 ;; delta is defined as the change in subsequent buffer positions if we *did*
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
996 ;; the undo.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
997 (defun undo-delta (undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
998 (if (consp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
999 (cond ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1000 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1001 (cons (abs (cdr undo-elt)) (length (car undo-elt))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1002 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1003 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1004 (cons (car undo-elt) (- (car undo-elt) (cdr undo-elt))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1005 (t
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1006 '(0 . 0)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1007 '(0 . 0)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1008
4374
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
1009 (defvar shell-command-history nil
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
1010 "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
1011
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
1012 (defvar shell-command-switch "-c"
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
1013 "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
1014
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1015 (defun shell-command (command &optional output-buffer)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1016 "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
1017
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1018 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
1019 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
1020 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
1021
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1022 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
1023 buffer `*Shell Command Output*'.
11072
c5fbb6f272f2 (shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents: 11036
diff changeset
1024 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
1025 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
1026 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
1027 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
1028 then `*Shell Command Output*' is deleted.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1029
19109
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1030 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
1031 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
1032 before this command.
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1033
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1034 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
1035 `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
1036
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1037 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
1038 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
1039 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
1040 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
1041 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
1042 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
1043 (interactive (list (read-from-minibuffer "Shell command: "
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
1044 nil nil nil 'shell-command-history)
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
1045 current-prefix-arg))
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1046 ;; 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
1047 (let ((handler
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1048 (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
1049 'shell-command)))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1050 (if handler
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1051 (funcall handler 'shell-command command output-buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1052 (if (and output-buffer
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1053 (not (or (bufferp output-buffer) (stringp output-buffer))))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1054 (progn (barf-if-buffer-read-only)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1055 (push-mark)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1056 ;; 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
1057 ;; .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
1058 ;; "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
1059 ;; non-interactively. Besides, if someone wants their other
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1060 ;; 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
1061 (call-process shell-file-name nil t nil
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1062 shell-command-switch command)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1063 ;; 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
1064 ;; 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
1065 ;; 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
1066 ;; because we inserted text.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1067 (goto-char (prog1 (mark t)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1068 (set-marker (mark-marker) (point)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1069 (current-buffer)))))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1070 ;; 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
1071 (save-match-data
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1072 (if (string-match "[ \t]*&[ \t]*$" command)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1073 ;; Command ending with ampersand means asynchronous.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1074 (let ((buffer (get-buffer-create
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1075 (or output-buffer "*Async Shell Command*")))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1076 (directory default-directory)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1077 proc)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1078 ;; Remove the ampersand.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1079 (setq command (substring command 0 (match-beginning 0)))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1080 ;; If will kill a process, query first.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1081 (setq proc (get-buffer-process buffer))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1082 (if proc
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1083 (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
1084 (kill-process proc)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1085 (error "Shell command in progress")))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1086 (save-excursion
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1087 (set-buffer buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1088 (setq buffer-read-only nil)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1089 (erase-buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1090 (display-buffer buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1091 (setq default-directory directory)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1092 (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
1093 shell-command-switch command))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1094 (setq mode-line-process '(":%s"))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1095 (require 'shell) (shell-mode)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1096 (set-process-sentinel proc 'shell-command-sentinel)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1097 ))
15876
d814bc72503f (shell-command): Really use output-buffer in synchronous
Richard M. Stallman <rms@gnu.org>
parents: 15836
diff changeset
1098 (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
1099 ))))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1100
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101 ;; We have a sentinel to prevent insertion of a termination message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1102 ;; in the buffer itself.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1103 (defun shell-command-sentinel (process signal)
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1104 (if (memq (process-status process) '(exit signal))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1105 (message "%s: %s."
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1106 (car (cdr (cdr (process-command process))))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1107 (substring signal 0 -1))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1108
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1109 (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
1110 &optional output-buffer replace
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1111 error-buffer)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1112 "Execute string COMMAND in inferior shell with region as input.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1113 Normally display output (if any) in temp buffer `*Shell Command Output*';
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1114 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
1115
19109
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1116 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
1117 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
1118 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
1119 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
1120 `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
1121 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
1122
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1123 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
1124 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
1125 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
1126 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
1127 `coding-system-for-read' and `coding-system-for-write'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1128
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1129 If the output is one line, it is displayed in the echo area,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1130 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
1131 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
1132 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
1133 then `*Shell Command Output*' is deleted.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1134
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
1135 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
1136 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
1137 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
1138 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
1139 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
1140 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
1141
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1142 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
1143 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
1144 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
1145 (interactive (let ((string
7b7874738e7c (shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents: 10779
diff changeset
1146 ;; 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
1147 ;; 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
1148 ;; 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
1149 (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
1150 nil nil nil
7b7874738e7c (shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents: 10779
diff changeset
1151 'shell-command-history)))
13482
e49cd471ced7 (do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13328
diff changeset
1152 ;; call-interactively recognizes region-beginning and
e49cd471ced7 (do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13328
diff changeset
1153 ;; 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
1154 (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
1155 string
7b7874738e7c (shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents: 10779
diff changeset
1156 current-prefix-arg
10912
be434b59c22e (shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents: 10863
diff changeset
1157 current-prefix-arg)))
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1158 (let ((error-file
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1159 (if error-buffer
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1160 (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
1161 (make-temp-name "scor"))
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1162 nil)))
10912
be434b59c22e (shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents: 10863
diff changeset
1163 (if (or replace
be434b59c22e (shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents: 10863
diff changeset
1164 (and output-buffer
13810
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
1165 (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
1166 (equal (buffer-name (current-buffer)) "*Shell Command Output*"))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1167 ;; 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
1168 (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
1169 ;; 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
1170 (goto-char start)
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
1171 (and replace (push-mark))
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1172 (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
1173 (if error-file
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1174 (list t error-file)
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1175 t)
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1176 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
1177 (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
1178 (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
1179 (kill-buffer shell-buffer)))
10912
be434b59c22e (shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents: 10863
diff changeset
1180 ;; 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
1181 (and replace swap (exchange-point-and-mark)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1182 ;; No prefix argument: put the output in a temp buffer,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1183 ;; replacing its entire contents.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1184 (let ((buffer (get-buffer-create
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1185 (or output-buffer "*Shell Command Output*")))
21222
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1186 (success nil)
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1187 (exit-status nil))
5635
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1188 (unwind-protect
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1189 (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
1190 ;; 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
1191 ;; 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
1192 ;; 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
1193 (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
1194 (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
1195 (delete-region (point-min) (min start end))
21222
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1196 (setq exit-status
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1197 (call-process-region (point-min) (point-max)
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1198 shell-file-name t
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1199 (if error-file
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1200 (list t error-file)
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1201 t)
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1202 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
1203 (setq success t))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1204 ;; 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
1205 (save-excursion
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1206 (set-buffer buffer)
9065
e321617e3fc6 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 8998
diff changeset
1207 (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
1208 (erase-buffer))
21222
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1209 (setq exit-status
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1210 (call-process-region start end shell-file-name nil
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1211 (if error-file
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1212 (list buffer error-file)
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1213 buffer)
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1214 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
1215 (setq success t))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1216 ;; 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
1217 (let ((lines (save-excursion
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1218 (set-buffer buffer)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1219 (if (= (buffer-size) 0)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1220 0
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1221 (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
1222 (cond ((= lines 0)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1223 (if success
21222
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1224 (message "(Shell command %sed with no output)"
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1225 (if (equal 0 exit-status)
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1226 "succeed"
4824e5e6d88a (shell-command-on-region): Amend message to report
Dave Love <fx@gnu.org>
parents: 21193
diff changeset
1227 "fail")))
5635
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1228 (kill-buffer buffer))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1229 ((and success (= lines 1))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1230 (message "%s"
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1231 (save-excursion
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1232 (set-buffer buffer)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1233 (goto-char (point-min))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
1234 (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
1235 (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
1236 (t
15305
29ba4949d3d5 (shell-command-on-region): In output buffer, display
Karl Heuer <kwzh@gnu.org>
parents: 15302
diff changeset
1237 (save-excursion
29ba4949d3d5 (shell-command-on-region): In output buffer, display
Karl Heuer <kwzh@gnu.org>
parents: 15302
diff changeset
1238 (set-buffer buffer)
29ba4949d3d5 (shell-command-on-region): In output buffer, display
Karl Heuer <kwzh@gnu.org>
parents: 15302
diff changeset
1239 (goto-char (point-min)))
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1240 (display-buffer buffer)))))))
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1241 (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
1242 (save-excursion
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1243 (set-buffer (get-buffer-create error-buffer))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1244 ;; Do no formatting while reading error file, for fear of looping.
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1245 (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
1246 (delete-file error-file)))))
16312
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
1247
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
1248 (defun shell-command-to-string (command)
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
1249 "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
1250 (with-output-to-string
16316
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
1251 (with-current-buffer
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
1252 standard-output
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
1253 (call-process shell-file-name nil t nil shell-command-switch command))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1254
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
1255 (defvar universal-argument-map
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1256 (let ((map (make-sparse-keymap)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1257 (define-key map [t] 'universal-argument-other-key)
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
1258 (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
1259 (define-key map [switch-frame] nil)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1260 (define-key map [?\C-u] 'universal-argument-more)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1261 (define-key map [?-] 'universal-argument-minus)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1262 (define-key map [?0] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1263 (define-key map [?1] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1264 (define-key map [?2] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1265 (define-key map [?3] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1266 (define-key map [?4] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1267 (define-key map [?5] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1268 (define-key map [?6] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1269 (define-key map [?7] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1270 (define-key map [?8] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1271 (define-key map [?9] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1272 map)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1273 "Keymap used while processing \\[universal-argument].")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1274
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1275 (defvar universal-argument-num-events nil
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1276 "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
1277 `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
1278 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
1279
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1280 (defun universal-argument ()
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1281 "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
1282 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
1283 \\[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
1284 \\[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
1285 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
1286 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
1287 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
1288 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
1289 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
1290 (interactive)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1291 (setq prefix-arg (list 4))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1292 (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
1293 (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
1294
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1295 ;; 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
1296 ;; 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
1297 (defun universal-argument-more (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1298 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1299 (if (consp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1300 (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
1301 (if (eq arg '-)
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
1302 (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
1303 (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
1304 (setq overriding-terminal-local-map nil)))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1305 (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
1306
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1307 (defun negative-argument (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1308 "Begin a negative numeric argument for the next command.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1309 \\[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
1310 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1311 (cond ((integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1312 (setq prefix-arg (- arg)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1313 ((eq arg '-)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1314 (setq prefix-arg nil))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1315 (t
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
1316 (setq prefix-arg '-)))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1317 (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
1318 (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
1319
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1320 (defun digit-argument (arg)
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1321 "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
1322 \\[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
1323 (interactive "P")
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1324 (let ((digit (- (logand last-command-char ?\177) ?0)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1325 (cond ((integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1326 (setq prefix-arg (+ (* arg 10)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1327 (if (< arg 0) (- digit) digit))))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1328 ((eq arg '-)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1329 ;; Treat -0 as just -, so that -01 will work.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1330 (setq prefix-arg (if (zerop digit) '- (- digit))))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1331 (t
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
1332 (setq prefix-arg digit))))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1333 (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
1334 (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
1335
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1336 ;; 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
1337 ;; command if digits have already been entered.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1338 (defun universal-argument-minus (arg)
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1339 (interactive "P")
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1340 (if (integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1341 (universal-argument-other-key arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1342 (negative-argument arg)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1343
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1344 ;; 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
1345 ;; executed as a command.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1346 (defun universal-argument-other-key (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1347 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1348 (setq prefix-arg arg)
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1349 (let* ((key (this-command-keys))
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1350 (keylist (listify-key-sequence key)))
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1351 (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
1352 (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
1353 unread-command-events)))
12320
979836b1a1a9 (universal-argument-other-key): Call reset-this-command-lengths.
Richard M. Stallman <rms@gnu.org>
parents: 12313
diff changeset
1354 (reset-this-command-lengths)
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1355 (setq overriding-terminal-local-map nil))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1356
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1357 (defun forward-to-indentation (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1358 "Move forward ARG lines and position at first nonblank character."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1359 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1360 (forward-line arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1361 (skip-chars-forward " \t"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1362
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1363 (defun backward-to-indentation (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1364 "Move backward ARG lines and position at first nonblank character."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1365 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1366 (forward-line (- arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1367 (skip-chars-forward " \t"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1368
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1369 (defcustom kill-whole-line nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1370 "*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
1371 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1372 :group 'killing)
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1373
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1374 (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
1375 "Kill the rest of the current line; if no nonblanks there, kill thru newline.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1376 With prefix argument, kill that many lines from point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1377 Negative arguments kill lines backward.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1378
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1379 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
1380 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
1381
18593
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
1382 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
1383 \\[beginning-of-line] \\[kill-line] \\[kill-line].
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
1384
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
1385 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
1386 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
1387 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
1388 by typing \\[beginning-of-line] \\[kill-line]."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1389 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1390 (kill-region (point)
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1391 ;; 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
1392 ;; 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
1393 ;; 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
1394 ;; 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
1395 ;; 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
1396 (progn
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1397 (if arg
17713
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1398 (forward-visible-line (prefix-numeric-value arg))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1399 (if (eobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1400 (signal 'end-of-buffer nil))
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1401 (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
1402 (forward-visible-line 1)
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1403 (end-of-visible-line)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1404 (point))))
17713
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1405
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1406 (defun forward-visible-line (arg)
18498
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1407 "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
1408 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
1409 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
1410 (condition-case nil
18731
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1411 (if (> arg 0)
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1412 (while (> arg 0)
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1413 (or (zerop (forward-line 1))
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1414 (signal 'end-of-buffer nil))
18498
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1415 ;; 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
1416 ;; 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
1417 ;; then find the next newline.
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1418 (while (and (not (eobp))
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1419 (let ((prop
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1420 (get-char-property (point) 'invisible)))
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1421 (if (eq buffer-invisibility-spec t)
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1422 prop
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1423 (or (memq prop buffer-invisibility-spec)
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1424 (assq prop buffer-invisibility-spec)))))
19326
14681d10a973 (forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents: 19227
diff changeset
1425 (goto-char
14681d10a973 (forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents: 19227
diff changeset
1426 (if (get-text-property (point) 'invisible)
14681d10a973 (forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents: 19227
diff changeset
1427 (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
1428 (point-max))
14681d10a973 (forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents: 19227
diff changeset
1429 (next-overlay-change (point))))
18498
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1430 (or (zerop (forward-line 1))
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1431 (signal 'end-of-buffer nil)))
78a8721a690c (forward-visible-line): Handle 0 arg correctly.
Richard M. Stallman <rms@gnu.org>
parents: 18379
diff changeset
1432 (setq arg (1- arg)))
18731
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1433 (let ((first t))
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1434 (while (or first (< arg 0))
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1435 (if (zerop arg)
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1436 (beginning-of-line)
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1437 (or (zerop (forward-line -1))
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1438 (signal 'beginning-of-buffer nil)))
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1439 (while (and (not (bobp))
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1440 (let ((prop
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1441 (get-char-property (1- (point)) 'invisible)))
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1442 (if (eq buffer-invisibility-spec t)
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1443 prop
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1444 (or (memq prop buffer-invisibility-spec)
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1445 (assq prop buffer-invisibility-spec)))))
19326
14681d10a973 (forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents: 19227
diff changeset
1446 (goto-char
14681d10a973 (forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents: 19227
diff changeset
1447 (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
1448 (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
1449 (point-min))
14681d10a973 (forward-visible-line): Handle nil value from
Richard M. Stallman <rms@gnu.org>
parents: 19227
diff changeset
1450 (previous-overlay-change (point))))
18731
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1451 (or (zerop (forward-line -1))
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1452 (signal 'beginning-of-buffer nil)))
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1453 (setq first nil)
2b3632471f92 (forward-visible-line): Correctly handle arg 0
Richard M. Stallman <rms@gnu.org>
parents: 18629
diff changeset
1454 (setq arg (1+ arg)))))
17713
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1455 ((beginning-of-buffer end-of-buffer)
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1456 nil)))
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1457
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1458 (defun end-of-visible-line ()
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1459 "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
1460 (end-of-line)
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1461 ;; 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
1462 ;; 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
1463 ;; then find the next newline.
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1464 (while (and (not (eobp))
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1465 (let ((prop
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1466 (get-char-property (point) 'invisible)))
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1467 (if (eq buffer-invisibility-spec t)
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1468 prop
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1469 (or (memq prop buffer-invisibility-spec)
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1470 (assq prop buffer-invisibility-spec)))))
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1471 (if (get-text-property (point) 'invisible)
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1472 (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
1473 (goto-char (next-overlay-change (point))))
be8005fce86f (quoted-insert-character-offset): Initialize more cleanly.
Richard M. Stallman <rms@gnu.org>
parents: 17663
diff changeset
1474 (end-of-line)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1475
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1476 ;;;; Window system cut and paste hooks.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1477
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1478 (defvar interprogram-cut-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1479 "Function to call to make a killed region available to other programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1480
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1481 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
1482 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
1483 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
1484 is put in the kill ring, to make the new kill available to other
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1485 programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1486
3034
dd65780e6246 (kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents: 3029
diff changeset
1487 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
1488 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
1489 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
1490 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
1491 nil means appending to an \"old\" kill.")
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1492
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1493 (defvar interprogram-paste-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1494 "Function to call to get text cut from other programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1495
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1496 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
1497 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
1498 This variable holds a function that Emacs calls to obtain
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1499 text that other programs have provided for pasting.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1500
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1501 The function should be called with no arguments. If the function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1502 returns nil, then no other program has provided such text, and the top
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1503 of the Emacs kill ring should be used. If the function returns a
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1504 string, that string should be put in the kill ring as the latest kill.
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1505
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1506 Note that the function should return a string only if a program other
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1507 than Emacs has provided a string for pasting; if Emacs provided the
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1508 most recent string, the function should return nil. If it is
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1509 difficult to tell whether Emacs or some other program provided the
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1510 current string, it is probably good enough to return nil if the string
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1511 is equal (according to `string=') to the last text Emacs provided.")
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1512
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1513
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1514
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1515 ;;;; The kill ring data structure.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1516
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1517 (defvar kill-ring nil
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1518 "List of killed text sequences.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1519 Since the kill ring is supposed to interact nicely with cut-and-paste
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1520 facilities offered by window systems, use of this variable should
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1521 interact nicely with `interprogram-cut-function' and
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1522 `interprogram-paste-function'. The functions `kill-new',
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1523 `kill-append', and `current-kill' are supposed to implement this
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1524 interaction; you may want to use them instead of manipulating the kill
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1525 ring directly.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1526
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1527 (defcustom kill-ring-max 30
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1528 "*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
1529 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1530 :group 'killing)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1531
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532 (defvar kill-ring-yank-pointer nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1533 "The tail of the kill ring whose car is the last thing yanked.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534
8763
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1535 (defun kill-new (string &optional replace)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1536 "Make STRING the latest kill in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1537 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
1538 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
1539 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
1540 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
1541 (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
1542 (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
1543 (if replace
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1544 (setcar kill-ring string)
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1545 (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
1546 (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
1547 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1548 (setq kill-ring-yank-pointer kill-ring)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1549 (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
1550 (funcall interprogram-cut-function string (not replace))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1551
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1552 (defun kill-append (string before-p)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1553 "Append STRING to the end of the latest kill in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1554 If BEFORE-P is non-nil, prepend STRING to the kill.
1760
05492c456293 (kill-append): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 1740
diff changeset
1555 If `interprogram-cut-function' is set, pass the resulting kill to
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1556 it."
8763
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1557 (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
1558 (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
1559 (concat (car kill-ring) string)) t))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1560
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1561 (defun current-kill (n &optional do-not-move)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1562 "Rotate the yanking point by N places, and then return that kill.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1563 If N is zero, `interprogram-paste-function' is set, and calling it
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1564 returns a string, then that string is added to the front of the
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1565 kill ring and returned as the latest kill.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1566 If optional arg DO-NOT-MOVE is non-nil, then don't actually move the
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1567 yanking point; just return the Nth kill forward."
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1568 (let ((interprogram-paste (and (= n 0)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1569 interprogram-paste-function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1570 (funcall interprogram-paste-function))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1571 (if interprogram-paste
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1572 (progn
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1573 ;; Disable the interprogram cut function when we add the new
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1574 ;; text to the kill ring, so Emacs doesn't try to own the
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1575 ;; selection, with identical text.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1576 (let ((interprogram-cut-function nil))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1577 (kill-new interprogram-paste))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1578 interprogram-paste)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1579 (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
1580 (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
1581 (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
1582 (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
1583 kill-ring)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1584 (or do-not-move
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1585 (setq kill-ring-yank-pointer ARGth-kill-element))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1586 (car ARGth-kill-element)))))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1587
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1588
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1589
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1590 ;;;; Commands for manipulating the kill ring.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1591
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1592 (defcustom kill-read-only-ok nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1593 "*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
1594 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1595 :group 'killing)
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1596
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1597 (put 'text-read-only 'error-conditions
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1598 '(text-read-only buffer-read-only error))
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1599 (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
1600
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1601 (defun kill-region (beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1602 "Kill between point and mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1603 The text is deleted but saved in the kill ring.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1604 The command \\[yank] can retrieve it from there.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1605 \(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
1606 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
1607 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
1608 you can use the killing commands to copy text from a read-only buffer.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1609
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1610 This is the primitive for programs to kill text (as opposed to deleting it).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1611 Supply two arguments, character numbers indicating the stretch of text
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1612 to be killed.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1613 Any command that calls this function is a \"kill command\".
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1614 If the previous command was also a kill command,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1615 the text killed this time appends to the text killed last time
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1616 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
1617 (interactive "r")
20279
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1618 (condition-case nil
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1619 ;; Don't let the undo list be truncated before we can even access it.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1620 (let ((undo-strong-limit (+ (- (max beg end) (min beg end)) 100))
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1621 (old-list buffer-undo-list)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1622 tail
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1623 ;; If we can't rely on finding the killed text
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1624 ;; in the undo list, save it now as a string.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1625 (string (if (or (eq buffer-undo-list t)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1626 (= beg end))
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1627 (buffer-substring beg end))))
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1628 (delete-region beg end)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1629 ;; Search back in buffer-undo-list for this string,
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1630 ;; in case a change hook made property changes.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1631 (setq tail buffer-undo-list)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1632 (unless string
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1633 (while (not (stringp (car (car tail))))
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1634 (setq tail (cdr tail)))
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1635 ;; If we did not already make the string to use,
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1636 ;; use the same one that undo made for us.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1637 (setq string (car (car tail))))
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1638 ;; Add that string to the kill ring, one way or another.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1639 (if (eq last-command 'kill-region)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1640 (kill-append string (< end beg))
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1641 (kill-new string))
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1642 (setq this-command 'kill-region))
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1643 ((buffer-read-only text-read-only)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1644 ;; The code above failed because the buffer, or some of the characters
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1645 ;; in the region, are read-only.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1646 ;; We should beep, in case the user just isn't aware of this.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1647 ;; However, there's no harm in putting
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1648 ;; the region's text in the kill ring, anyway.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1649 (copy-region-as-kill beg end)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1650 ;; This should always barf, and give us the correct error.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1651 (if kill-read-only-ok
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1652 (message "Read only text copied to kill ring")
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1653 (setq this-command 'kill-region)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1654 ;; Signal an error if the buffer is read-only.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1655 (barf-if-buffer-read-only)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1656 ;; If the buffer isn't read-only, the text is.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1657 (signal 'text-read-only (list (current-buffer)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1658
9876
75ecf866cfb8 Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents: 9870
diff changeset
1659 ;; 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
1660 ;; 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
1661 ;; then corrects it with the intended C-w.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1662 (defun copy-region-as-kill (beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1663 "Save the region as if killed, but don't kill it.
20484
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1664 In Transient Mark mode, deactivate the mark.
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
1665 If `interprogram-cut-function' is non-nil, also save the text for a window
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
1666 system cut and paste."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1667 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1668 (if (eq last-command 'kill-region)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1669 (kill-append (buffer-substring beg end) (< end beg))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1670 (kill-new (buffer-substring beg end)))
20484
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1671 (if transient-mark-mode
21193
20bba919ec72 (copy-region-as-kill): Set deactivate-mark
Richard M. Stallman <rms@gnu.org>
parents: 21175
diff changeset
1672 (setq deactivate-mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1673 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1674
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1675 (defun kill-ring-save (beg end)
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1676 "Save the region as if killed, but don't kill it.
20484
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1677 In Transient Mark mode, deactivate the mark.
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1678 If `interprogram-cut-function' is non-nil, also save the text for a window
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1679 system cut and paste.
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1680
3467
002945794814 (kill-ring-save): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3408
diff changeset
1681 This command is similar to `copy-region-as-kill', except that it gives
20484
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1682 visual feedback indicating the extent of the region being copied."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1683 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1684 (copy-region-as-kill beg end)
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
1685 (if (interactive-p)
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1686 (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
1687 (opoint (point))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1688 ;; 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
1689 ;; 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
1690 (inhibit-quit t))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1691 (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
1692 (progn
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1693 ;; Swap point and mark.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1694 (set-marker (mark-marker) (point) (current-buffer))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1695 (goto-char other-end)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1696 (sit-for 1)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1697 ;; Swap back.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1698 (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
1699 (goto-char opoint)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1700 ;; If user quit, deactivate the mark
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1701 ;; 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
1702 (and quit-flag mark-active
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1703 (deactivate-mark)))
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1704 (let* ((killed-text (current-kill 0))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1705 (message-len (min (length killed-text) 40)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1706 (if (= (point) beg)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1707 ;; Don't say "killed"; that is misleading.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1708 (message "Saved text until \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1709 (substring killed-text (- message-len)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1710 (message "Saved text from \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1711 (substring killed-text 0 message-len))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1712
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1713 (defun append-next-kill ()
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1714 "Cause following command, if it kills, to append to previous kill."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1715 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1716 (if (interactive-p)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1717 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1718 (setq this-command 'kill-region)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1719 (message "If the next command is a kill, it will append"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1720 (setq last-command 'kill-region)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1721
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1722 (defun yank-pop (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1723 "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
1724 This command is allowed only immediately after a `yank' or a `yank-pop'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1725 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
1726 previously-killed text. `yank-pop' deletes that text and inserts in its
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1727 place a different stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1728
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1729 With no argument, the previous kill is inserted.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1730 With argument N, insert the Nth previous kill.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1731 If N is negative, this is a more recent kill.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1732
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1733 The sequence of kills wraps around, so that after the oldest one
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1734 comes the newest one."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1735 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1736 (if (not (eq last-command 'yank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1737 (error "Previous command was not a yank"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1738 (setq this-command 'yank)
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1739 (let ((inhibit-read-only t)
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1740 (before (< (point) (mark t))))
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1741 (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
1742 (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
1743 (let ((opoint (point)))
18820
ac2b130c513a (yank, yank-pop): Clear out read-only prop.
Richard M. Stallman <rms@gnu.org>
parents: 18731
diff changeset
1744 (insert (current-kill arg))
18902
7ce2d04d5561 (yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents: 18825
diff changeset
1745 (let ((inhibit-read-only t))
7ce2d04d5561 (yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents: 18825
diff changeset
1746 (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
1747 (if before
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1748 ;; 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
1749 ;; 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
1750 ;; 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
1751 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1752 (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
1753 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1754
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1755 (defun yank (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1756 "Reinsert the last stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1757 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
1758 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
1759 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
1760 With argument N, reinsert the Nth most recently killed stretch of killed
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1761 text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1762 See also the command \\[yank-pop]."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1763 (interactive "*P")
5935
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
1764 ;; 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
1765 ;; for the following command.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
1766 (setq this-command t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1767 (push-mark (point))
18902
7ce2d04d5561 (yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents: 18825
diff changeset
1768 (let ((opoint (point)))
18820
ac2b130c513a (yank, yank-pop): Clear out read-only prop.
Richard M. Stallman <rms@gnu.org>
parents: 18731
diff changeset
1769 (insert (current-kill (cond
ac2b130c513a (yank, yank-pop): Clear out read-only prop.
Richard M. Stallman <rms@gnu.org>
parents: 18731
diff changeset
1770 ((listp arg) 0)
ac2b130c513a (yank, yank-pop): Clear out read-only prop.
Richard M. Stallman <rms@gnu.org>
parents: 18731
diff changeset
1771 ((eq arg '-) -1)
ac2b130c513a (yank, yank-pop): Clear out read-only prop.
Richard M. Stallman <rms@gnu.org>
parents: 18731
diff changeset
1772 (t (1- arg)))))
18902
7ce2d04d5561 (yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents: 18825
diff changeset
1773 (let ((inhibit-read-only t))
7ce2d04d5561 (yank, yank-pop): Bind inhibit-read-only
Richard M. Stallman <rms@gnu.org>
parents: 18825
diff changeset
1774 (remove-text-properties opoint (point) '(read-only nil))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1775 (if (consp arg)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1776 ;; 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
1777 ;; 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
1778 ;; 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
1779 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1780 (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
1781 ;; 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
1782 (setq this-command 'yank)
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1783 nil)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1784
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1785 (defun rotate-yank-pointer (arg)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1786 "Rotate the yanking point in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1787 With argument, rotate that many kills forward (or backward, if negative)."
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1788 (interactive "p")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1789 (current-kill arg))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1790
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1791
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1792 (defun insert-buffer (buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1793 "Insert after point the contents of BUFFER.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1794 Puts mark after the inserted text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1795 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
1796 (interactive
14834
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
1797 (list
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
1798 (progn
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
1799 (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
1800 (read-buffer "Insert buffer: "
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
1801 (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
1802 (other-buffer (current-buffer))
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
1803 (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
1804 t))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1805 (or (bufferp buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1806 (setq buffer (get-buffer buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1807 (let (start end newmark)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1808 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1809 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1810 (set-buffer buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1811 (setq start (point-min) end (point-max)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1812 (insert-buffer-substring buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1813 (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
1814 (push-mark newmark))
d65c1fefc636 * simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents: 1838
diff changeset
1815 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1816
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1817 (defun append-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1818 "Append to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1819 It is inserted into that buffer before its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1820
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1821 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1822 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1823 START and END specify the portion of the current buffer to be copied."
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1824 (interactive
10048
db01a04d2afb (append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents: 10034
diff changeset
1825 (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
1826 (region-beginning) (region-end)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1827 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1828 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1829 (set-buffer (get-buffer-create buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1830 (insert-buffer-substring oldbuf start end))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1831
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1832 (defun prepend-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1833 "Prepend to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1834 It is inserted into that buffer after its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1835
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1836 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1837 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1838 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1839 (interactive "BPrepend to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1840 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1841 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1842 (set-buffer (get-buffer-create buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1843 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1844 (insert-buffer-substring oldbuf start end)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1845
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1846 (defun copy-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1847 "Copy to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1848 It is inserted into that buffer, replacing existing text there.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1849
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1850 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1851 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1852 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1853 (interactive "BCopy to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1854 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1855 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1856 (set-buffer (get-buffer-create buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1857 (erase-buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1858 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1859 (insert-buffer-substring oldbuf start end)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1860
4040
d06d7295d3eb Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents: 3967
diff changeset
1861 (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
1862 (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
1863
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1864 (defun mark (&optional force)
3487
8c151ebeff9c (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3467
diff changeset
1865 "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
1866 If optional argument FORCE is non-nil, access the mark value
3487
8c151ebeff9c (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3467
diff changeset
1867 even if the mark is not currently active, and return nil
8c151ebeff9c (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3467
diff changeset
1868 if there is no mark at all.
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1869
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1870 If you are using this in an editing command, you are most likely making
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1871 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
1872 (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
1873 (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
1874 (signal 'mark-inactive nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1875
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1876 ;; 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
1877 ;; run deactivate-mark-hook. This shorthand should simplify.
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1878 (defsubst deactivate-mark ()
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1879 "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
1880 \(That makes a difference only in Transient Mark mode.)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1881 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
1882 (if transient-mark-mode
0998ca7d922c (deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 7698
diff changeset
1883 (progn
0998ca7d922c (deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 7698
diff changeset
1884 (setq mark-active nil)
0998ca7d922c (deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 7698
diff changeset
1885 (run-hooks 'deactivate-mark-hook))))
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1886
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1887 (defun set-mark (pos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1888 "Set this buffer's mark to POS. Don't use this function!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1889 That is to say, don't use this function unless you want
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1890 the user to see that the mark has moved, and you want the previous
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1891 mark position to be lost.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1892
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1893 Normally, when a new mark is set, the old one should go on the stack.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1894 This is why most applications should use push-mark, not set-mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1895
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1896 Novice Emacs Lisp programmers often try to use the mark for the wrong
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1897 purposes. The mark saves a location for the user's convenience.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1898 Most editing commands should not alter the mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1899 To remember a location for internal use in the Lisp program,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1900 store it in a Lisp variable. Example:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1901
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1902 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1903
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1904 (if pos
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1905 (progn
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1906 (setq mark-active t)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1907 (run-hooks 'activate-mark-hook)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1908 (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
1909 ;; 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
1910 ;; 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
1911 ;; 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
1912 (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
1913 (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
1914 (set-marker (mark-marker) nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1915
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1916 (defvar mark-ring nil
8695
0f702e9ab06d (mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8660
diff changeset
1917 "The list of former marks of the current buffer, most recent first.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1918 (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
1919 (put 'mark-ring 'permanent-local t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1920
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1921 (defcustom mark-ring-max 16
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1922 "*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
1923 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1924 :group 'editing-basics)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1925
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1926 (defvar global-mark-ring nil
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1927 "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
1928
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1929 (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
1930 "*Maximum size of global mark ring. \
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1931 Start discarding off end if gets this big."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1932 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1933 :group 'editing-basics)
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1934
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1935 (defun set-mark-command (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1936 "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
1937 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
1938 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
1939 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
1940 \(does not affect global mark ring\).
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1941
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1942 Novice Emacs Lisp programmers often try to use the mark for the wrong
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1943 purposes. See the documentation of `set-mark' for more information."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1944 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1945 (if (null arg)
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1946 (progn
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1947 (push-mark nil nil t))
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1948 (if (null (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1949 (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
1950 (goto-char (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1951 (pop-mark))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1952
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1953 (defun push-mark (&optional location nomsg activate)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1954 "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
1955 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
1956 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
1957 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
1958 In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1959
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1960 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
1961 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
1962
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1963 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
1964 (if (null (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1965 nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1966 (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1967 (if (> (length mark-ring) mark-ring-max)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1968 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1969 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1970 (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
1971 (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
1972 ;; 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
1973 (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
1974 (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
1975 ;; 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
1976 ;; 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
1977 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
1978 (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
1979 (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
1980 (progn
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1981 (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
1982 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
1983 (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
1984 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1985 (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
1986 (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
1987 (set-mark (mark t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1988 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1989
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1990 (defun pop-mark ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1991 "Pop off mark ring into the buffer's actual mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1992 Does not set point. Does nothing if mark ring is empty."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1993 (if mark-ring
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1994 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1995 (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
1996 (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
1997 (deactivate-mark)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1998 (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
1999 (if (null (mark t)) (ding))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2000 (setq mark-ring (cdr mark-ring)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2001
16436
d2acc84badf4 Use defalias not define-function.
Richard M. Stallman <rms@gnu.org>
parents: 16417
diff changeset
2002 (defalias 'exchange-dot-and-mark 'exchange-point-and-mark)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2003 (defun exchange-point-and-mark ()
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2004 "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
2005 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
2006 and it reactivates the mark."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2007 (interactive nil)
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2008 (let ((omark (mark t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2009 (if (null omark)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2010 (error "No mark set in this buffer"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2011 (set-mark (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2012 (goto-char omark)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013 nil))
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
2014
17514
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
2015 (defun transient-mark-mode (arg)
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
2016 "Toggle Transient Mark mode.
2935
653e14f61220 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 2850
diff changeset
2017 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
2018
5372
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
2019 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
2020 Changing the buffer \"deactivates\" the mark.
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
2021 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
2022 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
2023 incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]."
17514
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
2024 (interactive "P")
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
2025 (setq transient-mark-mode
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
2026 (if (null arg)
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
2027 (not transient-mark-mode)
17513
ea3acb6b992a (transient-mark-mode): Print message if used interactively.
Richard M. Stallman <rms@gnu.org>
parents: 17471
diff changeset
2028 (> (prefix-numeric-value arg) 0)))
17514
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
2029 (if (interactive-p)
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
2030 (if transient-mark-mode
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
2031 (message "Transient Mark mode enabled")
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
2032 (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
2033
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2034 (defun pop-global-mark ()
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2035 "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
2036 (interactive)
7881
4ab8723cd491 (pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents: 7877
diff changeset
2037 ;; 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
2038 (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
2039 (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
2040 (or global-mark-ring
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2041 (error "No global mark set"))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2042 (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
2043 (buffer (marker-buffer marker))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2044 (position (marker-position marker)))
10351
e34cbd5276bd (pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents: 10284
diff changeset
2045 (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
2046 (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
2047 (set-buffer buffer)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2048 (or (and (>= position (point-min))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2049 (<= position (point-max)))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2050 (widen))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2051 (goto-char position)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2052 (switch-to-buffer buffer)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2053
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2054 (defcustom next-line-add-newlines t
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2055 "*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
2056 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2057 :group 'editing-basics)
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
2058
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2059 (defun next-line (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2060 "Move cursor vertically down ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2061 If there is no character in the target line exactly under the current column,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2062 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2063 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
2064 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
2065 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
2066 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
2067 cursor to the end of the buffer.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2068
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2069 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
2070 a semipermanent goal column for this command.
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2071 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
2072 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
2073 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
2074 when there is no goal column.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2075
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2076 If you are thinking of using this in a Lisp program, consider
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2077 using `forward-line' instead. It is usually easier to use
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2078 and more reliable (no dependence on goal column, etc.)."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2079 (interactive "p")
5675
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
2080 (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
2081 (let ((opoint (point)))
8309
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
2082 (end-of-line)
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
2083 (if (eobp)
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2084 (newline 1)
5675
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
2085 (goto-char opoint)
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
2086 (line-move arg)))
10226
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2087 (if (interactive-p)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2088 (condition-case nil
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2089 (line-move arg)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2090 ((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
2091 (line-move arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2092 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2093
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2094 (defun previous-line (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2095 "Move cursor vertically up ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2096 If there is no character in the target line exactly over the current column,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2097 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2098 column, or at the end of the line if it is not long enough.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2099
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2100 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
2101 a semipermanent goal column for this command.
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2102 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
2103 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
2104 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
2105 when there is no goal column.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2106
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2107 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
2108 `forward-line' with a negative argument instead. It is usually easier
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2109 to use and more reliable (no dependence on goal column, etc.)."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2110 (interactive "p")
10226
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2111 (if (interactive-p)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2112 (condition-case nil
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2113 (line-move (- arg))
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2114 ((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
2115 (line-move (- arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2116 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2117
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2118 (defcustom track-eol nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2119 "*Non-nil means vertical motion starting at end of line keeps to ends of lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2120 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
2121 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
2122 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2123 :group 'editing-basics)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2124
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2125 (defcustom goal-column nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2126 "*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
2127 :type '(choice integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2128 (const :tag "None" nil))
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2129 :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
2130 (make-variable-buffer-local 'goal-column)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2131
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2132 (defvar temporary-goal-column 0
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2133 "Current goal column for vertical motion.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2134 It is the column where point was
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2135 at the start of current run of vertical motion commands.
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
2136 When the `track-eol' feature is doing its job, the value is 9999.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2137
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2138 (defcustom line-move-ignore-invisible nil
10949
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
2139 "*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
2140 Outline mode sets this."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2141 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2142 :group 'editing-basics)
10949
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
2143
11326
0d5ebc078c51 (line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents: 11324
diff changeset
2144 ;; 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
2145 ;; Arg says how many lines to move.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2146 (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
2147 ;; 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
2148 ;; for intermediate positions.
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2149 (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
2150 (opoint (point))
19003
9d24caacda44 (line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents: 18902
diff changeset
2151 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
2152 (unwind-protect
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2153 (progn
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2154 (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
2155 (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
2156 (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
2157 (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
2158 ;; 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
2159 ;; 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
2160 (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
2161 9999
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2162 (current-column))))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2163 (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
2164 (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
2165 ;; 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
2166 (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
2167 (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
2168 ;; 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
2169 ;; 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
2170 ;; 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
2171 (end-of-line)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2172 (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
2173 (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
2174 (bolp)))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2175 (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
2176 'beginning-of-buffer
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2177 'end-of-buffer)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2178 nil))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2179 ;; 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
2180 (while (> arg 0)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2181 (end-of-line)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2182 (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
2183 (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
2184 ;; 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
2185 ;; 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
2186 (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
2187 (let ((prop
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2188 (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
2189 (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
2190 prop
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2191 (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
2192 (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
2193 (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
2194 (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
2195 (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
2196 (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
2197 (while (< arg 0)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2198 (beginning-of-line)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2199 (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
2200 (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
2201 (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
2202 (let ((prop
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2203 (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
2204 (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
2205 prop
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2206 (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
2207 (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
2208 (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
2209 (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
2210 (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
2211 (setq arg (1+ arg))))
16408
87f15c601f5a (line-move): Ignore invisibility in `move-to-column'.
Richard M. Stallman <rms@gnu.org>
parents: 16316
diff changeset
2212 (let ((buffer-invisibility-spec nil))
87f15c601f5a (line-move): Ignore invisibility in `move-to-column'.
Richard M. Stallman <rms@gnu.org>
parents: 16316
diff changeset
2213 (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
2214 (setq new (point))
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
2215 ;; 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
2216 ;; 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
2217 ;; 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
2218 (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
2219 (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
2220 (let ((after (and (< new (point-max))
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
2221 (get-char-property new 'intangible)))
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
2222 (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
2223 (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
2224 (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
2225 (not (bolp)))
18034
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
2226 (goto-char (point-min))
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
2227 (let ((inhibit-point-motion-hooks nil))
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
2228 (goto-char new))
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
2229 (if (<= new line-end)
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
2230 (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
2231 ;; 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
2232 ;; 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
2233 ;; 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
2234 ;; 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
2235 (goto-char opoint)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2236 (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
2237 (goto-char new)
9d24caacda44 (line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents: 18902
diff changeset
2238 ;; 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
2239 ;; 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
2240 (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
2241 (setq new (point))
9d24caacda44 (line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents: 18902
diff changeset
2242 (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
2243 (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
2244 (beginning-of-line)
9d24caacda44 (line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents: 18902
diff changeset
2245 (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
2246 (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
2247 (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
2248 (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
2249 (setq new (point)))
9d24caacda44 (line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents: 18902
diff changeset
2250 (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
2251 (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
2252 (goto-char new)
9d24caacda44 (line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents: 18902
diff changeset
2253 )))
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2254 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2255
1771
3f0f18d4eb8c * simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents: 1760
diff changeset
2256 ;;; 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
2257 ;;; 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
2258 (put 'set-goal-column 'disabled t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2259
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2260 (defun set-goal-column (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2261 "Set the current horizontal position as a goal for \\[next-line] and \\[previous-line].
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2262 Those commands will move to this position in the line moved to
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2263 rather than trying to keep the same horizontal position.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2264 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
2265 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
2266 The goal column is stored in the variable `goal-column'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2267 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2268 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2269 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2270 (setq goal-column nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2271 (message "No goal column"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2272 (setq goal-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2273 (message (substitute-command-keys
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2274 "Goal column %d (use \\[set-goal-column] with an arg to unset it)")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2275 goal-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2276 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2277
2597
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
2278 ;;; Partial support for horizontal autoscrolling. Someday, this feature
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
2279 ;;; 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
2280 ;;; will go away.
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
2281
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2282 (defcustom hscroll-step 0
2597
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
2283 "*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
2284 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
2285 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
2286 :type '(choice (const :tag "Alway Center" 0)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2287 (integer :format "%v" 1))
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2288 :group 'editing-basics)
2597
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
2289
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
2290 (defun hscroll-point-visible ()
6743
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2291 "Scrolls the selected window horizontally to make point visible."
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2292 (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2293 (set-buffer (window-buffer))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2294 (if (not (or truncate-lines
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2295 (> (window-hscroll) 0)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2296 (and truncate-partial-width-windows
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2297 (< (window-width) (frame-width)))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2298 ;; Point is always visible when lines are wrapped.
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2299 ()
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2300 ;; 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
2301 ;; 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
2302 (and (< (point) (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2303 (let ((ws-bol (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2304 (goto-char (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2305 (beginning-of-line)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2306 (point))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2307 (and (>= (point) ws-bol)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2308 (set-window-start nil ws-bol))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2309 (let* ((here (hscroll-window-column))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2310 (left (min (window-hscroll) 1))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2311 (right (1- (window-width))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2312 ;; 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
2313 (if (not (and (= here right)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2314 (= (following-char) ?\n)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2315 (setq right (1- right)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2316 (cond
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2317 ;; 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
2318 ;; white space off the end of the line.
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2319 ((or (< here (- left hscroll-step))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2320 (> here (+ right hscroll-step)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2321 (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
2322 (scroll-left (min (- here (/ (window-width) 2))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2323 (- eol (window-width) -5)))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2324 ;; 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
2325 ((< here left)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2326 (scroll-right hscroll-step))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2327 ((> here right)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2328 (scroll-left hscroll-step)))))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2329
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2330 ;; 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
2331 ;; 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
2332 ;; 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
2333 ;; 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
2334 ;; 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
2335 ;; 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
2336 ;; 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
2337 (defun hscroll-window-column ()
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2338 (let* ((hscroll (window-hscroll))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2339 (startpos (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2340 (beginning-of-line)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2341 (if (= (point) (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2342 (goto-char (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2343 (beginning-of-line)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2344 (point)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2345 (goto-char (window-start)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2346 (point)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2347 (hpos (+ (if (and (eq (selected-window) (minibuffer-window))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2348 (= 1 (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2349 (= startpos (point-min)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2350 (minibuffer-prompt-width)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2351 0)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2352 (min 0 (- 1 hscroll))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2353 val)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2354 (car (cdr (compute-motion startpos (cons hpos 0)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2355 (point) (cons 0 1)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2356 1000000 (cons hscroll 0) nil)))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
2357
2597
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
2358
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
2359 ;; 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
2360 ;; 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
2361 ;; (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
2362 ;; 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
2363 ;; 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
2364
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
2365 ;;;;; 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
2366 ;;;;; 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
2367 ;;;;; 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
2368 ;;;;; 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
2369 ;;;;; events in loaddefs.el.
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
2370
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
2371 ;;(defun right-arrow (arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
2372 ;; "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
2373 ;;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
2374 ;; (interactive "P")
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
2375 ;; (forward-char arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
2376 ;; (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
2377
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
2378 ;;(defun left-arrow (arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
2379 ;; "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
2380 ;;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
2381 ;; (interactive "P")
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
2382 ;; (backward-char arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
2383 ;; (hscroll-point-visible))
8006
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2384
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2385 (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
2386 "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
2387 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
2388 (interactive "P")
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2389 (scroll-other-window
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2390 ;; Just invert the argument's meaning.
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2391 ;; 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
2392 (if (eq lines '-) nil
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2393 (if (null lines) '-
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2394 (- (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
2395 (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
2396
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2397 (defun beginning-of-buffer-other-window (arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2398 "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
2399 Leave mark at previous position.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2400 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
2401 (interactive "P")
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2402 (let ((orig-window (selected-window))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2403 (window (other-window-for-scrolling)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2404 ;; 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
2405 ;; 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
2406 (unwind-protect
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2407 (progn
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2408 (select-window window)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2409 ;; 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
2410 (beginning-of-buffer arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2411 ;; Set point accordingly.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2412 (recenter '(t)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2413 (select-window orig-window))))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2414
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2415 (defun end-of-buffer-other-window (arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2416 "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
2417 Leave mark at previous position.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2418 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
2419 (interactive "P")
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2420 ;; See beginning-of-buffer-other-window for comments.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2421 (let ((orig-window (selected-window))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2422 (window (other-window-for-scrolling)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2423 (unwind-protect
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2424 (progn
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2425 (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
2426 (end-of-buffer arg)
8057
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2427 (recenter '(t)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2428 (select-window orig-window))))
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
2429
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2430 (defun transpose-chars (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2431 "Interchange characters around point, moving forward one character.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2432 With prefix arg ARG, effect is to take character before point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2433 and drag it forward past ARG other characters (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2434 If no argument and at end of line, the previous two chars are exchanged."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2435 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2436 (and (null arg) (eolp) (forward-char -1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2437 (transpose-subr 'forward-char (prefix-numeric-value arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2438
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2439 (defun transpose-words (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2440 "Interchange words around point, leaving point at end of them.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2441 With prefix arg ARG, effect is to take word before or around point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2442 and drag it forward past ARG other words (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2443 If ARG is zero, the words around or after point and around or after mark
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2444 are interchanged."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2445 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2446 (transpose-subr 'forward-word arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2447
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2448 (defun transpose-sexps (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2449 "Like \\[transpose-words] but applies to sexps.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2450 Does not work on a sexp that point is in the middle of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2451 if it is a list or string."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2452 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2453 (transpose-subr 'forward-sexp arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2454
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2455 (defun transpose-lines (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2456 "Exchange current line and previous line, leaving point after both.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2457 With argument ARG, takes previous line and moves it past ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2458 With argument 0, interchanges line point is in with line mark is in."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2459 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2460 (transpose-subr (function
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2461 (lambda (arg)
20465
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2462 (if (> arg 0)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2463 (progn
20465
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2464 ;; Move forward over ARG lines,
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2465 ;; but create newlines if necessary.
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2466 (setq arg (forward-line arg))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2467 (if (/= (preceding-char) ?\n)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2468 (setq arg (1+ arg)))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2469 (if (> arg 0)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2470 (newline arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2471 (forward-line arg))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2472 arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2473
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2474 (defun transpose-subr (mover arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2475 (let (start1 end1 start2 end2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2476 (if (= arg 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2477 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2478 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2479 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2480 (setq end2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2481 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2482 (setq start2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2483 (goto-char (mark))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2484 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2485 (setq end1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2486 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2487 (setq start1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2488 (transpose-subr-1))
20465
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2489 (exchange-point-and-mark))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2490 (if (> arg 0)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2491 (progn
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2492 (funcall mover -1)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2493 (setq start1 (point))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2494 (funcall mover 1)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2495 (setq end1 (point))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2496 (funcall mover arg)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2497 (setq end2 (point))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2498 (funcall mover (- arg))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2499 (setq start2 (point))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2500 (transpose-subr-1)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2501 (goto-char end2))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2502 (funcall mover -1)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2503 (setq start2 (point))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2504 (funcall mover 1)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2505 (setq end2 (point))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2506 (funcall mover (1- arg))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2507 (setq start1 (point))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2508 (funcall mover (- arg))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2509 (setq end1 (point))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
2510 (transpose-subr-1)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2511
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2512 (defun transpose-subr-1 ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2513 (if (> (min end1 end2) (max start1 start2))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2514 (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
2515 (let* ((word1 (buffer-substring start1 end1))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2516 (len1 (length word1))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2517 (word2 (buffer-substring start2 end2))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2518 (len2 (length word2)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2519 (delete-region start2 end2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2520 (goto-char start2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2521 (insert word1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2522 (goto-char (if (< start1 start2) start1
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2523 (+ start1 (- len1 len2))))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2524 (delete-region (point) (+ (point) len1))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2525 (insert word2)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2526
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2527 (defcustom comment-column 32
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2528 "*Column to indent right-margin comments to.
1581
9de0900ca56a * simple.el (comment-column): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1556
diff changeset
2529 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
2530 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
2531 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
2532 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2533 :group 'fill-comments)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2534 (make-variable-buffer-local 'comment-column)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2535
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2536 (defcustom comment-start nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2537 "*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
2538 :type '(choice (const :tag "None" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2539 string)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2540 :group 'fill-comments)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2541
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2542 (defcustom comment-start-skip nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2543 "*Regexp to match the start of a comment plus everything up to its body.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2544 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
2545 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
2546 :type '(choice (const :tag "None" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2547 regexp)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2548 :group 'fill-comments)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2549
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2550 (defcustom comment-end ""
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2551 "*String to insert to end a new comment.
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2552 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
2553 :type 'string
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2554 :group 'fill-comments)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2555
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2556 (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
2557 "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
2558 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
2559 the comment's starting delimiter.")
53abb56a18fa * simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents: 2215
diff changeset
2560
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2561 (defvar comment-indent-function
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2562 '(lambda () comment-column)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2563 "Function to compute desired indentation for a comment.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2564 This function is called with no args with point at the beginning of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2565 the comment's starting delimiter.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2566
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2567 (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
2568 "*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
2569 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
2570 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
2571 as well as the `comment-start' string."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2572 :type '(choice (const :tag "Use comment-start" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2573 string)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2574 :group 'fill-comments)
10983
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2575
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2576 (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
2577 "*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
2578 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
2579 If nil, use `comment-end' instead."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2580 :type '(choice (const :tag "Use comment-end" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2581 string)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2582 :group 'fill-comments)
10983
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2583
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2584 (defun indent-for-comment ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2585 "Indent this line's comment to comment column, or insert an empty comment."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2586 (interactive "*")
10983
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2587 (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
2588 (looking-at "[ \t]*$")))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2589 (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
2590 (ender (or (and empty block-comment-end) comment-end)))
20384
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2591 (cond
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2592 ((null starter)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2593 (error "No comment syntax defined"))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2594 ((null comment-start-skip)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2595 (error "This mode doesn't define `comment-start-skip'"))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2596 (t (let* ((eolpos (save-excursion (end-of-line) (point)))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2597 cpos indent begpos)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2598 (beginning-of-line)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2599 (if (re-search-forward comment-start-skip eolpos 'move)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2600 (progn (setq cpos (point-marker))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2601 ;; Find the start of the comment delimiter.
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2602 ;; If there were paren-pairs in comment-start-skip,
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2603 ;; position at the end of the first pair.
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2604 (if (match-end 1)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2605 (goto-char (match-end 1))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2606 ;; If comment-start-skip matched a string with
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2607 ;; internal whitespace (not final whitespace) then
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2608 ;; the delimiter start at the end of that
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2609 ;; whitespace. Otherwise, it starts at the
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2610 ;; beginning of what was matched.
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2611 (skip-syntax-backward " " (match-beginning 0))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2612 (skip-syntax-backward "^ " (match-beginning 0)))))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2613 (setq begpos (point))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2614 ;; Compute desired indent.
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2615 (if (= (current-column)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2616 (setq indent (if comment-indent-hook
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2617 (funcall comment-indent-hook)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2618 (funcall comment-indent-function))))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2619 (goto-char begpos)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2620 ;; If that's different from current, change it.
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2621 (skip-chars-backward " \t")
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2622 (delete-region (point) begpos)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2623 (indent-to indent))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2624 ;; An existing comment?
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2625 (if cpos
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2626 (progn (goto-char cpos)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2627 (set-marker cpos nil))
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2628 ;; No, insert one.
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2629 (insert starter)
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2630 (save-excursion
931b472be076 (indent-for-comment): Check for null `comment-start-skip'.
Dave Love <fx@gnu.org>
parents: 20279
diff changeset
2631 (insert ender))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2632
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2633 (defun set-comment-column (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2634 "Set the comment column based on point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2635 With no arg, set the comment column to the current column.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2636 With just minus as arg, kill any comment on this line.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2637 With any other arg, set comment column to indentation of the previous comment
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2638 and then align or create a comment on this line at that column."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2639 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2640 (if (eq arg '-)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2641 (kill-comment nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2642 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2643 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2644 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2645 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2646 (re-search-backward comment-start-skip)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2647 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2648 (re-search-forward comment-start-skip)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2649 (goto-char (match-beginning 0))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2650 (setq comment-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2651 (message "Comment column set to %d" comment-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2652 (indent-for-comment))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2653 (setq comment-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2654 (message "Comment column set to %d" comment-column))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2655
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2656 (defun kill-comment (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2657 "Kill the comment on this line, if any.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2658 With argument, kill comments on that many lines starting with this one."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2659 ;; this function loses in a lot of situations. it incorrectly recognises
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2660 ;; comment delimiters sometimes (ergo, inside a string), doesn't work
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2661 ;; with multi-line comments, can kill extra whitespace if comment wasn't
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2662 ;; through end-of-line, et cetera.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2663 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2664 (or comment-start-skip (error "No comment syntax defined"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2665 (let ((count (prefix-numeric-value arg)) endc)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2666 (while (> count 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2667 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2668 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2669 (setq endc (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2670 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2671 (and (string< "" comment-end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2672 (setq endc
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2673 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2674 (re-search-forward (regexp-quote comment-end) endc 'move)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2675 (skip-chars-forward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2676 (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2677 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2678 (if (re-search-forward comment-start-skip endc t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2679 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2680 (goto-char (match-beginning 0))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2681 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2682 (kill-region (point) endc)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2683 ;; to catch comments a line beginnings
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2684 (indent-according-to-mode))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2685 (if arg (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2686 (setq count (1- count)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2687
20265
37a6af24de93 (comment-padding): New var.
Karl Heuer <kwzh@gnu.org>
parents: 20054
diff changeset
2688 (defvar comment-padding 1
37a6af24de93 (comment-padding): New var.
Karl Heuer <kwzh@gnu.org>
parents: 20054
diff changeset
2689 "Number of spaces `comment-region' puts between comment chars and text.
37a6af24de93 (comment-padding): New var.
Karl Heuer <kwzh@gnu.org>
parents: 20054
diff changeset
2690
37a6af24de93 (comment-padding): New var.
Karl Heuer <kwzh@gnu.org>
parents: 20054
diff changeset
2691 Extra spacing between the comment characters and the comment text
37a6af24de93 (comment-padding): New var.
Karl Heuer <kwzh@gnu.org>
parents: 20054
diff changeset
2692 makes the comment easier to read. Default is 1. Nil means 0 and is
37a6af24de93 (comment-padding): New var.
Karl Heuer <kwzh@gnu.org>
parents: 20054
diff changeset
2693 more efficient.")
37a6af24de93 (comment-padding): New var.
Karl Heuer <kwzh@gnu.org>
parents: 20054
diff changeset
2694
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2695 (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
2696 "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
2697 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
2698 Numeric prefix arg ARG means use ARG comment characters.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2699 If ARG is negative, delete that many comment characters instead.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2700 Comments are terminated on each line, even for syntax in which newline does
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2701 not end the comment. Blank lines do not get comments."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2702 ;; if someone wants it to only put a comment-start at the beginning and
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2703 ;; comment-end at the end then typing it, C-x C-x, closing it, C-x C-x
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2704 ;; is easy enough. No option is made here for other than commenting
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2705 ;; every line.
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2706 (interactive "r\nP")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2707 (or comment-start (error "No comment syntax is defined"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2708 (if (> beg end) (let (mid) (setq mid beg beg end end mid)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2709 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2710 (save-restriction
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2711 (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
2712 numarg)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2713 (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
2714 (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
2715 ;; 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
2716 ;; 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
2717 (while (> numarg 1)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2718 (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
2719 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
2720 (setq numarg (1- numarg))))
20265
37a6af24de93 (comment-padding): New var.
Karl Heuer <kwzh@gnu.org>
parents: 20054
diff changeset
2721 (when comment-padding
37a6af24de93 (comment-padding): New var.
Karl Heuer <kwzh@gnu.org>
parents: 20054
diff changeset
2722 (setq cs (concat cs (make-string comment-padding ? ))))
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2723 ;; Loop over all lines from BEG to END.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2724 (narrow-to-region beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2725 (goto-char beg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2726 (while (not (eobp))
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2727 (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
2728 (progn
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2729 ;; 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
2730 (if (eq numarg t)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2731 (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
2732 (delete-char (length cs)))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2733 (let ((count numarg))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2734 (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
2735 (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
2736 (delete-char (length cs)))))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2737 ;; 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
2738 (if (string= "" ce)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2739 nil
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2740 (if (eq numarg t)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2741 (progn
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2742 (end-of-line)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2743 ;; 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
2744 ;; 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
2745 ;; though.
16508
fd19350c1405 (comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents: 16445
diff changeset
2746 (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
2747 (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
2748 (save-excursion
fd19350c1405 (comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents: 16445
diff changeset
2749 (backward-char (length ce))
fd19350c1405 (comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents: 16445
diff changeset
2750 (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
2751 (delete-char (- (length ce)))))
5767
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2752 (let ((count numarg))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2753 (while (> 1 (setq count (1+ count)))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2754 (end-of-line)
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2755 ;; 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
2756 ;; that is pretty brain-damaged though
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2757 (skip-chars-backward " \t")
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2758 (save-excursion
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2759 (backward-char (length ce))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2760 (if (looking-at (regexp-quote ce))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2761 (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
2762 (forward-line 1))
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2763 ;; Insert at beginning and at end.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2764 (if (looking-at "[ \t]*$") ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2765 (insert cs)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2766 (if (string= "" ce) ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2767 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2768 (insert ce)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2769 (search-forward "\n" nil 'move)))))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2770
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2771 (defun backward-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2772 "Move backward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2773 With argument, do this that many times.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2774 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
2775 (interactive "p")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2776 (forward-word (- arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2777
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2778 (defun mark-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2779 "Set mark arg words away from point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2780 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2781 (push-mark
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2782 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2783 (forward-word arg)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2784 (point))
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2785 nil t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2786
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2787 (defun kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2788 "Kill characters forward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2789 With argument, do this that many times."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2790 (interactive "p")
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
2791 (kill-region (point) (progn (forward-word arg) (point))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2792
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2793 (defun backward-kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2794 "Kill characters backward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2795 With argument, do this that many times."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2796 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2797 (kill-word (- arg)))
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2798
6174
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2799 (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
2800 "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
2801 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
2802 or adjacent to a word."
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2803 (save-excursion
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2804 (let ((oldpoint (point)) (start (point)) (end (point)))
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2805 (skip-syntax-backward "w_") (setq start (point))
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2806 (goto-char oldpoint)
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2807 (skip-syntax-forward "w_") (setq end (point))
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2808 (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
2809 ;; 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
2810 (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
2811 (progn
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2812 ;; 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
2813 (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
2814 (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
2815 (point)))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2816 (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
2817 ;; 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
2818 ;; 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
2819 (progn
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2820 (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
2821 (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
2822 (point)))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2823 (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
2824 (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
2825 (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
2826 (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
2827 (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
2828 (setq start (point)))
18379
1dd6f63f0ea3 (paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18334
diff changeset
2829 (buffer-substring-no-properties start end)))
1dd6f63f0ea3 (paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18334
diff changeset
2830 (buffer-substring-no-properties start end)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2831
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2832 (defcustom fill-prefix nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2833 "*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
2834 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
2835 :type '(choice (const :tag "None" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2836 string)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2837 :group 'fill)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2838 (make-variable-buffer-local 'fill-prefix)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2839
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2840 (defcustom auto-fill-inhibit-regexp nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2841 "*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
2842 :type '(choice (const :tag "None" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2843 regexp)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2844 :group 'fill)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2845
19160
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
2846 (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
2847 "*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
2848
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
2849 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
2850 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
2851 indicating whether it should use soft newlines.
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
2852
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
2853 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
2854
21122
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2855 ;; This function is used as the auto-fill-function of a buffer
15263
0d7899c372ed (do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents: 15115
diff changeset
2856 ;; 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
2857 ;; It returns t if it really did any work.
21122
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2858 ;; (Actually some major modes use a different auto-fill function,
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2859 ;; but this one is the default one.)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2860 (defun do-auto-fill ()
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2861 (let (fc justify bol give-up
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2862 (fill-prefix fill-prefix))
10471
3eb77f03f53e (do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents: 10469
diff changeset
2863 (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
2864 (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
2865 (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
2866 (<= (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
2867 (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
2868 (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
2869 (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
2870 (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
2871 nil ;; Auto-filling not required
10813
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
2872 (if (memq justify '(full center right))
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
2873 (save-excursion (unjustify-current-line)))
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2874
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2875 ;; Choose a fill-prefix automatically.
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2876 (if (and adaptive-fill-mode
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2877 (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
2878 (let ((prefix
a0c1c62e2c4a (do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents: 13525
diff changeset
2879 (fill-context-prefix
a0c1c62e2c4a (do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents: 13525
diff changeset
2880 (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
2881 (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
2882 (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
2883 (setq fill-prefix prefix))))
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2884
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2885 (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
2886 ;; 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
2887 (let* (after-prefix
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2888 (fill-point
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2889 (let ((opoint (point))
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2890 bounce
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2891 (first t))
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2892 (save-excursion
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2893 (beginning-of-line)
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2894 (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
2895 (and fill-prefix
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2896 (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
2897 (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
2898 (move-to-column (1+ fc))
21122
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2899 ;; Move back to the point where we can break the line.
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2900 ;; We break the line between word or
19343
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2901 ;; 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
2902 ;; category `|'. We search space, \c| followed by
21122
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2903 ;; a character, or \c| following a character. If
19343
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2904 ;; 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
2905 (while (or first
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2906 ;; 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
2907 ;; 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
2908 ;; 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
2909 ;; sentence end.
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2910 (and (not (bobp))
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2911 (not bounce)
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2912 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
2913 (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
2914 (and (looking-at "\\. ")
21122
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2915 (not (looking-at "\\. ")))))
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2916 (and (not (bobp))
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2917 (not bounce)
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2918 fill-nobreak-predicate
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
2919 (funcall fill-nobreak-predicate)))
19343
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2920 (setq first nil)
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2921 (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
2922 ;; 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
2923 ;; 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
2924 ;; 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
2925 (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
2926 (progn
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2927 (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
2928 (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
2929 (setq bounce t))
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2930 (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
2931 ;; 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
2932 (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
2933 ;; 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
2934 (forward-char 1))))
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2935 (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
2936 (kinsoku (save-excursion
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2937 (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
2938 ;; 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
2939 (point)))))
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2940
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
2941 ;; 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
2942 (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
2943 (goto-char fill-point)
19109
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
2944 (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
2945 ;; 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
2946 (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
2947 ;; 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
2948 ;; 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
2949 (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
2950 ;; 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
2951 ;; 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
2952 (not (and comment-start-skip
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
2953 (let ((limit (point)))
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
2954 (beginning-of-line)
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
2955 (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
2956 limit t)
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
2957 (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
2958 ;; 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
2959 (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
2960 ;; 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
2961 ;; 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
2962 ;; 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
2963 (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
2964 (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
2965 (= (point) fill-point))
19160
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
2966 (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
2967 (save-excursion
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2968 (goto-char fill-point)
19160
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
2969 (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
2970 ;; 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
2971 (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
2972 (save-excursion
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2973 (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
2974 (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
2975 ;; 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
2976 ;; 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
2977 ;; 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
2978 (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
2979 (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
2980 ;; 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
2981 (setq give-up t))))
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2982 ;; Justify last line.
15263
0d7899c372ed (do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents: 15115
diff changeset
2983 (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
2984 t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2985
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2986 (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
2987 "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
2988 Some major modes set this.")
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2989
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2990 (defun auto-fill-mode (&optional arg)
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2991 "Toggle Auto Fill mode.
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2992 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
2993 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
2994 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
2995
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2996 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
2997 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
2998 (interactive "P")
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2999 (prog1 (setq auto-fill-function
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3000 (if (if (null arg)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3001 (not auto-fill-function)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3002 (> (prefix-numeric-value arg) 0))
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
3003 normal-auto-fill-function
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3004 nil))
11572
09d49f6e0af9 (auto-fill-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents: 11479
diff changeset
3005 (force-mode-line-update)))
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3006
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3007 ;; 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
3008 (defun auto-fill-function ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3009 "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
3010 nil)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3011
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3012 (defun turn-on-auto-fill ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3013 "Unconditionally turn on Auto Fill mode."
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3014 (auto-fill-mode 1))
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3015
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3016 (defun set-fill-column (arg)
15431
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
3017 "Set `fill-column' to specified argument.
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
3018 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
3019 (interactive "P")
17874
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
3020 (if (consp arg)
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
3021 (setq arg (current-column)))
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
3022 (if (not (integerp arg))
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
3023 ;; 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
3024 (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
3025 (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
3026 (setq fill-column arg)))
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3027
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3028 (defcustom comment-multi-line nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3029 "*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
3030 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
3031 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
3032 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3033 :group 'fill-comments)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3034
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
3035 (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
3036 "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
3037 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
3038 under the previous comment line.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3039
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3040 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
3041 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
3042 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
3043
12624
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3044 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
3045 or comment indentation.
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3046
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
3047 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
3048 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
3049 (interactive)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3050 (let (comcol comstart)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3051 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3052 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3053 (progn (skip-chars-forward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3054 (point)))
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
3055 (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
3056 (if fill-prefix
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3057 (progn
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3058 (indent-to-left-margin)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3059 (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
3060 (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
3061 (save-excursion
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3062 (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
3063 (let ((opoint (point)))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3064 (forward-line -1)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3065 (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
3066 ;; 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
3067 ;; 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
3068 ;; 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
3069 ;; 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
3070
12624
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3071 ;; 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
3072 ;; 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
3073 (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
3074 (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
3075 (let (opoint)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3076 (beginning-of-line)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3077 (setq opoint (point))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3078 (forward-line -1)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3079 (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
3080 (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
3081 ;; 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
3082 (goto-char win)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3083 (setq comcol (current-column))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3084 (setq comstart
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3085 (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
3086 (if comcol
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3087 (let ((comment-column comcol)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3088 (comment-start comstart)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3089 (comment-end comment-end))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3090 (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
3091 ; (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
3092 (progn
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3093 (forward-char -1)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3094 (insert comment-end)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3095 (forward-char 1))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3096 ; (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
3097 ; comment-start "")
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3098 ; )
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3099 )
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3100 (if (not (eolp))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3101 (setq comment-end ""))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3102 (insert-and-inherit ?\n)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3103 (forward-char -1)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3104 (indent-for-comment)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3105 (save-excursion
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3106 ;; 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
3107 (end-of-line)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3108 (delete-char 1)))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
3109 (indent-according-to-mode)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3110
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3111 (defun set-selective-display (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3112 "Set `selective-display' to ARG; clear it if no arg.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3113 When the value of `selective-display' is a number > 0,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3114 lines whose indentation is >= that value are not displayed.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3115 The variable `selective-display' has a separate value for each buffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3116 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3117 (if (eq selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3118 (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
3119 (let ((current-vpos
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3120 (save-restriction
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3121 (narrow-to-region (point-min) (point))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3122 (goto-char (window-start))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3123 (vertical-motion (window-height)))))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3124 (setq selective-display
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3125 (and arg (prefix-numeric-value arg)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3126 (recenter current-vpos))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3127 (set-window-start (selected-window) (window-start (selected-window)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3128 (princ "selective-display set to " t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3129 (prin1 selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3130 (princ "." t))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3131
17471
f383bfae3202 (overwrite-mode-binary, overwrite-mode-textual): Use defvar.
Richard M. Stallman <rms@gnu.org>
parents: 17355
diff changeset
3132 (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
3133 "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
3134 (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
3135 "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
3136
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3137 (defun overwrite-mode (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3138 "Toggle overwrite mode.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3139 With arg, turn overwrite mode on iff arg is positive.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3140 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
3141 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
3142 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
3143 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
3144 \\[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
3145 is supposed to make it easier to insert characters when necessary."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3146 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3147 (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
3148 (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
3149 (> (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
3150 '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
3151 (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
3152
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
3153 (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
3154 "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
3155 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
3156 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
3157 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
3158 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
3159 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
3160 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
3161 \\[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
3162 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
3163
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
3164 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
3165 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
3166 `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
3167 (interactive "P")
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
3168 (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
3169 (if (if (null arg)
2301
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3170 (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
3171 (> (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
3172 '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
3173 (force-mode-line-update))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3174
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3175 (defcustom line-number-mode t
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3176 "*Non-nil means display line number in mode line."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3177 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3178 :group 'editing-basics)
2301
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3179
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3180 (defun line-number-mode (arg)
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3181 "Toggle Line Number mode.
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3182 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
3183 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
3184 in the mode line."
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3185 (interactive "P")
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3186 (setq line-number-mode
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3187 (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
3188 (> (prefix-numeric-value arg) 0)))
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3189 (force-mode-line-update))
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3190
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3191 (defcustom column-number-mode nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3192 "*Non-nil means display column number in mode line."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3193 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3194 :group 'editing-basics)
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3195
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3196 (defun column-number-mode (arg)
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3197 "Toggle Column Number mode.
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3198 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
3199 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
3200 in the mode line."
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3201 (interactive "P")
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3202 (setq column-number-mode
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3203 (if (null arg) (not column-number-mode)
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3204 (> (prefix-numeric-value arg) 0)))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3205 (force-mode-line-update))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3206
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
3207 (defgroup paren-blinking nil
18379
1dd6f63f0ea3 (paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18334
diff changeset
3208 "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
3209 :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
3210 :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
3211
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3212 (defcustom blink-matching-paren t
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3213 "*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
3214 :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
3215 :group 'paren-blinking)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3216
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3217 (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
3218 "*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
3219 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
3220 when it is off screen)."
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3221 :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
3222 :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
3223
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3224 (defcustom blink-matching-paren-distance (* 25 1024)
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3225 "*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
3226 :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
3227 :group 'paren-blinking)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3228
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3229 (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
3230 "*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
3231 :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
3232 :group 'paren-blinking)
9771
3a51735d4a55 (blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9750
diff changeset
3233
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3234 (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
3235 "*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
3236 :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
3237 :group 'paren-blinking)
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3238
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3239 (defun blink-matching-open ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3240 "Move cursor momentarily to the beginning of the sexp before point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3241 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3242 (and (> (point) (1+ (point-min)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3243 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
3244 ;; 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
3245 (= 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
3246 (save-excursion
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
3247 (forward-char -1)
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
3248 (skip-syntax-backward "/\\")
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
3249 (point)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3250 (let* ((oldpos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3251 (blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3252 (mismatch))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3253 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3254 (save-restriction
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3255 (if blink-matching-paren-distance
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3256 (narrow-to-region (max (point-min)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3257 (- (point) blink-matching-paren-distance))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3258 oldpos))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3259 (condition-case ()
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3260 (let ((parse-sexp-ignore-comments
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3261 (and parse-sexp-ignore-comments
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3262 (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
3263 (setq blinkpos (scan-sexps oldpos -1)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3264 (error nil)))
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3265 (and blinkpos
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3266 (/= (char-syntax (char-after blinkpos))
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3267 ?\$)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3268 (setq mismatch
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3269 (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
3270 (/= (char-after (1- oldpos))
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3271 (matching-paren (char-after blinkpos))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3272 (if mismatch (setq blinkpos nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3273 (if blinkpos
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3274 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3275 (goto-char blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3276 (if (pos-visible-in-window-p)
13810
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
3277 (and blink-matching-paren-on-screen
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
3278 (sit-for blink-matching-delay))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3279 (goto-char blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3280 (message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3281 "Matches %s"
6539
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3282 ;; Show what precedes the open in its line, if anything.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3283 (if (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3284 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3285 (not (bolp)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3286 (buffer-substring (progn (beginning-of-line) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3287 (1+ blinkpos))
6539
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3288 ;; 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
3289 (if (save-excursion
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3290 (forward-char 1)
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3291 (skip-chars-forward " \t")
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3292 (not (eolp)))
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3293 (buffer-substring blinkpos
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3294 (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
3295 ;; 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
3296 ;; if there is one.
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3297 (if (save-excursion
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3298 (skip-chars-backward "\n \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3299 (not (bobp)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3300 (concat
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3301 (buffer-substring (progn
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3302 (skip-chars-backward "\n \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3303 (beginning-of-line)
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3304 (point))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3305 (progn (end-of-line)
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3306 (skip-chars-backward " \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3307 (point)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3308 ;; 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
3309 "..."
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3310 (buffer-substring blinkpos (1+ blinkpos)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3311 ;; 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
3312 (buffer-substring blinkpos (1+ blinkpos))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3313 (cond (mismatch
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3314 (message "Mismatched parentheses"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3315 ((not blink-matching-paren-distance)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3316 (message "Unmatched parenthesis"))))))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3317
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3318 ;Turned off because it makes dbx bomb out.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3319 (setq blink-paren-function 'blink-matching-open)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3320
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
3321 ;; 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
3322 ;; 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
3323 ;; that happens in the QUIT macro at the C code level.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3324 (defun keyboard-quit ()
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
3325 "Signal a quit condition.
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
3326 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
3327 At top-level, as an editor command, this simply beeps."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3328 (interactive)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
3329 (deactivate-mark)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3330 (signal 'quit nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3331
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3332 (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
3333
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3334 (defvar buffer-quit-function nil
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3335 "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
3336 \\[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
3337 \(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
3338
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3339 (defun keyboard-escape-quit ()
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3340 "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
3341 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
3342 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
3343 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
3344 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
3345 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
3346 (interactive)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3347 (cond ((eq last-command 'mode-exited) nil)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3348 ((> (minibuffer-depth) 0)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3349 (abort-recursive-edit))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3350 (current-prefix-arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3351 nil)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3352 ((and transient-mark-mode
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3353 mark-active)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3354 (deactivate-mark))
17355
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
3355 ((> (recursion-depth) 0)
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
3356 (exit-recursive-edit))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3357 (buffer-quit-function
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3358 (funcall buffer-quit-function))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3359 ((not (one-window-p t))
17355
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
3360 (delete-other-windows))
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
3361 ((string-match "^ \\*" (buffer-name (current-buffer)))
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
3362 (bury-buffer))))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3363
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3364 (define-key global-map "\e\e\e" 'keyboard-escape-quit)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3365
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3366 (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
3367 "*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
3368 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
3369 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
3370 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
3371
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3372 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
3373
16624
cd1a0e1e6975 (sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents: 16508
diff changeset
3374 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
3375 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
3376 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
3377
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3378 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
3379 your package for details."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3380 :type '(radio (function-item :tag "Default Emacs mail"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3381 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3382 sendmail-user-agent)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3383 (function-item :tag "Emacs interface to MH"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3384 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3385 mh-e-user-agent)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3386 (function-item :tag "Gnus mail sending package"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3387 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3388 message-user-agent)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3389 (function :tag "Other"))
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3390 :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
3391
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3392 (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
3393 &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
3394 "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
3395
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3396 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
3397 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
3398 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
3399
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3400 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
3401 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
3402 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
3403 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
3404 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
3405
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3406 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
3407 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
3408
16624
cd1a0e1e6975 (sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents: 16508
diff changeset
3409 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
3410
cd1a0e1e6975 (sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents: 16508
diff changeset
3411 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
3412 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
3413 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
3414
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3415 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
3416 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
3417 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
3418 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
3419
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3420 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
3421 `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
3422 (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
3423 (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
3424 (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
3425 (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
3426
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3427 (defun assoc-ignore-case (key alist)
21847
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3428 "Like `assoc', but ignores differences in case and text representation.
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3429 KEY must be a string. Upper-case and lower-case letters are treated as equal.
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3430 Unibyte strings are converted to multibyte for comparison."
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3431 (let (element)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3432 (while (and alist (not element))
21847
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3433 (if (eq t (compare-strings key 0 nil (car (car alist)) 0 nil t))
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3434 (setq element (car alist)))
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3435 (setq alist (cdr alist)))
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3436 element))
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3437
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3438 (defun assoc-ignore-representation (key alist)
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3439 "Like `assoc', but ignores differences in text representation.
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3440 KEY must be a string.
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3441 Unibyte strings are converted to multibyte for comparison."
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3442 (let (element)
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3443 (while (and alist (not element))
8f34099fb8b4 (assoc-ignore-representation): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21459
diff changeset
3444 (if (eq t (compare-strings key 0 nil (car (car alist)) 0 nil))
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3445 (setq element (car alist)))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3446 (setq alist (cdr alist)))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3447 element))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3448
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3449 (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
3450 '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
3451 '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
3452
21906
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3453 (defun rfc822-goto-eoh ()
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3454 ;; Go to header delimiter line in a mail message, following RFC822 rules
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3455 (goto-char (point-min))
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3456 (while (looking-at "^[^: \n]+:\\|^[ \t]")
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3457 (forward-line 1))
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3458 (point))
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3459
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3460 (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
3461 switch-function yank-action
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3462 send-actions)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3463 (if switch-function
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3464 (let ((special-display-buffer-names nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3465 (special-display-regexps nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3466 (same-window-buffer-names nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3467 (same-window-regexps nil))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3468 (funcall switch-function "*mail*")))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3469 (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
3470 (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
3471 (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
3472 continue
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3473 (error "Message aborted"))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3474 (save-excursion
21906
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3475 (rfc822-goto-eoh)
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3476 (while other-headers
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3477 (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
3478 (insert (car (car other-headers)) ": "
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3479 (cdr (car other-headers)) "\n"))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3480 (setq other-headers (cdr other-headers)))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3481 t)))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3482
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3483 (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
3484 '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
3485 'mh-before-send-letter-hook)
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3486
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3487 (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
3488 switch-function yank-action send-actions)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3489 "Start composing a mail message to send.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3490 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
3491 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
3492 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
3493 and the initial Subject field, respectively.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3494
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3495 OTHER-HEADERS is an alist specifying additional
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3496 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
3497 HEADER and VALUE are strings.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3498
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3499 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
3500 being composed.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3501
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3502 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
3503 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
3504
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3505 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
3506 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
3507 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
3508 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
3509 \(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
3510 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
3511
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3512 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
3513 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
3514 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3515 (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
3516 (let ((function (get mail-user-agent 'composefunc)))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3517 (funcall function to subject other-headers continue
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3518 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
3519
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3520 (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
3521 yank-action send-actions)
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3522 "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
3523 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3524 (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
3525 (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
3526 '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
3527
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3528
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3529 (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
3530 yank-action send-actions)
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3531 "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
3532 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3533 (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
3534 (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
3535 '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
3536
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3537 (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
3538 "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
3539
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3540 (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
3541 "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
3542 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
3543 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
3544 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
3545
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3546 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
3547 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
3548
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3549 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
3550 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
3551 (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
3552 (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
3553 (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
3554 (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
3555 (val (if prop
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3556 ;; 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
3557 ;; 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
3558 (call-interactively `(lambda (arg)
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3559 (interactive ,prop)
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3560 arg))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3561 (read
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3562 (read-string prompt nil
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3563 'set-variable-value-history)))))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3564 (list var val)))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3565
17613
7dadfa677617 (set-variable): Simplify previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17606
diff changeset
3566 (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
3567 (when type
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3568 ;; Match with custom type.
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3569 (require 'wid-edit)
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3570 (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
3571 (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
3572 (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
3573 val (car type) var))))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3574 (set var val))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3575
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3576 ;; Define the major mode for lists of completions.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3577
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3578 (defvar completion-list-mode-map nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3579 "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
3580 (or completion-list-mode-map
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3581 (let ((map (make-sparse-keymap)))
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3582 (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
3583 (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
3584 (define-key map "\C-m" 'choose-completion)
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3585 (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
3586 (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
3587 (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
3588 (setq completion-list-mode-map map)))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3589
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3590 ;; 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
3591 (put 'completion-list-mode 'mode-class 'special)
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3592
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3593 (defvar completion-reference-buffer nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3594 "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
3595 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
3596 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
3597
16924
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3598 (defvar completion-no-auto-exit nil
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3599 "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
3600 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
3601 and `mouse-choose-completion'.")
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3602
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3603 (defvar completion-base-size nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3604 "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
3605 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
3606 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
3607 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
3608 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
3609
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3610 (defun delete-completion-window ()
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3611 "Delete the completion list window.
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3612 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
3613 (interactive)
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3614 (let ((buf completion-reference-buffer))
16851
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3615 (if (one-window-p t)
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3616 (if (window-dedicated-p (selected-window))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3617 (delete-frame (selected-frame)))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3618 (delete-window (selected-window))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3619 (if (get-buffer-window buf)
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3620 (select-window (get-buffer-window buf))))))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3621
10284
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3622 (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
3623 "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
3624 (interactive "p")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3625 (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
3626
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3627 (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
3628 "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
3629 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
3630 (interactive "p")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3631 (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
3632 (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
3633 (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
3634 ;; 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
3635 (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
3636 (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
3637 ;; 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
3638 (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
3639 (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
3640 (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
3641 (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
3642 (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
3643 ;; 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
3644 (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
3645 (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
3646 (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
3647 ;; 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
3648 (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
3649 ;; 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
3650 (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
3651 (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
3652
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3653 (defun choose-completion ()
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3654 "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
3655 (interactive)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3656 (let (beg end completion (buffer completion-reference-buffer)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3657 (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
3658 (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
3659 (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
3660 (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
3661 (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
3662 (if (null beg)
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3663 (error "No completion here"))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3664 (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
3665 (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
3666 (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
3667 (let ((owindow (selected-window)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3668 (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
3669 (window-dedicated-p (selected-window)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3670 ;; 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
3671 (iconify-frame (selected-frame))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3672 (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
3673 (bury-buffer)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3674 (select-window owindow))
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3675 (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
3676
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3677 ;; 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
3678 ;; that can be found before POINT.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3679 (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
3680 (let ((opoint (point))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3681 (len (min (length string)
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3682 (- (point) (point-min)))))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3683 (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
3684 (if completion-ignore-case
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
3685 (setq string (downcase string)))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3686 (while (and (> len 0)
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3687 (let ((tail (buffer-substring (point)
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3688 (+ (point) len))))
7574
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
3689 (if completion-ignore-case
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
3690 (setq tail (downcase tail)))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3691 (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
3692 (setq len (1- len))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3693 (forward-char 1))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3694 (delete-char len)))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3695
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3696 ;; 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
3697 ;; 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
3698 ;; 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
3699
e3f8bfd1bb1f (choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents: 15431
diff changeset
3700 ;; 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
3701 ;; 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
3702 ;; 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
3703 (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
3704 (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
3705 ;; 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
3706 ;; active minibuffer.
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
3707 (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
3708 (or (not (active-minibuffer-window))
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
3709 (not (equal buffer
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
3710 (window-buffer (active-minibuffer-window))))))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
3711 (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
3712 ;; 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
3713 (set-buffer buffer)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3714 (if base-size
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3715 (delete-region (+ base-size (point-min)) (point))
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3716 (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
3717 (insert choice)
7697
b52a92ea3796 (choose-completion-string): Clear mouse-face property.
Richard M. Stallman <rms@gnu.org>
parents: 7594
diff changeset
3718 (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
3719 '(mouse-face nil))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
3720 ;; 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
3721 (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
3722 (set-window-point window (point)))
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
3723 ;; 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
3724 (and (not completion-no-auto-exit)
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3725 (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
3726 minibuffer-completion-table
15484
e3f8bfd1bb1f (choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents: 15431
diff changeset
3727 ;; 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
3728 ;; 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
3729 (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
3730 (file-directory-p (buffer-string)))
e3f8bfd1bb1f (choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents: 15431
diff changeset
3731 (select-window (active-minibuffer-window))
e3f8bfd1bb1f (choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents: 15431
diff changeset
3732 (exit-minibuffer))))))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3733
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
3734 (defun completion-list-mode ()
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3735 "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
3736 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
3737 to select the completion near point.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3738 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
3739 with the mouse."
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3740 (interactive)
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3741 (kill-all-local-variables)
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
3742 (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
3743 (setq mode-name "Completion List")
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
3744 (setq major-mode 'completion-list-mode)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3745 (make-local-variable 'completion-base-size)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3746 (setq completion-base-size nil)
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
3747 (run-hooks 'completion-list-mode-hook))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3748
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3749 (defvar completion-fixup-function nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3750 "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
3751 `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
3752 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
3753 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
3754 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
3755
20482
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
3756 (defvar completion-setup-hook nil
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
3757 "Normal hook run at the end of setting up a completion list buffer.
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
3758 When this hook is run, the current buffer is the one in which the
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
3759 command to display the completion list buffer was run.
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
3760 The completion list buffer is available as the value of `standard-output'.")
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
3761
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3762 ;; 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
3763 ;; 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
3764
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3765 (defun completion-setup-function ()
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3766 (save-excursion
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3767 (let ((mainbuf (current-buffer)))
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3768 (set-buffer standard-output)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3769 (completion-list-mode)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3770 (make-local-variable 'completion-reference-buffer)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3771 (setq completion-reference-buffer mainbuf)
18034
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
3772 (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
3773 ;; For file name completion,
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
3774 ;; 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
3775 ;; last file name component.
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
3776 (setq completion-base-size
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
3777 (save-excursion
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
3778 (set-buffer mainbuf)
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
3779 (goto-char (point-max))
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
3780 (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
3781 (- (point) (point-min))))
19227
84c681e58fd5 (completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents: 19160
diff changeset
3782 ;; 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
3783 (save-match-data
84c681e58fd5 (completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents: 19160
diff changeset
3784 (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
3785 (buffer-name mainbuf))
84c681e58fd5 (completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents: 19160
diff changeset
3786 (setq completion-base-size 0))))
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3787 (goto-char (point-min))
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3788 (if window-system
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3789 (insert (substitute-command-keys
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3790 "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
3791 (insert (substitute-command-keys
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3792 "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
3793 select the completion near point.\n\n"))
7ada27b4bf3c (completion-setup-function): Add mouse-face properties.
Karl Heuer <kwzh@gnu.org>
parents: 6549
diff changeset
3794 (forward-line 1)
8203
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3795 (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
3796 (let ((beg (match-beginning 0))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3797 (end (point)))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3798 (if completion-fixup-function
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3799 (funcall completion-fixup-function))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3800 (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
3801 (goto-char end))))))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3802
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3803 (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
3804
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3805 (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
3806 '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
3807 (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
3808 '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
3809 (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
3810 '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
3811 (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
3812 '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
3813
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3814 (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
3815 "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
3816 (interactive)
12483
ec77cb3940f1 (switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents: 12428
diff changeset
3817 ;; 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
3818 (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
3819 (minibuffer-completion-help))
20663
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
3820 (let ((window (get-buffer-window "*Completions*")))
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
3821 (when window
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
3822 (select-window window)
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
3823 (goto-char (point-min))
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
3824 (search-forward "\n\n")
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
3825 (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
3826
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3827 ;; Support keyboard commands to turn on various modifiers.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3828
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3829 ;; 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
3830 ;; to the following event.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3831
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3832 (defun event-apply-alt-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3833 (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
3834 (defun event-apply-super-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3835 (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
3836 (defun event-apply-hyper-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3837 (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
3838 (defun event-apply-shift-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3839 (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
3840 (defun event-apply-control-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3841 (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
3842 (defun event-apply-meta-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3843 (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
3844
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3845 (defun event-apply-modifier (event symbol lshiftby prefix)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3846 "Apply a modifier flag to event EVENT.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3847 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
3848 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
3849 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
3850 (if (numberp event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3851 (cond ((eq symbol 'control)
11201
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
3852 (if (and (<= (downcase event) ?z)
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
3853 (>= (downcase event) ?a))
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3854 (- (downcase event) ?a -1)
11201
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
3855 (if (and (<= (downcase event) ?Z)
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
3856 (>= (downcase event) ?A))
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3857 (- (downcase event) ?A -1)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3858 (logior (lsh 1 lshiftby) event))))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3859 ((eq symbol 'shift)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3860 (if (and (<= (downcase event) ?z)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3861 (>= (downcase event) ?a))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3862 (upcase event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3863 (logior (lsh 1 lshiftby) event)))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3864 (t
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3865 (logior (lsh 1 lshiftby) event)))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3866 (if (memq symbol (event-modifiers event))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3867 event
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3868 (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
3869 (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
3870 (if (symbolp event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3871 event-type
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3872 (cons event-type (cdr event)))))))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3873
11206
60b7ab7d4fec Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents: 11201
diff changeset
3874 (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
3875 (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
3876 (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
3877 (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
3878 (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
3879 (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
3880
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3881 ;;;; Keypad support.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3882
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3883 ;;; 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
3884 ;;; 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
3885 ;;; 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
3886 ;;; bindings.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3887
5342
f38861038093 (setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents: 5324
diff changeset
3888 ;; 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
3889 (mapcar
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3890 (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
3891 (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
3892 (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
3893 (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
3894 (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
3895 '((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
3896 (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
3897 (kp-space ?\ )
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3898 (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
3899 (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
3900 (kp-multiply ?*)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3901 (kp-add ?+)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3902 (kp-separator ?,)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3903 (kp-subtract ?-)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3904 (kp-decimal ?.)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3905 (kp-divide ?/)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3906 (kp-equal ?=)))
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3907
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3908 ;;; simple.el ends here