annotate lisp/simple.el @ 17606:d8cd49a0529c

(set-variable): Check VALUE against type info if available. Don't evaluate VALUE. Use a separate history list for the values.
author Richard M. Stallman <rms@gnu.org>
date Wed, 30 Apr 1997 18:57:35 +0000
parents 1a6a798242d6
children 7dadfa677617
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
11235
e6bdaaa6ce1b Update copyright.
Karl Heuer <kwzh@gnu.org>
parents: 11206
diff changeset
3 ;; Copyright (C) 1985, 86, 87, 93, 94, 95 Free Software Foundation, Inc.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 ;; This file is part of GNU Emacs.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 ;; GNU Emacs is free software; you can redistribute it and/or modify
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 ;; it under the terms of the GNU General Public License as published by
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
9 ;; the Free Software Foundation; either version 2, or (at your option)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 ;; any later version.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 ;; GNU Emacs is distributed in the hope that it will be useful,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 ;; GNU General Public License for more details.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 ;; 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
18 ;; 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
19 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13960
diff changeset
20 ;; Boston, MA 02111-1307, USA.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
2315
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
22 ;;; Commentary:
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
23
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
24 ;; 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
25 ;; major mode or to file-handling.
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
26
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
27 ;;; Code:
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
29 (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
30 "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
31 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
32 With arg, insert that many newlines.
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
33 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
34 (interactive "*P")
13137
a83a1515fd9b (newline): Call barf-if-buffer-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 12975
diff changeset
35 (barf-if-buffer-read-only)
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
36 ;; 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
37 ;; 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
38 ;; 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
39 ;; the end of the previous line.
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
40 (let ((flag (and (not (bobp))
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
41 (bolp)
17214
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
42 ;; 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
43 ;; 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
44 (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
45 (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
46 (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
47 (not before-change-functions)
16417
fb6785d0c256 (newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents: 16408
diff changeset
48 ;; Make sure there are no markers here.
fb6785d0c256 (newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents: 16408
diff changeset
49 (not (buffer-has-markers-at (1- (point))))
17214
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
50 ;; 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
51 ;; 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
52 (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
53 (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
54 (or (eobp)
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
55 (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
56 ;; 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
57 (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
58 ;; 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
59 (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
60 ;; 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
61 (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
62 ;; 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
63 ;; 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
64 (< (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
65 (- (point) 2))))
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
66 (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
67 (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
68 (beforepos (point)))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
69 (if flag (backward-char 1))
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
70 ;; 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
71 ;; 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
72 (let ((last-command-char ?\n)
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
73 ;; 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
74 ;; 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
75 ;; 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
76 (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
77 (unwind-protect
9e7727cdbb68 (newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents: 12355
diff changeset
78 (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
79 ;; 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
80 (if flag (forward-char 1))))
9e7727cdbb68 (newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents: 12355
diff changeset
81 ;; If we did *not* get an error, cancel that forward-char.
9e7727cdbb68 (newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents: 12355
diff changeset
82 (if flag (backward-char 1))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
83 ;; Mark the newline(s) `hard'.
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
84 (if use-hard-newlines
16018
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
85 (set-hard-newline-properties
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
86 (- (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
87 ;; 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
88 ;; 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
89 (or flag
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
90 (save-excursion
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
91 (goto-char beforepos)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
92 (beginning-of-line)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
93 (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
94 (> (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
95 (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
96 (if flag (forward-char 1))
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
97 ;; 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
98 ;; 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
99 ;; 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
100 (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
101 (move-to-left-margin nil t)))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
102 nil)
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
103
16018
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
104 (defun set-hard-newline-properties (from to)
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
105 (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
106 (put-text-property from to 'hard 't)
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
107 ;; 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
108 (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
109 (put-text-property from (point) 'rear-nonsticky
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
110 (cons 'hard sticky)))))
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
111
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
112 (defun open-line (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
113 "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
114 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
115 if the line would have been blank.
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
116 With arg N, insert N newlines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
117 (interactive "*p")
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
118 (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
119 (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
120 (loc (point)))
11324
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
121 (newline arg)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
122 (goto-char loc)
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
123 (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
124 (cond ((bolp)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
125 (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
126 (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
127 (forward-line 1)
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
128 (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
129 (goto-char loc)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
130 (end-of-line)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
131
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
132 (defun split-line ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
133 "Split current line, moving portion beyond point vertically down."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
134 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
135 (skip-chars-forward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
136 (let ((col (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
137 (pos (point)))
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
138 (newline 1)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
139 (indent-to col 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
140 (goto-char pos)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
141
17589
4dca74d70b49 (quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17514
diff changeset
142 (defvar quoted-insert-character-offset 2048
4dca74d70b49 (quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17514
diff changeset
143 "Offset added by \\[quoted-insert] to character codes 0200 and above.")
4dca74d70b49 (quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17514
diff changeset
144
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
145 (defun quoted-insert (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
146 "Read next input character and insert it.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
147 This is useful for inserting control characters.
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1812
diff changeset
148 You may also type up to 3 octal digits, to insert a character with that code.
2215
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
149
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
150 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
151 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
152 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
153 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
154
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
155 In binary overwrite mode, this function does overwrite, and octal
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
156 digits are interpreted as a character code. This is supposed to make
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
157 this function useful in editing binary files."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158 (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
159 (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
160 (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
161 (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
162 (read-char))))
17589
4dca74d70b49 (quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17514
diff changeset
163 ;; Assume character codes 0200 - 0377 stand for
4dca74d70b49 (quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17514
diff changeset
164 ;; European characters in Latin-1, and convert them
4dca74d70b49 (quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17514
diff changeset
165 ;; to Emacs characters.
4dca74d70b49 (quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17514
diff changeset
166 (and enable-multibyte-characters
4dca74d70b49 (quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17514
diff changeset
167 (>= char ?\200)
4dca74d70b49 (quoted-insert-character-offset): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17514
diff changeset
168 (setq char (+ quoted-insert-character-offset char)))
10779
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
169 (if (> arg 0)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
170 (if (eq overwrite-mode 'overwrite-mode-binary)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
171 (delete-char arg)))
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
172 (while (> arg 0)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
173 (insert-and-inherit char)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
174 (setq arg (1- arg)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
176 (defun delete-indentation (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
177 "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
178 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
179 With argument, join this line to following line."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
180 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182 (if arg (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
183 (if (eq (preceding-char) ?\n)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
185 (delete-region (point) (1- (point)))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
186 ;; If the second line started with the fill prefix,
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
187 ;; delete the prefix.
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
188 (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
189 (<= (+ (point) (length fill-prefix)) (point-max))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
190 (string= fill-prefix
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
191 (buffer-substring (point)
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
192 (+ (point) (length fill-prefix)))))
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
193 (delete-region (point) (+ (point) (length fill-prefix))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
194 (fixup-whitespace))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
195
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196 (defun fixup-whitespace ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197 "Fixup white space between objects around point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198 Leave one space or none, according to the context."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
199 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 (delete-horizontal-space)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
202 (if (or (looking-at "^\\|\\s)")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
203 (save-excursion (forward-char -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
204 (looking-at "$\\|\\s(\\|\\s'")))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205 nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 (insert ?\ ))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
208 (defun delete-horizontal-space ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 "Delete all spaces and tabs around point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
214 (defun just-one-space ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215 "Delete all spaces and tabs around point, leaving one space."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
218 (if (= (following-char) ? )
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 (forward-char 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220 (insert ? ))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223 (defun delete-blank-lines ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 "On blank line, delete all surrounding blank lines, leaving just one.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225 On isolated blank line, delete that one.
7817
d729f75fff04 (delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7762
diff changeset
226 On nonblank line, delete any immediately following blank lines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228 (let (thisblank singleblank)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 (setq thisblank (looking-at "[ \t]*$"))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
232 ;; Set singleblank if there is just one blank line here.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 (setq singleblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 (and thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 (not (looking-at "[ \t]*\n[ \t]*$"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 (or (bobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 (progn (forward-line -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 (not (looking-at "[ \t]*$")))))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
239 ;; 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
240 (if thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243 (if singleblank (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
245 (if (re-search-backward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
246 (progn (forward-line 1) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
247 (point-min)))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
248 ;; Delete following blank lines, unless the current line is blank
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
249 ;; and there are no following blank lines.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
250 (if (not (and thisblank singleblank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
251 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
252 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
253 (forward-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
254 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
255 (if (re-search-forward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
256 (progn (beginning-of-line) (point))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
257 (point-max)))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
258 ;; 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
259 ;; Delete the line, leaving point at eob.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
260 (if (looking-at "^[ \t]*\n\\'")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
261 (delete-region (point) (point-max)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
262
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
263 (defun back-to-indentation ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
264 "Move point to the first non-whitespace character on this line."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
265 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
266 (beginning-of-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
267 (skip-chars-forward " \t"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
268
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
269 (defun newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
270 "Insert a newline, then indent according to major mode.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
271 Indentation is done using the value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 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
273 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
274 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
275 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
276 (delete-region (point) (progn (skip-chars-backward " \t") (point)))
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
277 (newline)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
278 (indent-according-to-mode))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
279
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
280 (defun reindent-then-newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
281 "Reindent current line, insert newline, then indent the new line.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
282 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
283 which means calling the current value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
284 In programming language modes, this is the same as TAB.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
285 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
286 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
287 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
288 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
289 (delete-region (point) (progn (skip-chars-backward " \t") (point)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
290 (indent-according-to-mode))
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
291 (newline)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
292 (indent-according-to-mode))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
293
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
294 ;; 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
295 (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
296 (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
297 (if (eq arg '-) (setq arg -1))
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
298 (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
299
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
300 ;; 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
301 (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
302 (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
303 (if (eq arg '-) (setq arg -1))
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
304 (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
305
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
306 (defun backward-delete-char-untabify (arg &optional killp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
307 "Delete characters backward, changing tabs into spaces.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
308 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
309 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
310 and KILLP is t if a prefix arg was specified."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
311 (interactive "*p\nP")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
312 (let ((count arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
313 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
314 (while (and (> count 0) (not (bobp)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
315 (if (= (preceding-char) ?\t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
316 (let ((col (current-column)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
317 (forward-char -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
318 (setq col (- col (current-column)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
319 (insert-char ?\ col)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
320 (delete-char 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
321 (forward-char -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
322 (setq count (1- count)))))
14721
2630ac774647 (backward-delete-char-untabify):
Richard M. Stallman <rms@gnu.org>
parents: 14627
diff changeset
323 (delete-backward-char arg killp))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
324
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
325 (defun zap-to-char (arg char)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
326 "Kill up to and including ARG'th occurrence of CHAR.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
327 Goes backward if ARG is negative; error if CHAR not found."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
328 (interactive "p\ncZap to char: ")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
329 (kill-region (point) (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
330 (search-forward (char-to-string char) nil nil arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
331 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
332 (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
333
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
334 (defun beginning-of-buffer (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
335 "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
336 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
337
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
338 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
339 of the accessible part of the buffer.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
340
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
341 Don't use this command in Lisp programs!
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
342 \(goto-char (point-min)) is faster and avoids clobbering the mark."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
343 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
344 (push-mark)
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
345 (let ((size (- (point-max) (point-min))))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
346 (goto-char (if arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
347 (+ (point-min)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
348 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
349 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
350 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
351 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
352 (/ (+ 10 (* size (prefix-numeric-value arg))) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
353 (point-min))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354 (if arg (forward-line 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
355
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 (defun end-of-buffer (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 "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
358 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
359
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
360 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
361 of the accessible part of the buffer.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
362
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
363 Don't use this command in Lisp programs!
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
364 \(goto-char (point-max)) is faster and avoids clobbering the mark."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
365 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
366 (push-mark)
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
367 (let ((size (- (point-max) (point-min))))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
368 (goto-char (if arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
369 (- (point-max)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
370 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
371 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
372 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
373 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
374 (/ (* size (prefix-numeric-value arg)) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
375 (point-max))))
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
376 ;; 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
377 ;; adjust it to the beginning of a line.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
378 (if arg (forward-line 1)
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
379 ;; 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
380 ;; 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
381 (if (let ((old-point (point)))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
382 (save-excursion
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
383 (goto-char (window-start))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
384 (vertical-motion (window-height))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
385 (< (point) old-point)))
7877
0eb805c768af (end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents: 7817
diff changeset
386 (progn
0eb805c768af (end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents: 7817
diff changeset
387 (overlay-recenter (point))
0eb805c768af (end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents: 7817
diff changeset
388 (recenter -3)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
389
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
390 (defun mark-whole-buffer ()
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
391 "Put point at beginning and mark at end of buffer.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
392 You probably should not use this function in Lisp programs;
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
393 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
394 that uses or sets the mark."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
395 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
396 (push-mark (point))
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
397 (push-mark (point-max) nil t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
398 (goto-char (point-min)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
399
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
400 (defun count-lines-region (start end)
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3487
diff changeset
401 "Print number of lines and characters in the region."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
402 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
403 (message "Region has %d lines, %d characters"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
404 (count-lines start end) (- end start)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
405
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
406 (defun what-line ()
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
407 "Print the current buffer line number and narrowed line number of point."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
408 (interactive)
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
409 (let ((opoint (point)) start)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
410 (save-excursion
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
411 (save-restriction
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
412 (goto-char (point-min))
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
413 (widen)
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
414 (beginning-of-line)
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
415 (setq start (point))
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
416 (goto-char opoint)
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
417 (beginning-of-line)
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
418 (if (/= start 1)
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
419 (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
420 (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
421 (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
422 (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
423
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
424
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
425 (defun count-lines (start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
426 "Return number of lines between START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
427 This is usually the number of newlines between them,
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
428 but can be one more if START is not equal to END
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
429 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
430 (save-excursion
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
431 (save-restriction
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
432 (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
433 (goto-char (point-min))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
434 (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
435 (save-match-data
2421
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
436 (let ((done 0))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
437 (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
438 (setq done (+ 40 done)))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
439 (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
440 (setq done (+ 1 done)))
5151
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
441 (goto-char (point-max))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
442 (if (and (/= start end)
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
443 (not (bolp)))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
444 (1+ done)
9554
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
445 done)))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
446 (- (buffer-size) (forward-line (buffer-size)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
447
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
448 (defun what-cursor-position (&optional detail)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
449 "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
450 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
451 (interactive "P")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
452 (let* ((char (following-char))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
453 (beg (point-min))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
454 (end (point-max))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
455 (pos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
456 (total (buffer-size))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
457 (percent (if (> total 50000)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
458 ;; Avoid overflow from multiplying by 100!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
459 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
460 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
461 (hscroll (if (= (window-hscroll) 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
462 ""
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 (format " Hscroll=%d" (window-hscroll))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464 (col (current-column)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
465 (if (= pos end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
466 (if (or (/= beg 1) (/= end (1+ total)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
467 (message "point=%d of %d(%d%%) <%d - %d> column %d %s"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
468 pos total percent beg end col hscroll)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
469 (message "point=%d of %d(%d%%) column %d %s"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
470 pos total percent col hscroll))
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
471 (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
472 (if (or (/= beg 1) (/= end (1+ total)))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
473 (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
474 (if (< char 256)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
475 (single-key-description char)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
476 (char-to-string char))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
477 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
478 (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
479 (if (< char 256)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
480 (single-key-description char)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
481 (char-to-string char))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
482 char char char str pos total percent col hscroll))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
483
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484 (defun fundamental-mode ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
485 "Major mode not specialized for anything in particular.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
486 Other major modes are defined by comparison with this one."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
487 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
488 (kill-all-local-variables))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
489
4894
1574c6c6561f (eval-expression): Fix typo: missing paren.
Roland McGrath <roland@gnu.org>
parents: 4886
diff changeset
490 (defvar read-expression-map (cons 'keymap minibuffer-local-map)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
491 "Minibuffer keymap used for reading Lisp expressions.")
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
492 (define-key read-expression-map "\M-\t" 'lisp-complete-symbol)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
493
4289
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
494 (defvar read-expression-history nil)
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
495
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
496 ;; We define this, rather than making `eval' interactive,
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
497 ;; for the sake of completion of names like eval-region, eval-current-buffer.
17133
fbdff0d0de3d (eval-expression): No longer disabled, since M-: isn't
Karl Heuer <kwzh@gnu.org>
parents: 16999
diff changeset
498 (defun eval-expression (eval-expression-arg)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
499 "Evaluate EXPRESSION and print value in minibuffer.
954
9e51bb887797 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 921
diff changeset
500 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
501 (interactive
5068
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
502 (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
503 nil read-expression-map t
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
504 'read-expression-history)))
17133
fbdff0d0de3d (eval-expression): No longer disabled, since M-: isn't
Karl Heuer <kwzh@gnu.org>
parents: 16999
diff changeset
505 (setq values (cons (eval eval-expression-arg) values))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
506 (prin1 (car values) t))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
507
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
508 (defun edit-and-eval-command (prompt command)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
509 "Prompting with PROMPT, let user edit COMMAND and eval result.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
510 COMMAND is a Lisp expression. Let user edit that expression in
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
511 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
512 (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
513 (prin1-to-string command)
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
514 read-expression-map t
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
515 '(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
516 ;; 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
517 ;; 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
518 (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
519 (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
520
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
521 ;; 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
522 ;; 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
523 (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
524 (setq command-history (cons command command-history)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
525 (eval command)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
526
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
527 (defun repeat-complex-command (arg)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
528 "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
529 A complex command is one which used the minibuffer.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
530 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
531 The result is executed, repeating the command as changed.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
532 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
533 it is added to the front of the command history.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
534 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
535 to get different commands to edit and resubmit."
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
536 (interactive "p")
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
537 (let ((elt (nth (1- arg) command-history))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
538 newcmd)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
539 (if elt
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
540 (progn
4821
2c16f99ef5dc (edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents: 4765
diff changeset
541 (setq newcmd
16803
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
542 (let ((print-level nil)
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
543 (minibuffer-history-position arg)
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
544 (minibuffer-history-sexp-flag t))
8734
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
545 (read-from-minibuffer
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
546 "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
547 (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
548
5135
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
549 ;; 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
550 ;; 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
551 (if (stringp (car command-history))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
552 (setq command-history (cdr command-history)))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
553
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
554 ;; 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
555 ;; add it to the history.
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
556 (or (equal newcmd (car command-history))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
557 (setq command-history (cons newcmd command-history)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
558 (eval newcmd))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
559 (ding))))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
560
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
561 (defvar minibuffer-history nil
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
562 "Default minibuffer history list.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
563 This is used for all minibuffer input
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
564 except when an alternate history list is specified.")
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
565 (defvar minibuffer-history-sexp-flag nil
7373
451602bf12e4 (minibuffer-history-sexp-flag): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 7333
diff changeset
566 "Non-nil when doing history operations on `command-history'.
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
567 More generally, indicates that the history list being acted on
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
568 contains expressions rather than strings.")
862
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
569 (setq minibuffer-history-variable 'minibuffer-history)
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
570 (setq minibuffer-history-position nil)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
571 (defvar minibuffer-history-search-history nil)
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
572
921
c5c4c2ee8f26 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 892
diff changeset
573 (mapcar
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
574 (lambda (key-and-command)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
575 (mapcar
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
576 (lambda (keymap-and-completionp)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
577 ;; Arg is (KEYMAP-SYMBOL . COMPLETION-MAP-P).
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
578 ;; 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
579 ;; 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
580 (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
581 (car key-and-command)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
582 (let ((command (cdr key-and-command)))
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
583 (if (consp command)
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
584 ;; (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
585 ;; 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
586 ;; 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
587 (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
588 (progn (error "EMACS BUG!") (cdr command))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
589 (car command))
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
590 command))))
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
591 '((minibuffer-local-map . nil)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
592 (minibuffer-local-ns-map . nil)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
593 (minibuffer-local-completion-map . t)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
594 (minibuffer-local-must-match-map . t)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
595 (read-expression-map . nil))))
1838
34da3c151be4 Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents: 1837
diff changeset
596 '(("\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
597 ([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
598 ("\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
599 ([prior] . (previous-history-element . previous-complete-history-element))
921
c5c4c2ee8f26 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 892
diff changeset
600 ("\er" . previous-matching-history-element)
c5c4c2ee8f26 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 892
diff changeset
601 ("\es" . next-matching-history-element)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
602
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
603 (defun previous-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
604 "Find the previous history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
605 \(Previous history elements refer to earlier actions.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
606 With prefix argument N, search for Nth previous match.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
607 If N is negative, find the next or Nth next match."
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
608 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
609 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
610 (minibuffer-history-sexp-flag nil)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
611 (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
612 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
613 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
614 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
615 'minibuffer-history-search-history)))
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
616 ;; 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
617 (list (if (string= regexp "")
11961
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
618 (if minibuffer-history-search-history
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
619 (car minibuffer-history-search-history)
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
620 (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
621 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
622 (prefix-numeric-value current-prefix-arg))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
623 (let ((history (symbol-value minibuffer-history-variable))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
624 prevpos
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
625 (pos minibuffer-history-position))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
626 (while (/= n 0)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
627 (setq prevpos pos)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
628 (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
629 (if (= pos prevpos)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
630 (error (if (= pos 1)
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
631 "No later matching history item"
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
632 "No earlier matching history item")))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
633 (if (string-match regexp
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
634 (if minibuffer-history-sexp-flag
8734
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
635 (let ((print-level nil))
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
636 (prin1-to-string (nth (1- pos) history)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
637 (nth (1- pos) history)))
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
638 (setq n (+ n (if (< n 0) 1 -1)))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
639 (setq minibuffer-history-position pos)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
640 (erase-buffer)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
641 (let ((elt (nth (1- pos) history)))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
642 (insert (if minibuffer-history-sexp-flag
8734
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
643 (let ((print-level nil))
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
644 (prin1-to-string elt))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
645 elt)))
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
646 (goto-char (point-min)))
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
647 (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
648 (eq (car (car command-history)) 'next-matching-history-element))
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
649 (setq command-history (cdr command-history))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
650
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
651 (defun next-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
652 "Find the next history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
653 \(The next history element refers to a more recent action.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
654 With prefix argument N, search for Nth next match.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
655 If N is negative, find the previous or Nth previous match."
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
656 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
657 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
658 (minibuffer-history-sexp-flag nil)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
659 (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
660 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
661 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
662 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
663 'minibuffer-history-search-history)))
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
664 ;; 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
665 (list (if (string= regexp "")
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
666 (setcar minibuffer-history-search-history
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
667 (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
668 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
669 (prefix-numeric-value current-prefix-arg))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
670 (previous-matching-history-element regexp (- n)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
671
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
672 (defun next-history-element (n)
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
673 "Insert the next element of the minibuffer history into the minibuffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
674 (interactive "p")
10722
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
675 (or (zerop n)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
676 (let ((narg (min (max 1 (- minibuffer-history-position n))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
677 (length (symbol-value minibuffer-history-variable)))))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
678 (if (or (zerop narg)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
679 (= minibuffer-history-position narg))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
680 (error (if (if (zerop narg)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
681 (> n 0)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
682 (= minibuffer-history-position 1))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
683 "End of history; no next item"
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
684 "Beginning of history; no preceding item"))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
685 (erase-buffer)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
686 (setq minibuffer-history-position narg)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
687 (let ((elt (nth (1- minibuffer-history-position)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
688 (symbol-value minibuffer-history-variable))))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
689 (insert
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
690 (if minibuffer-history-sexp-flag
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
691 (let ((print-level nil))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
692 (prin1-to-string elt))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
693 elt)))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
694 (goto-char (point-min))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
695
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
696 (defun previous-history-element (n)
1145
e6cefcaba564 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 1135
diff changeset
697 "Inserts the previous element of the minibuffer history into the minibuffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
698 (interactive "p")
859
5f325fbc093d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 858
diff changeset
699 (next-history-element (- n)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
700
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
701 (defun next-complete-history-element (n)
5324
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
702 "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
703 (interactive "p")
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
704 (let ((point-at-start (point)))
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
705 (next-matching-history-element
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
706 (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
707 ;; 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
708 ;; 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
709 ;; 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
710 (goto-char point-at-start)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
711
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
712 (defun previous-complete-history-element (n)
5324
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
713 "\
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
714 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
715 (interactive "p")
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
716 (next-complete-history-element (- n)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
717
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
718 (defun goto-line (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
719 "Goto line ARG, counting from line 1 at beginning of buffer."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
720 (interactive "NGoto line: ")
9343
ee9866892683 (goto-line): Call prefix-numeric-value.
Richard M. Stallman <rms@gnu.org>
parents: 9065
diff changeset
721 (setq arg (prefix-numeric-value arg))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
722 (save-restriction
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
723 (widen)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
724 (goto-char 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
725 (if (eq selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
726 (re-search-forward "[\n\C-m]" nil 'end (1- arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
727 (forward-line (1- arg)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
728
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
729 ;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
730 (defalias 'advertised-undo 'undo)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
731
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
732 (defun undo (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
733 "Undo some previous changes.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
734 Repeat this command to undo more changes.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
735 A numeric argument serves as a repeat count."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
736 (interactive "*p")
5935
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
737 ;; 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
738 ;; for the following command.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
739 (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
740 (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
741 (recent-save (recent-auto-save-p)))
582
a9c4bc19b2aa *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 513
diff changeset
742 (or (eq (selected-window) (minibuffer-window))
a9c4bc19b2aa *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 513
diff changeset
743 (message "Undo!"))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
744 (or (eq last-command 'undo)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
745 (progn (undo-start)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
746 (undo-more 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
747 (undo-more (or arg 1))
6386
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
748 ;; 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
749 ;; 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
750 (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
751 done)
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
752 (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
753 (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
754 (progn
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
755 (setq done t)
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
756 (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
757 (setq tail (cdr tail))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
758 (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
759 (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
760 ;; 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
761 (setq this-command 'undo))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
762
2947
518509536741 (pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents: 2935
diff changeset
763 (defvar pending-undo-list nil
518509536741 (pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents: 2935
diff changeset
764 "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
765
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
766 (defun undo-start ()
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
767 "Set `pending-undo-list' to the front of the undo list.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
768 The next call to `undo-more' will undo the most recently made change."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
769 (if (eq buffer-undo-list t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
770 (error "No undo information in this buffer"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
771 (setq pending-undo-list buffer-undo-list))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
772
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
773 (defun undo-more (count)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
774 "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
775 Call `undo-start' to get ready to undo recent changes,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
776 then call `undo-more' one or more times to undo them."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
777 (or pending-undo-list
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
778 (error "No further undo information"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
779 (setq pending-undo-list (primitive-undo count pending-undo-list)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
780
4374
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
781 (defvar shell-command-history nil
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
782 "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
783
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
784 (defvar shell-command-switch "-c"
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
785 "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
786
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
787 (defun shell-command (command &optional output-buffer)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
788 "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
789
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
790 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
791 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
792 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
793
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
794 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
795 buffer `*Shell Command Output*'.
11072
c5fbb6f272f2 (shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents: 11036
diff changeset
796 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
797 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
798 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
799 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
800 then `*Shell Command Output*' is deleted.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
801
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
802 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
803 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
804 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
805 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
806 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
807 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
808 (interactive (list (read-from-minibuffer "Shell command: "
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
809 nil nil nil 'shell-command-history)
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
810 current-prefix-arg))
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
811 ;; 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
812 (let ((handler
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
813 (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
814 'shell-command)))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
815 (if handler
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
816 (funcall handler 'shell-command command output-buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
817 (if (and output-buffer
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
818 (not (or (bufferp output-buffer) (stringp output-buffer))))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
819 (progn (barf-if-buffer-read-only)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
820 (push-mark)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
821 ;; 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
822 ;; .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
823 ;; "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
824 ;; non-interactively. Besides, if someone wants their other
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
825 ;; 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
826 (call-process shell-file-name nil t nil
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
827 shell-command-switch command)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
828 ;; 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
829 ;; 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
830 ;; 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
831 ;; because we inserted text.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
832 (goto-char (prog1 (mark t)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
833 (set-marker (mark-marker) (point)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
834 (current-buffer)))))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
835 ;; 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
836 (save-match-data
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
837 (if (string-match "[ \t]*&[ \t]*$" command)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
838 ;; Command ending with ampersand means asynchronous.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
839 (let ((buffer (get-buffer-create
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
840 (or output-buffer "*Async Shell Command*")))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
841 (directory default-directory)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
842 proc)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
843 ;; Remove the ampersand.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
844 (setq command (substring command 0 (match-beginning 0)))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
845 ;; If will kill a process, query first.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
846 (setq proc (get-buffer-process buffer))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
847 (if proc
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
848 (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
849 (kill-process proc)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
850 (error "Shell command in progress")))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
851 (save-excursion
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
852 (set-buffer buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
853 (setq buffer-read-only nil)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
854 (erase-buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
855 (display-buffer buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
856 (setq default-directory directory)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
857 (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
858 shell-command-switch command))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
859 (setq mode-line-process '(":%s"))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
860 (require 'shell) (shell-mode)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
861 (set-process-sentinel proc 'shell-command-sentinel)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
862 ))
15876
d814bc72503f (shell-command): Really use output-buffer in synchronous
Richard M. Stallman <rms@gnu.org>
parents: 15836
diff changeset
863 (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
864 ))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
865
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
866 ;; We have a sentinel to prevent insertion of a termination message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
867 ;; in the buffer itself.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
868 (defun shell-command-sentinel (process signal)
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
869 (if (memq (process-status process) '(exit signal))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
870 (message "%s: %s."
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
871 (car (cdr (cdr (process-command process))))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
872 (substring signal 0 -1))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
873
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
874 (defun shell-command-on-region (start end command
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
875 &optional output-buffer replace)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
876 "Execute string COMMAND in inferior shell with region as input.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
877 Normally display output (if any) in temp buffer `*Shell Command Output*';
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
878 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
879
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
880 The noninteractive arguments are START, END, COMMAND, OUTPUT-BUFFER, REPLACE.
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
881 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
882 in place of text from START to END, putting point and mark around it.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
883
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
884 If the output is one line, it is displayed in the echo area,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
885 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
886 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
887 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
888 then `*Shell Command Output*' is deleted.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
889
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
890 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
891 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
892 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
893 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
894 insert output in the current buffer.
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
895 In either case, the output is inserted after point (leaving mark after it)."
10805
7b7874738e7c (shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents: 10779
diff changeset
896 (interactive (let ((string
7b7874738e7c (shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents: 10779
diff changeset
897 ;; 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
898 ;; 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
899 ;; 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
900 (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
901 nil nil nil
7b7874738e7c (shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents: 10779
diff changeset
902 'shell-command-history)))
13482
e49cd471ced7 (do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13328
diff changeset
903 ;; call-interactively recognizes region-beginning and
e49cd471ced7 (do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13328
diff changeset
904 ;; 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
905 (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
906 string
7b7874738e7c (shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents: 10779
diff changeset
907 current-prefix-arg
10912
be434b59c22e (shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents: 10863
diff changeset
908 current-prefix-arg)))
be434b59c22e (shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents: 10863
diff changeset
909 (if (or replace
be434b59c22e (shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents: 10863
diff changeset
910 (and output-buffer
13810
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
911 (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
912 (equal (buffer-name (current-buffer)) "*Shell Command Output*"))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
913 ;; 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
914 (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
915 ;; 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
916 (goto-char start)
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
917 (and replace (push-mark))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
918 (call-process-region start end shell-file-name t t nil
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
919 shell-command-switch command)
8604
7fff44ad20c9 (shell-command-on-region): Don't delete current buffer.
Karl Heuer <kwzh@gnu.org>
parents: 8600
diff changeset
920 (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
921 (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
922 (kill-buffer shell-buffer)))
10912
be434b59c22e (shell-command-on-region): Obey REPLACE even if
Richard M. Stallman <rms@gnu.org>
parents: 10863
diff changeset
923 ;; 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
924 (and replace swap (exchange-point-and-mark)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
925 ;; No prefix argument: put the output in a temp buffer,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
926 ;; replacing its entire contents.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
927 (let ((buffer (get-buffer-create
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
928 (or output-buffer "*Shell Command Output*")))
5635
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
929 (success nil))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
930 (unwind-protect
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
931 (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
932 ;; 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
933 ;; 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
934 ;; 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
935 (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
936 (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
937 (delete-region (point-min) (min start end))
5635
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
938 (call-process-region (point-min) (point-max)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
939 shell-file-name t t nil
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
940 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
941 (setq success t))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
942 ;; 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
943 (save-excursion
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
944 (set-buffer buffer)
9065
e321617e3fc6 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 8998
diff changeset
945 (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
946 (erase-buffer))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
947 (call-process-region start end shell-file-name
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
948 nil buffer nil
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
949 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
950 (setq success t))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
951 ;; 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
952 (let ((lines (save-excursion
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
953 (set-buffer buffer)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
954 (if (= (buffer-size) 0)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
955 0
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
956 (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
957 (cond ((= lines 0)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
958 (if success
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
959 (message "(Shell command completed with no output)"))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
960 (kill-buffer buffer))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
961 ((and success (= lines 1))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
962 (message "%s"
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
963 (save-excursion
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
964 (set-buffer buffer)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
965 (goto-char (point-min))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
966 (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
967 (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
968 (t
15305
29ba4949d3d5 (shell-command-on-region): In output buffer, display
Karl Heuer <kwzh@gnu.org>
parents: 15302
diff changeset
969 (save-excursion
29ba4949d3d5 (shell-command-on-region): In output buffer, display
Karl Heuer <kwzh@gnu.org>
parents: 15302
diff changeset
970 (set-buffer buffer)
29ba4949d3d5 (shell-command-on-region): In output buffer, display
Karl Heuer <kwzh@gnu.org>
parents: 15302
diff changeset
971 (goto-char (point-min)))
29ba4949d3d5 (shell-command-on-region): In output buffer, display
Karl Heuer <kwzh@gnu.org>
parents: 15302
diff changeset
972 (display-buffer buffer))))))))
16312
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
973
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
974 (defun shell-command-to-string (command)
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
975 "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
976 (with-output-to-string
16316
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
977 (with-current-buffer
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
978 standard-output
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
979 (call-process shell-file-name nil t nil shell-command-switch command))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
980
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
981 (defvar universal-argument-map
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
982 (let ((map (make-sparse-keymap)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
983 (define-key map [t] 'universal-argument-other-key)
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
984 (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
985 (define-key map [switch-frame] nil)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
986 (define-key map [?\C-u] 'universal-argument-more)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
987 (define-key map [?-] 'universal-argument-minus)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
988 (define-key map [?0] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
989 (define-key map [?1] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
990 (define-key map [?2] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
991 (define-key map [?3] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
992 (define-key map [?4] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
993 (define-key map [?5] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
994 (define-key map [?6] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
995 (define-key map [?7] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
996 (define-key map [?8] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
997 (define-key map [?9] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
998 map)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
999 "Keymap used while processing \\[universal-argument].")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1000
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1001 (defvar universal-argument-num-events nil
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1002 "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
1003 `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
1004 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
1005
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1006 (defun universal-argument ()
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1007 "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
1008 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
1009 \\[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
1010 \\[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
1011 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
1012 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
1013 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
1014 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
1015 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
1016 (interactive)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1017 (setq prefix-arg (list 4))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1018 (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
1019 (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
1020
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1021 ;; 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
1022 ;; 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
1023 (defun universal-argument-more (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1024 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1025 (if (consp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1026 (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
1027 (if (eq arg '-)
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
1028 (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
1029 (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
1030 (setq overriding-terminal-local-map nil)))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1031 (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
1032
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1033 (defun negative-argument (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1034 "Begin a negative numeric argument for the next command.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1035 \\[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
1036 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1037 (cond ((integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1038 (setq prefix-arg (- arg)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1039 ((eq arg '-)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1040 (setq prefix-arg nil))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1041 (t
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
1042 (setq prefix-arg '-)))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1043 (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
1044 (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
1045
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1046 (defun digit-argument (arg)
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1047 "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
1048 \\[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
1049 (interactive "P")
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1050 (let ((digit (- (logand last-command-char ?\177) ?0)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1051 (cond ((integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1052 (setq prefix-arg (+ (* arg 10)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1053 (if (< arg 0) (- digit) digit))))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1054 ((eq arg '-)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1055 ;; Treat -0 as just -, so that -01 will work.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1056 (setq prefix-arg (if (zerop digit) '- (- digit))))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1057 (t
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
1058 (setq prefix-arg digit))))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1059 (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
1060 (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
1061
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1062 ;; 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
1063 ;; command if digits have already been entered.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1064 (defun universal-argument-minus (arg)
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1065 (interactive "P")
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1066 (if (integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1067 (universal-argument-other-key arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1068 (negative-argument arg)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1069
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1070 ;; 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
1071 ;; executed as a command.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1072 (defun universal-argument-other-key (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1073 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1074 (setq prefix-arg arg)
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1075 (let* ((key (this-command-keys))
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1076 (keylist (listify-key-sequence key)))
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1077 (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
1078 (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
1079 unread-command-events)))
12320
979836b1a1a9 (universal-argument-other-key): Call reset-this-command-lengths.
Richard M. Stallman <rms@gnu.org>
parents: 12313
diff changeset
1080 (reset-this-command-lengths)
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1081 (setq overriding-terminal-local-map nil))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1082
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1083 (defun forward-to-indentation (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1084 "Move forward ARG lines and position at first nonblank character."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1085 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1086 (forward-line arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1087 (skip-chars-forward " \t"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1088
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1089 (defun backward-to-indentation (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1090 "Move backward ARG lines and position at first nonblank character."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1091 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1092 (forward-line (- arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1093 (skip-chars-forward " \t"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1094
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1095 (defvar kill-whole-line nil
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1096 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line.")
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1097
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1098 (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
1099 "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
1100 With prefix argument, kill that many lines from point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101 Negative arguments kill lines backward.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1102
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1103 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
1104 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
1105
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1106 If `kill-whole-line' is non-nil, then kill the whole line
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1107 when given no argument at the beginning of a line."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1108 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1109 (kill-region (point)
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1110 ;; 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
1111 ;; 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
1112 ;; 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
1113 ;; 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
1114 ;; 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
1115 (progn
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1116 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1117 (forward-line (prefix-numeric-value arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1118 (if (eobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1119 (signal 'end-of-buffer nil))
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1120 (if (or (looking-at "[ \t]*$") (and kill-whole-line (bolp)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1121 (forward-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1122 (end-of-line)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1123 (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1124
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1125 ;;;; Window system cut and paste hooks.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1126
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1127 (defvar interprogram-cut-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1128 "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
1129
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1130 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
1131 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
1132 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
1133 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
1134 programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1135
3034
dd65780e6246 (kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents: 3029
diff changeset
1136 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
1137 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
1138 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
1139 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
1140 nil means appending to an \"old\" kill.")
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1141
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1142 (defvar interprogram-paste-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1143 "Function to call to get text cut from other programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1144
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1145 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
1146 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
1147 This variable holds a function that Emacs calls to obtain
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1148 text that other programs have provided for pasting.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1149
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1150 The function should be called with no arguments. If the function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1151 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
1152 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
1153 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
1154
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1155 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
1156 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
1157 most recent string, the function should return nil. If it is
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1158 difficult to tell whether Emacs or some other program provided the
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1159 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
1160 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
1161
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1162
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1163
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1164 ;;;; The kill ring data structure.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1165
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1166 (defvar kill-ring nil
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1167 "List of killed text sequences.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1168 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
1169 facilities offered by window systems, use of this variable should
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1170 interact nicely with `interprogram-cut-function' and
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1171 `interprogram-paste-function'. The functions `kill-new',
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1172 `kill-append', and `current-kill' are supposed to implement this
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1173 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
1174 ring directly.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1175
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
1176 (defvar kill-ring-max 30
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1177 "*Maximum length of kill ring before oldest elements are thrown away.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1178
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1179 (defvar kill-ring-yank-pointer nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1180 "The tail of the kill ring whose car is the last thing yanked.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1181
8763
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1182 (defun kill-new (string &optional replace)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1183 "Make STRING the latest kill in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1184 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
1185 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
1186 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
1187 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
1188 (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
1189 (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
1190 (if replace
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1191 (setcar kill-ring string)
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1192 (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
1193 (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
1194 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1195 (setq kill-ring-yank-pointer kill-ring)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1196 (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
1197 (funcall interprogram-cut-function string (not replace))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1198
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1199 (defun kill-append (string before-p)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1200 "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
1201 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
1202 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
1203 it."
8763
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1204 (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
1205 (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
1206 (concat (car kill-ring) string)) t))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1207
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1208 (defun current-kill (n &optional do-not-move)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1209 "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
1210 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
1211 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
1212 kill ring and returned as the latest kill.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1213 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
1214 yanking point; just return the Nth kill forward."
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1215 (let ((interprogram-paste (and (= n 0)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1216 interprogram-paste-function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1217 (funcall interprogram-paste-function))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1218 (if interprogram-paste
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1219 (progn
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1220 ;; Disable the interprogram cut function when we add the new
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1221 ;; 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
1222 ;; selection, with identical text.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1223 (let ((interprogram-cut-function nil))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1224 (kill-new interprogram-paste))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1225 interprogram-paste)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1226 (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
1227 (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
1228 (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
1229 (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
1230 kill-ring)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1231 (or do-not-move
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1232 (setq kill-ring-yank-pointer ARGth-kill-element))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1233 (car ARGth-kill-element)))))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1234
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1235
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1236
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1237 ;;;; Commands for manipulating the kill ring.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1238
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1239 (defvar kill-read-only-ok nil
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1240 "*Non-nil means don't signal an error for killing read-only text.")
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1241
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1242 (put 'text-read-only 'error-conditions
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1243 '(text-read-only buffer-read-only error))
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1244 (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
1245
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1246 (defun kill-region (beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1247 "Kill between point and mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1248 The text is deleted but saved in the kill ring.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1249 The command \\[yank] can retrieve it from there.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1250 \(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
1251 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
1252 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
1253 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
1254
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1255 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
1256 Supply two arguments, character numbers indicating the stretch of text
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1257 to be killed.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1258 Any command that calls this function is a \"kill command\".
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1259 If the previous command was also a kill command,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1260 the text killed this time appends to the text killed last time
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1261 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
1262 (interactive "r")
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1263 (cond
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1264
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1265 ;; If the buffer is read-only, we should beep, in case the person
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1266 ;; just isn't aware of this. However, there's no harm in putting
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1267 ;; the region's text in the kill ring, anyway.
15892
6a4227841dec (kill-region): inhibit-read-only overrides text props too.
Richard M. Stallman <rms@gnu.org>
parents: 15876
diff changeset
1268 ((and (not inhibit-read-only)
6a4227841dec (kill-region): inhibit-read-only overrides text props too.
Richard M. Stallman <rms@gnu.org>
parents: 15876
diff changeset
1269 (or buffer-read-only
6a4227841dec (kill-region): inhibit-read-only overrides text props too.
Richard M. Stallman <rms@gnu.org>
parents: 15876
diff changeset
1270 (text-property-not-all beg end 'read-only nil)))
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1271 (copy-region-as-kill beg end)
1982
d65c1fefc636 * simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents: 1838
diff changeset
1272 ;; This should always barf, and give us the correct error.
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1273 (if kill-read-only-ok
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1274 (message "Read only text copied to kill ring")
10012
4b936f4cad5c (kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents: 9876
diff changeset
1275 (setq this-command 'kill-region)
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1276 ;; Signal an error if the buffer is read-only.
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1277 (barf-if-buffer-read-only)
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1278 ;; If the buffer isn't read-only, the text is.
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1279 (signal 'text-read-only (list (current-buffer)))))
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1280
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1281 ;; In certain cases, we can arrange for the undo list and the kill
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1282 ;; ring to share the same string object. This code does that.
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1283 ((not (or (eq buffer-undo-list t)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1284 (eq last-command 'kill-region)
10034
1c6132b72da9 (kill-region): Use = to compare positions.
Richard M. Stallman <rms@gnu.org>
parents: 10012
diff changeset
1285 ;; Use = since positions may be numbers or markers.
1c6132b72da9 (kill-region): Use = to compare positions.
Richard M. Stallman <rms@gnu.org>
parents: 10012
diff changeset
1286 (= beg end)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1287 ;; Don't let the undo list be truncated before we can even access it.
3967
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1288 (let ((undo-strong-limit (+ (- (max beg end) (min beg end)) 100))
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1289 (old-list buffer-undo-list)
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1290 tail)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1291 (delete-region beg end)
3967
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1292 ;; Search back in buffer-undo-list for this string,
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1293 ;; in case a change hook made property changes.
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1294 (setq tail buffer-undo-list)
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1295 (while (not (stringp (car (car tail))))
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1296 (setq tail (cdr tail)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1297 ;; Take the same string recorded for undo
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1298 ;; and put it in the kill-ring.
10012
4b936f4cad5c (kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents: 9876
diff changeset
1299 (kill-new (car (car tail)))))
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1300
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1301 (t
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1302 (copy-region-as-kill beg end)
10012
4b936f4cad5c (kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents: 9876
diff changeset
1303 (delete-region beg end)))
4b936f4cad5c (kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents: 9876
diff changeset
1304 (setq this-command 'kill-region))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1305
9876
75ecf866cfb8 Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents: 9870
diff changeset
1306 ;; 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
1307 ;; 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
1308 ;; then corrects it with the intended C-w.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1309 (defun copy-region-as-kill (beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1310 "Save the region as if killed, but don't kill it.
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
1311 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
1312 system cut and paste."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1313 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1314 (if (eq last-command 'kill-region)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1315 (kill-append (buffer-substring beg end) (< end beg))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1316 (kill-new (buffer-substring beg end)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1317 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1318
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1319 (defun kill-ring-save (beg end)
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1320 "Save the region as if killed, but don't kill it.
3467
002945794814 (kill-ring-save): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3408
diff changeset
1321 This command is similar to `copy-region-as-kill', except that it gives
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1322 visual feedback indicating the extent of the region being copied.
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1323 If `interprogram-cut-function' is non-nil, also save the text for a window
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1324 system cut and paste."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1325 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1326 (copy-region-as-kill beg end)
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
1327 (if (interactive-p)
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1328 (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
1329 (opoint (point))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1330 ;; 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
1331 ;; 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
1332 (inhibit-quit t))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1333 (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
1334 (progn
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1335 ;; Swap point and mark.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1336 (set-marker (mark-marker) (point) (current-buffer))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1337 (goto-char other-end)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1338 (sit-for 1)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1339 ;; Swap back.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1340 (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
1341 (goto-char opoint)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1342 ;; If user quit, deactivate the mark
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1343 ;; 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
1344 (and quit-flag mark-active
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1345 (deactivate-mark)))
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1346 (let* ((killed-text (current-kill 0))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1347 (message-len (min (length killed-text) 40)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1348 (if (= (point) beg)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1349 ;; Don't say "killed"; that is misleading.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1350 (message "Saved text until \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1351 (substring killed-text (- message-len)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1352 (message "Saved text from \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1353 (substring killed-text 0 message-len))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1354
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1355 (defun append-next-kill ()
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1356 "Cause following command, if it kills, to append to previous kill."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1357 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1358 (if (interactive-p)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1359 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1360 (setq this-command 'kill-region)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1361 (message "If the next command is a kill, it will append"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1362 (setq last-command 'kill-region)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1363
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1364 (defun yank-pop (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1365 "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
1366 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
1367 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
1368 previously-killed text. `yank-pop' deletes that text and inserts in its
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1369 place a different stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1370
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1371 With no argument, the previous kill is inserted.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1372 With argument N, insert the Nth previous kill.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1373 If N is negative, this is a more recent kill.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1374
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1375 The sequence of kills wraps around, so that after the oldest one
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1376 comes the newest one."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1377 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1378 (if (not (eq last-command 'yank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1379 (error "Previous command was not a yank"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1380 (setq this-command 'yank)
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1381 (let ((inhibit-read-only t)
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1382 (before (< (point) (mark t))))
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1383 (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
1384 (set-marker (mark-marker) (point) (current-buffer))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1385 (insert (current-kill arg))
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1386 (if before
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1387 ;; 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
1388 ;; 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
1389 ;; 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
1390 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1391 (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
1392 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1393
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1394 (defun yank (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1395 "Reinsert the last stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1396 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
1397 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
1398 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
1399 With argument N, reinsert the Nth most recently killed stretch of killed
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1400 text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1401 See also the command \\[yank-pop]."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1402 (interactive "*P")
5935
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
1403 ;; 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
1404 ;; for the following command.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
1405 (setq this-command t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1406 (push-mark (point))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1407 (insert (current-kill (cond
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1408 ((listp arg) 0)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1409 ((eq arg '-) -1)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1410 (t (1- arg)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1411 (if (consp arg)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1412 ;; 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
1413 ;; 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
1414 ;; 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
1415 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1416 (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
1417 ;; 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
1418 (setq this-command 'yank)
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1419 nil)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1420
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1421 (defun rotate-yank-pointer (arg)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1422 "Rotate the yanking point in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1423 With argument, rotate that many kills forward (or backward, if negative)."
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1424 (interactive "p")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1425 (current-kill arg))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1426
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1427
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1428 (defun insert-buffer (buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1429 "Insert after point the contents of BUFFER.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1430 Puts mark after the inserted text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1431 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
1432 (interactive
14834
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
1433 (list
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
1434 (progn
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
1435 (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
1436 (read-buffer "Insert buffer: "
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
1437 (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
1438 (other-buffer (current-buffer))
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
1439 (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
1440 t))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1441 (or (bufferp buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1442 (setq buffer (get-buffer buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1443 (let (start end newmark)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1444 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1445 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1446 (set-buffer buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1447 (setq start (point-min) end (point-max)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1448 (insert-buffer-substring buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1449 (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
1450 (push-mark newmark))
d65c1fefc636 * simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents: 1838
diff changeset
1451 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1452
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1453 (defun append-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1454 "Append to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1455 It is inserted into that buffer before its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1456
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1457 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1458 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1459 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
1460 (interactive
10048
db01a04d2afb (append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents: 10034
diff changeset
1461 (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
1462 (region-beginning) (region-end)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1463 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1464 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1465 (set-buffer (get-buffer-create buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1466 (insert-buffer-substring oldbuf start end))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1467
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1468 (defun prepend-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1469 "Prepend to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1470 It is inserted into that buffer after its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1471
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1472 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1473 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1474 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1475 (interactive "BPrepend to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1476 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1477 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1478 (set-buffer (get-buffer-create buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1479 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1480 (insert-buffer-substring oldbuf start end)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1481
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1482 (defun copy-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1483 "Copy to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1484 It is inserted into that buffer, replacing existing text there.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1485
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1486 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1487 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1488 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1489 (interactive "BCopy to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1490 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1491 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1492 (set-buffer (get-buffer-create buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1493 (erase-buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1494 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1495 (insert-buffer-substring oldbuf start end)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1496
4040
d06d7295d3eb Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents: 3967
diff changeset
1497 (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
1498 (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
1499
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1500 (defun mark (&optional force)
3487
8c151ebeff9c (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3467
diff changeset
1501 "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
1502 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
1503 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
1504 if there is no mark at all.
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1505
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1506 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
1507 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
1508 (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
1509 (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
1510 (signal 'mark-inactive nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1511
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1512 ;; 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
1513 ;; run deactivate-mark-hook. This shorthand should simplify.
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1514 (defsubst deactivate-mark ()
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1515 "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
1516 \(That makes a difference only in Transient Mark mode.)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1517 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
1518 (if transient-mark-mode
0998ca7d922c (deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 7698
diff changeset
1519 (progn
0998ca7d922c (deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 7698
diff changeset
1520 (setq mark-active nil)
0998ca7d922c (deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 7698
diff changeset
1521 (run-hooks 'deactivate-mark-hook))))
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1522
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1523 (defun set-mark (pos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1524 "Set this buffer's mark to POS. Don't use this function!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1525 That is to say, don't use this function unless you want
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1526 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
1527 mark position to be lost.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1528
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1529 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
1530 This is why most applications should use push-mark, not set-mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1531
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1532 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
1533 purposes. The mark saves a location for the user's convenience.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534 Most editing commands should not alter the mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1535 To remember a location for internal use in the Lisp program,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1536 store it in a Lisp variable. Example:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1537
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1538 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1539
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1540 (if pos
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1541 (progn
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1542 (setq mark-active t)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1543 (run-hooks 'activate-mark-hook)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1544 (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
1545 ;; 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
1546 ;; 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
1547 ;; 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
1548 (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
1549 (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
1550 (set-marker (mark-marker) nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1551
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1552 (defvar mark-ring nil
8695
0f702e9ab06d (mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8660
diff changeset
1553 "The list of former marks of the current buffer, most recent first.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1554 (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
1555 (put 'mark-ring 'permanent-local t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1556
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
1557 (defvar mark-ring-max 16
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1558 "*Maximum size of mark ring. Start discarding off end if gets this big.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1559
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1560 (defvar global-mark-ring nil
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1561 "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
1562
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
1563 (defvar 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
1564 "*Maximum size of global mark ring. \
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1565 Start discarding off end if gets this big.")
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1566
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1567 (defun set-mark-command (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1568 "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
1569 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
1570 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
1571 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
1572 \(does not affect global mark ring\).
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1573
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1574 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
1575 purposes. See the documentation of `set-mark' for more information."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1576 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1577 (if (null arg)
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1578 (progn
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1579 (push-mark nil nil t))
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1580 (if (null (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1581 (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
1582 (goto-char (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1583 (pop-mark))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1584
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1585 (defun push-mark (&optional location nomsg activate)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1586 "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
1587 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
1588 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
1589 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
1590 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
1591
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1592 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
1593 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
1594
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1595 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
1596 (if (null (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1597 nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1598 (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1599 (if (> (length mark-ring) mark-ring-max)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1600 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1601 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1602 (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
1603 (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
1604 ;; 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
1605 (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
1606 (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
1607 ;; 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
1608 ;; 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
1609 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
1610 (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
1611 (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
1612 (progn
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1613 (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
1614 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
1615 (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
1616 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1617 (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
1618 (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
1619 (set-mark (mark t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1620 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1621
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1622 (defun pop-mark ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1623 "Pop off mark ring into the buffer's actual mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1624 Does not set point. Does nothing if mark ring is empty."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1625 (if mark-ring
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1626 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1627 (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
1628 (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
1629 (deactivate-mark)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1630 (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
1631 (if (null (mark t)) (ding))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1632 (setq mark-ring (cdr mark-ring)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1633
16436
d2acc84badf4 Use defalias not define-function.
Richard M. Stallman <rms@gnu.org>
parents: 16417
diff changeset
1634 (defalias 'exchange-dot-and-mark 'exchange-point-and-mark)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1635 (defun exchange-point-and-mark ()
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1636 "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
1637 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
1638 and it reactivates the mark."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1639 (interactive nil)
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1640 (let ((omark (mark t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1641 (if (null omark)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1642 (error "No mark set in this buffer"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1643 (set-mark (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1644 (goto-char omark)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1645 nil))
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1646
17514
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
1647 (defun transient-mark-mode (arg)
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1648 "Toggle Transient Mark mode.
2935
653e14f61220 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 2850
diff changeset
1649 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
1650
5372
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
1651 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
1652 Changing the buffer \"deactivates\" the mark.
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
1653 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
1654 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
1655 incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]."
17514
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
1656 (interactive "P")
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1657 (setq transient-mark-mode
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1658 (if (null arg)
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1659 (not transient-mark-mode)
17513
ea3acb6b992a (transient-mark-mode): Print message if used interactively.
Richard M. Stallman <rms@gnu.org>
parents: 17471
diff changeset
1660 (> (prefix-numeric-value arg) 0)))
17514
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
1661 (if (interactive-p)
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
1662 (if transient-mark-mode
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
1663 (message "Transient Mark mode enabled")
335bd3dea3ea Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17513
diff changeset
1664 (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
1665
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1666 (defun pop-global-mark ()
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1667 "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
1668 (interactive)
7881
4ab8723cd491 (pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents: 7877
diff changeset
1669 ;; 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
1670 (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
1671 (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
1672 (or global-mark-ring
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1673 (error "No global mark set"))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1674 (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
1675 (buffer (marker-buffer marker))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1676 (position (marker-position marker)))
10351
e34cbd5276bd (pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents: 10284
diff changeset
1677 (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
1678 (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
1679 (set-buffer buffer)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1680 (or (and (>= position (point-min))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1681 (<= position (point-max)))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1682 (widen))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1683 (goto-char position)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1684 (switch-to-buffer buffer)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1685
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1686 (defvar next-line-add-newlines t
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1687 "*If non-nil, `next-line' inserts newline to avoid `end of buffer' error.")
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1688
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1689 (defun next-line (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1690 "Move cursor vertically down ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1691 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
1692 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1693 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
1694 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
1695 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
1696 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
1697 cursor to the end of the buffer.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1698
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1699 The command \\[set-goal-column] can be used to create
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1700 a semipermanent goal column to which this command always moves.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1701 Then it does not try to move vertically. This goal column is stored
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1702 in `goal-column', which is nil when there is none.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1703
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1704 If you are thinking of using this in a Lisp program, consider
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1705 using `forward-line' instead. It is usually easier to use
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1706 and more reliable (no dependence on goal column, etc.)."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1707 (interactive "p")
5675
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
1708 (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
1709 (let ((opoint (point)))
8309
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1710 (end-of-line)
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1711 (if (eobp)
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
1712 (newline 1)
5675
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
1713 (goto-char opoint)
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
1714 (line-move arg)))
10226
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1715 (if (interactive-p)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1716 (condition-case nil
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1717 (line-move arg)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1718 ((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
1719 (line-move arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1720 nil)
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 previous-line (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1723 "Move cursor vertically up ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1724 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
1725 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1726 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
1727
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1728 The command \\[set-goal-column] can be used to create
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1729 a semipermanent goal column to which this command always moves.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1730 Then it does not try to move vertically.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1731
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1732 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
1733 `forward-line' with a negative argument instead. It is usually easier
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1734 to use and more reliable (no dependence on goal column, etc.)."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1735 (interactive "p")
10226
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1736 (if (interactive-p)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1737 (condition-case nil
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1738 (line-move (- arg))
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1739 ((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
1740 (line-move (- arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1741 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1742
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
1743 (defvar track-eol nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1744 "*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
1745 This means moving to the end of each line moved onto.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1746 The beginning of a blank line does not count as the end of a line.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1747
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
1748 (defvar goal-column nil
04b4499061fd (goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents: 1459
diff changeset
1749 "*Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil.")
04b4499061fd (goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents: 1459
diff changeset
1750 (make-variable-buffer-local 'goal-column)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1751
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1752 (defvar temporary-goal-column 0
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1753 "Current goal column for vertical motion.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1754 It is the column where point was
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1755 at the start of current run of vertical motion commands.
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
1756 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
1757
10949
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
1758 (defvar line-move-ignore-invisible nil
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
1759 "*Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines.
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
1760 Outline mode sets this.")
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
1761
11326
0d5ebc078c51 (line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents: 11324
diff changeset
1762 ;; 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
1763 ;; Arg says how many lines to move.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1764 (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
1765 ;; 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
1766 ;; for intermediate positions.
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1767 (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
1768 (opoint (point))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1769 new)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1770 (unwind-protect
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1771 (progn
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1772 (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
1773 (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
1774 (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
1775 (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
1776 ;; 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
1777 ;; 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
1778 (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
1779 9999
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1780 (current-column))))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1781 (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
1782 (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
1783 ;; 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
1784 (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
1785 (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
1786 ;; 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
1787 ;; 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
1788 ;; 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
1789 (end-of-line)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1790 (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
1791 (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
1792 (bolp)))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1793 (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
1794 'beginning-of-buffer
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1795 'end-of-buffer)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1796 nil))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1797 ;; 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
1798 (while (> arg 0)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1799 (end-of-line)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1800 (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
1801 (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
1802 ;; 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
1803 ;; 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
1804 (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
1805 (let ((prop
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1806 (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
1807 (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
1808 prop
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1809 (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
1810 (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
1811 (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
1812 (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
1813 (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
1814 (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
1815 (while (< arg 0)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1816 (beginning-of-line)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1817 (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
1818 (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
1819 (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
1820 (let ((prop
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1821 (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
1822 (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
1823 prop
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1824 (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
1825 (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
1826 (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
1827 (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
1828 (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
1829 (setq arg (1+ arg))))
16408
87f15c601f5a (line-move): Ignore invisibility in `move-to-column'.
Richard M. Stallman <rms@gnu.org>
parents: 16316
diff changeset
1830 (let ((buffer-invisibility-spec nil))
87f15c601f5a (line-move): Ignore invisibility in `move-to-column'.
Richard M. Stallman <rms@gnu.org>
parents: 16316
diff changeset
1831 (move-to-column (or goal-column temporary-goal-column))))
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1832 ;; Remember where we moved to, go back home,
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1833 ;; then do the motion over again
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1834 ;; in just one step, with intangibility and point-motion hooks
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1835 ;; enabled this time.
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1836 (setq new (point))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1837 (goto-char opoint)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1838 (setq inhibit-point-motion-hooks nil)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1839 (goto-char new)))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
1840 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1841
1771
3f0f18d4eb8c * simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents: 1760
diff changeset
1842 ;;; 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
1843 ;;; 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
1844 (put 'set-goal-column 'disabled t)
475
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 set-goal-column (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1847 "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
1848 Those commands will move to this position in the line moved to
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1849 rather than trying to keep the same horizontal position.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1850 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
1851 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
1852 The goal column is stored in the variable `goal-column'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1853 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1854 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1855 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1856 (setq goal-column nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1857 (message "No goal column"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1858 (setq goal-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1859 (message (substitute-command-keys
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1860 "Goal column %d (use \\[set-goal-column] with an arg to unset it)")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1861 goal-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1862 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1863
2597
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1864 ;;; Partial support for horizontal autoscrolling. Someday, this feature
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1865 ;;; 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
1866 ;;; will go away.
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1867
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1868 (defvar hscroll-step 0
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1869 "*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
1870 If that fails to bring point back on frame, point is centered instead.
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1871 If this is zero, point is always centered after it moves off frame.")
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1872
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1873 (defun hscroll-point-visible ()
6743
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1874 "Scrolls the selected window horizontally to make point visible."
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1875 (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1876 (set-buffer (window-buffer))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1877 (if (not (or truncate-lines
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1878 (> (window-hscroll) 0)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1879 (and truncate-partial-width-windows
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1880 (< (window-width) (frame-width)))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1881 ;; Point is always visible when lines are wrapped.
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1882 ()
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1883 ;; 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
1884 ;; 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
1885 (and (< (point) (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1886 (let ((ws-bol (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1887 (goto-char (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1888 (beginning-of-line)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1889 (point))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1890 (and (>= (point) ws-bol)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1891 (set-window-start nil ws-bol))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1892 (let* ((here (hscroll-window-column))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1893 (left (min (window-hscroll) 1))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1894 (right (1- (window-width))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1895 ;; 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
1896 (if (not (and (= here right)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1897 (= (following-char) ?\n)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1898 (setq right (1- right)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1899 (cond
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1900 ;; 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
1901 ;; white space off the end of the line.
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1902 ((or (< here (- left hscroll-step))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1903 (> here (+ right hscroll-step)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1904 (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
1905 (scroll-left (min (- here (/ (window-width) 2))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1906 (- eol (window-width) -5)))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1907 ;; 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
1908 ((< here left)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1909 (scroll-right hscroll-step))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1910 ((> here right)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1911 (scroll-left hscroll-step)))))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1912
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1913 ;; 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
1914 ;; 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
1915 ;; 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
1916 ;; 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
1917 ;; 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
1918 ;; 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
1919 ;; 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
1920 (defun hscroll-window-column ()
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1921 (let* ((hscroll (window-hscroll))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1922 (startpos (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1923 (beginning-of-line)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1924 (if (= (point) (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1925 (goto-char (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1926 (beginning-of-line)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1927 (point)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1928 (goto-char (window-start)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1929 (point)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1930 (hpos (+ (if (and (eq (selected-window) (minibuffer-window))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1931 (= 1 (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1932 (= startpos (point-min)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1933 (minibuffer-prompt-width)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1934 0)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1935 (min 0 (- 1 hscroll))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1936 val)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1937 (car (cdr (compute-motion startpos (cons hpos 0)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1938 (point) (cons 0 1)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1939 1000000 (cons hscroll 0) nil)))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1940
2597
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1941
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1942 ;; 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
1943 ;; 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
1944 ;; (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
1945 ;; 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
1946 ;; 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
1947
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1948 ;;;;; 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
1949 ;;;;; 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
1950 ;;;;; 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
1951 ;;;;; 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
1952 ;;;;; events in loaddefs.el.
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1953
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1954 ;;(defun right-arrow (arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1955 ;; "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
1956 ;;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
1957 ;; (interactive "P")
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1958 ;; (forward-char arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1959 ;; (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
1960
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1961 ;;(defun left-arrow (arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1962 ;; "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
1963 ;;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
1964 ;; (interactive "P")
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1965 ;; (backward-char arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1966 ;; (hscroll-point-visible))
8006
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1967
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1968 (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
1969 "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
1970 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
1971 (interactive "P")
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1972 (scroll-other-window
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1973 ;; Just invert the argument's meaning.
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1974 ;; 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
1975 (if (eq lines '-) nil
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1976 (if (null lines) '-
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1977 (- (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
1978 (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
1979
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1980 (defun beginning-of-buffer-other-window (arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1981 "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
1982 Leave mark at previous position.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1983 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
1984 (interactive "P")
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1985 (let ((orig-window (selected-window))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1986 (window (other-window-for-scrolling)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1987 ;; 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
1988 ;; 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
1989 (unwind-protect
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1990 (progn
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1991 (select-window window)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1992 ;; 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
1993 (beginning-of-buffer arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1994 ;; Set point accordingly.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1995 (recenter '(t)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1996 (select-window orig-window))))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1997
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1998 (defun end-of-buffer-other-window (arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1999 "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
2000 Leave mark at previous position.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2001 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
2002 (interactive "P")
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2003 ;; See beginning-of-buffer-other-window for comments.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2004 (let ((orig-window (selected-window))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2005 (window (other-window-for-scrolling)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2006 (unwind-protect
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2007 (progn
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2008 (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
2009 (end-of-buffer arg)
8057
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2010 (recenter '(t)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2011 (select-window orig-window))))
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
2012
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013 (defun transpose-chars (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2014 "Interchange characters around point, moving forward one character.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2015 With prefix arg ARG, effect is to take character before point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2016 and drag it forward past ARG other characters (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2017 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
2018 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2019 (and (null arg) (eolp) (forward-char -1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2020 (transpose-subr 'forward-char (prefix-numeric-value arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2021
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2022 (defun transpose-words (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2023 "Interchange words around point, leaving point at end of them.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2024 With prefix arg ARG, effect is to take word before or around point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2025 and drag it forward past ARG other words (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2026 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
2027 are interchanged."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2028 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2029 (transpose-subr 'forward-word arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2030
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2031 (defun transpose-sexps (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2032 "Like \\[transpose-words] but applies to sexps.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2033 Does not work on a sexp that point is in the middle of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2034 if it is a list or string."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2035 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2036 (transpose-subr 'forward-sexp arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2037
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2038 (defun transpose-lines (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2039 "Exchange current line and previous line, leaving point after both.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2040 With argument ARG, takes previous line and moves it past ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2041 With argument 0, interchanges line point is in with line mark is in."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2042 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2043 (transpose-subr (function
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2044 (lambda (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2045 (if (= arg 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2046 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2047 ;; Move forward over a line,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2048 ;; but create a newline if none exists yet.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2049 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2050 (if (eobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2051 (newline)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2052 (forward-char 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2053 (forward-line arg))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2054 arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2055
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2056 (defun transpose-subr (mover arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2057 (let (start1 end1 start2 end2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2058 (if (= arg 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2059 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2060 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2061 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2062 (setq end2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2063 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2064 (setq start2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2065 (goto-char (mark))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2066 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2067 (setq end1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2068 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2069 (setq start1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2070 (transpose-subr-1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2071 (exchange-point-and-mark)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2072 (while (> arg 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2073 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2074 (setq start1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2075 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2076 (setq end1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2077 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2078 (setq end2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2079 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2080 (setq start2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2081 (transpose-subr-1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2082 (goto-char end2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2083 (setq arg (1- arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2084 (while (< arg 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2085 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2086 (setq start2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2087 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2088 (setq start1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2089 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2090 (setq end1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2091 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2092 (setq end2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2093 (transpose-subr-1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2094 (setq arg (1+ arg)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2095
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2096 (defun transpose-subr-1 ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2097 (if (> (min end1 end2) (max start1 start2))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2098 (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
2099 (let* ((word1 (buffer-substring start1 end1))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2100 (len1 (length word1))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2101 (word2 (buffer-substring start2 end2))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2102 (len2 (length word2)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2103 (delete-region start2 end2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2104 (goto-char start2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2105 (insert word1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2106 (goto-char (if (< start1 start2) start1
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2107 (+ start1 (- len1 len2))))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2108 (delete-region (point) (+ (point) len1))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2109 (insert word2)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2110
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2111 (defvar comment-column 32
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2112 "*Column to indent right-margin comments to.
1581
9de0900ca56a * simple.el (comment-column): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1556
diff changeset
2113 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
2114 Each mode establishes a different default value for this variable; you
6237
7c95bb9f534b (comment-column): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6174
diff changeset
2115 can set the value for a particular mode using that mode's hook.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2116 (make-variable-buffer-local 'comment-column)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2117
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2118 (defvar comment-start nil
10983
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2119 "*String to insert to start a new comment, or nil if no comment syntax.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2120
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2121 (defvar comment-start-skip nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2122 "*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
2123 If there are any \\(...\\) pairs, the comment delimiter text is held to begin
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2124 at the place matched by the close of the first pair.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2125
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2126 (defvar comment-end ""
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2127 "*String to insert to end a new comment.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2128 Should be an empty string if comments are terminated by end-of-line.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2129
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2130 (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
2131 "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
2132 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
2133 the comment's starting delimiter.")
53abb56a18fa * simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents: 2215
diff changeset
2134
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2135 (defvar comment-indent-function
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2136 '(lambda () comment-column)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2137 "Function to compute desired indentation for a comment.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2138 This function is called with no args with point at the beginning of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2139 the comment's starting delimiter.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2140
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2141 (defvar block-comment-start nil
10983
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2142 "*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
2143 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
2144 Note that the regular expression `comment-start-skip' should skip this string
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2145 as well as the `comment-start' string.")
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2146
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2147 (defvar block-comment-end nil
10983
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2148 "*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
2149 Should be an empty string if comments are terminated by end-of-line.
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2150 If nil, use `comment-end' instead.")
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2151
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2152 (defun indent-for-comment ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2153 "Indent this line's comment to comment column, or insert an empty comment."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2154 (interactive "*")
10983
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2155 (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
2156 (looking-at "[ \t]*$")))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2157 (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
2158 (ender (or (and empty block-comment-end) comment-end)))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2159 (if (null starter)
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2160 (error "No comment syntax defined")
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2161 (let* ((eolpos (save-excursion (end-of-line) (point)))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2162 cpos indent begpos)
11975
dd80dd6aa77f (indent-for-comment): move to beginning of line only
Karl Heuer <kwzh@gnu.org>
parents: 11961
diff changeset
2163 (beginning-of-line)
10983
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2164 (if (re-search-forward comment-start-skip eolpos 'move)
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2165 (progn (setq cpos (point-marker))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2166 ;; Find the start of the comment delimiter.
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2167 ;; If there were paren-pairs in comment-start-skip,
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2168 ;; position at the end of the first pair.
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2169 (if (match-end 1)
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2170 (goto-char (match-end 1))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2171 ;; If comment-start-skip matched a string with
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2172 ;; internal whitespace (not final whitespace) then
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2173 ;; the delimiter start at the end of that
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2174 ;; whitespace. Otherwise, it starts at the
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2175 ;; beginning of what was matched.
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2176 (skip-syntax-backward " " (match-beginning 0))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2177 (skip-syntax-backward "^ " (match-beginning 0)))))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2178 (setq begpos (point))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2179 ;; Compute desired indent.
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2180 (if (= (current-column)
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2181 (setq indent (if comment-indent-hook
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2182 (funcall comment-indent-hook)
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2183 (funcall comment-indent-function))))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2184 (goto-char begpos)
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2185 ;; If that's different from current, change it.
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2186 (skip-chars-backward " \t")
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2187 (delete-region (point) begpos)
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2188 (indent-to indent))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2189 ;; An existing comment?
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2190 (if cpos
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2191 (progn (goto-char cpos)
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2192 (set-marker cpos nil))
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2193 ;; No, insert one.
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2194 (insert starter)
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2195 (save-excursion
8ad27030d73f (block-comment-start, block-comment-end): New vars.
Richard M. Stallman <rms@gnu.org>
parents: 10959
diff changeset
2196 (insert ender)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2197
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2198 (defun set-comment-column (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2199 "Set the comment column based on point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2200 With no arg, set the comment column to the current column.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2201 With just minus as arg, kill any comment on this line.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2202 With any other arg, set comment column to indentation of the previous comment
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2203 and then align or create a comment on this line at that column."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2204 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2205 (if (eq arg '-)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2206 (kill-comment nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2207 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2208 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2209 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2210 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2211 (re-search-backward comment-start-skip)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2212 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2213 (re-search-forward comment-start-skip)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2214 (goto-char (match-beginning 0))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2215 (setq comment-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2216 (message "Comment column set to %d" comment-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2217 (indent-for-comment))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2218 (setq comment-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2219 (message "Comment column set to %d" comment-column))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2220
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2221 (defun kill-comment (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2222 "Kill the comment on this line, if any.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2223 With argument, kill comments on that many lines starting with this one."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2224 ;; this function loses in a lot of situations. it incorrectly recognises
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2225 ;; comment delimiters sometimes (ergo, inside a string), doesn't work
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2226 ;; with multi-line comments, can kill extra whitespace if comment wasn't
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2227 ;; through end-of-line, et cetera.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2228 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2229 (or comment-start-skip (error "No comment syntax defined"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2230 (let ((count (prefix-numeric-value arg)) endc)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2231 (while (> count 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2232 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2233 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2234 (setq endc (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2235 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2236 (and (string< "" comment-end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2237 (setq endc
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2238 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2239 (re-search-forward (regexp-quote comment-end) endc 'move)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2240 (skip-chars-forward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2241 (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2242 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2243 (if (re-search-forward comment-start-skip endc t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2244 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2245 (goto-char (match-beginning 0))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2246 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2247 (kill-region (point) endc)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2248 ;; to catch comments a line beginnings
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2249 (indent-according-to-mode))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2250 (if arg (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2251 (setq count (1- count)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2252
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2253 (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
2254 "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
2255 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
2256 Numeric prefix arg ARG means use ARG comment characters.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2257 If ARG is negative, delete that many comment characters instead.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2258 Comments are terminated on each line, even for syntax in which newline does
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2259 not end the comment. Blank lines do not get comments."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2260 ;; 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
2261 ;; 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
2262 ;; is easy enough. No option is made here for other than commenting
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2263 ;; every line.
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2264 (interactive "r\nP")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2265 (or comment-start (error "No comment syntax is defined"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2266 (if (> beg end) (let (mid) (setq mid beg beg end end mid)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2267 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2268 (save-restriction
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2269 (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
2270 numarg)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2271 (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
2272 (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
2273 ;; 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
2274 ;; 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
2275 (while (> numarg 1)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2276 (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
2277 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
2278 (setq numarg (1- numarg))))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2279 ;; Loop over all lines from BEG to END.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2280 (narrow-to-region beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2281 (goto-char beg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2282 (while (not (eobp))
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2283 (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
2284 (progn
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2285 ;; 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
2286 (if (eq numarg t)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2287 (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
2288 (delete-char (length cs)))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2289 (let ((count numarg))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2290 (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
2291 (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
2292 (delete-char (length cs)))))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2293 ;; 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
2294 (if (string= "" ce)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2295 nil
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2296 (if (eq numarg t)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2297 (progn
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2298 (end-of-line)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2299 ;; 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
2300 ;; 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
2301 ;; though.
16508
fd19350c1405 (comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents: 16445
diff changeset
2302 (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
2303 (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
2304 (save-excursion
fd19350c1405 (comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents: 16445
diff changeset
2305 (backward-char (length ce))
fd19350c1405 (comment-region): With just C-u as arg,
Richard M. Stallman <rms@gnu.org>
parents: 16445
diff changeset
2306 (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
2307 (delete-char (- (length ce)))))
5767
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2308 (let ((count numarg))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2309 (while (> 1 (setq count (1+ count)))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2310 (end-of-line)
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2311 ;; 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
2312 ;; that is pretty brain-damaged though
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2313 (skip-chars-backward " \t")
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2314 (save-excursion
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2315 (backward-char (length ce))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2316 (if (looking-at (regexp-quote ce))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2317 (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
2318 (forward-line 1))
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2319 ;; Insert at beginning and at end.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2320 (if (looking-at "[ \t]*$") ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2321 (insert cs)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2322 (if (string= "" ce) ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2323 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2324 (insert ce)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2325 (search-forward "\n" nil 'move)))))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2326
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2327 (defun backward-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2328 "Move backward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2329 With argument, do this that many times.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2330 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
2331 (interactive "p")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2332 (forward-word (- arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2333
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2334 (defun mark-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2335 "Set mark arg words away from point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2336 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2337 (push-mark
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2338 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2339 (forward-word arg)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2340 (point))
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2341 nil t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2342
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2343 (defun kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2344 "Kill characters forward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2345 With argument, do this that many times."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2346 (interactive "p")
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
2347 (kill-region (point) (progn (forward-word arg) (point))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2348
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2349 (defun backward-kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2350 "Kill characters backward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2351 With argument, do this that many times."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2352 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2353 (kill-word (- arg)))
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2354
6174
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2355 (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
2356 "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
2357 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
2358 or adjacent to a word."
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2359 (save-excursion
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2360 (let ((oldpoint (point)) (start (point)) (end (point)))
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2361 (skip-syntax-backward "w_") (setq start (point))
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2362 (goto-char oldpoint)
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2363 (skip-syntax-forward "w_") (setq end (point))
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2364 (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
2365 ;; 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
2366 (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
2367 (progn
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2368 ;; 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
2369 (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
2370 (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
2371 (point)))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2372 (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
2373 ;; 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
2374 ;; 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
2375 (progn
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2376 (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
2377 (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
2378 (point)))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2379 (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
2380 (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
2381 (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
2382 (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
2383 (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
2384 (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
2385 (buffer-substring start end)))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2386 (buffer-substring start end)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2387
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2388 (defvar fill-prefix nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2389 "*String for filling to insert at front of new line, or nil for none.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2390 Setting this variable automatically makes it local to the current buffer.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2391 (make-variable-buffer-local 'fill-prefix)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2392
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2393 (defvar auto-fill-inhibit-regexp nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2394 "*Regexp to match lines which should not be auto-filled.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2395
15263
0d7899c372ed (do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents: 15115
diff changeset
2396 ;; This function is the auto-fill-function of a buffer
0d7899c372ed (do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents: 15115
diff changeset
2397 ;; 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
2398 ;; It returns t if it really did any work.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2399 (defun do-auto-fill ()
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2400 (let (fc justify bol give-up
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2401 (fill-prefix fill-prefix))
10471
3eb77f03f53e (do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents: 10469
diff changeset
2402 (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
2403 (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
2404 (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
2405 (<= (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
2406 (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
2407 (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
2408 (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
2409 (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
2410 nil ;; Auto-filling not required
10813
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
2411 (if (memq justify '(full center right))
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
2412 (save-excursion (unjustify-current-line)))
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2413
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2414 ;; Choose a fill-prefix automatically.
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2415 (if (and adaptive-fill-mode
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2416 (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
2417 (let ((prefix
a0c1c62e2c4a (do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents: 13525
diff changeset
2418 (fill-context-prefix
a0c1c62e2c4a (do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents: 13525
diff changeset
2419 (save-excursion (backward-paragraph 1) (point))
a0c1c62e2c4a (do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents: 13525
diff changeset
2420 (save-excursion (forward-paragraph 1) (point))
a0c1c62e2c4a (do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents: 13525
diff changeset
2421 ;; Don't accept a non-whitespace fill prefix
a0c1c62e2c4a (do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents: 13525
diff changeset
2422 ;; from the first line of a paragraph.
a0c1c62e2c4a (do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents: 13525
diff changeset
2423 "^[ \t]*$")))
a0c1c62e2c4a (do-auto-fill): Look at 2nd line for fill prefix
Richard M. Stallman <rms@gnu.org>
parents: 13525
diff changeset
2424 (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
2425 (setq fill-prefix prefix))))
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
2426
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2427 (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
2428 ;; Determine where to split the line.
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2429 (let ((fill-point
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2430 (let ((opoint (point))
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2431 bounce
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2432 (first t)
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2433 after-prefix)
12718
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2434 (save-excursion
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2435 (beginning-of-line)
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2436 (setq after-prefix (point))
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2437 (and fill-prefix
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2438 (looking-at (regexp-quote fill-prefix))
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2439 (setq after-prefix (match-end 0)))
12718
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2440 (move-to-column (1+ fc))
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2441 ;; Move back to the point where we can break the
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2442 ;; line at. We break the line between word or
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2443 ;; after/before the character which has character
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2444 ;; category `|'. We search space, \c| followed by
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2445 ;; a character, or \c| follwoing a character. If
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2446 ;; not found, place the point at beginning of line.
12718
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2447 (while (or first
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2448 ;; If this is after period and a single space,
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2449 ;; move back once more--we don't want to break
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2450 ;; the line there and make it look like a
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2451 ;; sentence end.
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2452 (and (not (bobp))
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2453 (not bounce)
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2454 sentence-end-double-space
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2455 (save-excursion (forward-char -1)
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2456 (and (looking-at "\\. ")
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2457 (not (looking-at "\\. "))))))
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2458 (setq first nil)
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2459 (re-search-backward "[ \t]\\|\\c|.\\|.\\c|\\|^")
12718
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2460 ;; If we find nowhere on the line to break it,
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2461 ;; break after one word. Set bounce to t
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2462 ;; so we will not keep going in this while loop.
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2463 (if (<= (point) after-prefix)
12718
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2464 (progn
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2465 (re-search-forward "[ \t]" opoint t)
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2466 (setq bounce t))
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2467 (if (looking-at "[ \t]")
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2468 ;; Break the line at word boundary.
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2469 (skip-chars-backward " \t")
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2470 ;; Break the line after/before \c|.
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2471 (forward-char 1)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2472 (if do-kinsoku
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2473 (kinsoku (save-excursion
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
2474 (forward-line 0) (point)))))))
12718
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2475 ;; Let fill-point be set to the place where we end up.
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2476 (point)))))
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2477 ;; If that place is not the beginning of the line,
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2478 ;; break the line there.
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2479 (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
2480 (goto-char fill-point)
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2481 (not (bolp)))
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2482 (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
2483 ;; 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
2484 ;; 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
2485 ;; 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
2486 (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
2487 (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
2488 (= (point) fill-point))
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2489 (indent-new-comment-line t)
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2490 (save-excursion
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2491 (goto-char fill-point)
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2492 (indent-new-comment-line t)))
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2493 ;; 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
2494 (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
2495 (save-excursion
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2496 (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
2497 (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
2498 ;; 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
2499 ;; 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
2500 ;; 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
2501 (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
2502 (setq give-up t)))
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2503 ;; No place to break => stop trying.
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
2504 (setq give-up t))))
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2505 ;; Justify last line.
15263
0d7899c372ed (do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents: 15115
diff changeset
2506 (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
2507 t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2508
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2509 (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
2510 "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
2511 Some major modes set this.")
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2512
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2513 (defun auto-fill-mode (&optional arg)
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2514 "Toggle Auto Fill mode.
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2515 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
2516 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
2517 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
2518
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2519 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
2520 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
2521 (interactive "P")
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2522 (prog1 (setq auto-fill-function
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2523 (if (if (null arg)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2524 (not auto-fill-function)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2525 (> (prefix-numeric-value arg) 0))
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
2526 normal-auto-fill-function
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2527 nil))
11572
09d49f6e0af9 (auto-fill-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents: 11479
diff changeset
2528 (force-mode-line-update)))
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2529
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2530 ;; 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
2531 (defun auto-fill-function ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2532 "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
2533 nil)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2534
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2535 (defun turn-on-auto-fill ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2536 "Unconditionally turn on Auto Fill mode."
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2537 (auto-fill-mode 1))
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2538
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2539 (defun set-fill-column (arg)
15431
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
2540 "Set `fill-column' to specified argument.
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
2541 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
2542 (interactive "P")
15431
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
2543 (cond ((integerp arg)
16957
9e1fac479bed (set-fill-column): Print the old value too.
Richard M. Stallman <rms@gnu.org>
parents: 16955
diff changeset
2544 (message "Fill column set to %d (was %d)" arg fill-column)
15431
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
2545 (setq fill-column arg))
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
2546 ((consp arg)
16957
9e1fac479bed (set-fill-column): Print the old value too.
Richard M. Stallman <rms@gnu.org>
parents: 16955
diff changeset
2547 (message "Fill column set to %d (was %d)" arg fill-column)
15431
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
2548 (setq fill-column (current-column)))
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
2549 ;; Disallow missing argument; it's probably a typo for C-x C-f.
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
2550 (t
16957
9e1fac479bed (set-fill-column): Print the old value too.
Richard M. Stallman <rms@gnu.org>
parents: 16955
diff changeset
2551 (error "set-fill-column requires an explicit argument"))))
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2552
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2553 (defvar comment-multi-line nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2554 "*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
2555 on new line, with no new terminator or starter.
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2556 This is obsolete because you might as well use \\[newline-and-indent].")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2557
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2558 (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
2559 "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
2560 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
2561 under the previous comment line.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2562
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2563 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
2564 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
2565 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
2566
12624
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2567 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
2568 or comment indentation.
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2569
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2570 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
2571 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
2572 (interactive)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2573 (let (comcol comstart)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2574 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2575 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2576 (progn (skip-chars-forward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2577 (point)))
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2578 (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
2579 (if fill-prefix
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2580 (progn
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2581 (indent-to-left-margin)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2582 (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
2583 (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
2584 (save-excursion
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2585 (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
2586 (let ((opoint (point)))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2587 (forward-line -1)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2588 (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
2589 ;; 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
2590 ;; 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
2591 ;; 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
2592 ;; 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
2593
12624
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2594 ;; 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
2595 ;; 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
2596 (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
2597 (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
2598 (let (opoint)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2599 (beginning-of-line)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2600 (setq opoint (point))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2601 (forward-line -1)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2602 (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
2603 (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
2604 ;; 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
2605 (goto-char win)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2606 (setq comcol (current-column))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2607 (setq comstart
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2608 (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
2609 (if comcol
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2610 (let ((comment-column comcol)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2611 (comment-start comstart)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2612 (comment-end comment-end))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2613 (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
2614 ; (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
2615 (progn
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2616 (forward-char -1)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2617 (insert comment-end)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2618 (forward-char 1))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2619 ; (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
2620 ; comment-start "")
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2621 ; )
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2622 )
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2623 (if (not (eolp))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2624 (setq comment-end ""))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2625 (insert-and-inherit ?\n)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2626 (forward-char -1)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2627 (indent-for-comment)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2628 (save-excursion
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2629 ;; 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
2630 (end-of-line)
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2631 (delete-char 1)))
8ba65cbc8abe (indent-new-comment-line): fill-prefix overrides comment indentation.
Richard M. Stallman <rms@gnu.org>
parents: 12565
diff changeset
2632 (indent-according-to-mode)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2633
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2634 (defun set-selective-display (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2635 "Set `selective-display' to ARG; clear it if no arg.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2636 When the value of `selective-display' is a number > 0,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2637 lines whose indentation is >= that value are not displayed.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2638 The variable `selective-display' has a separate value for each buffer."
475
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 selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2641 (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
2642 (let ((current-vpos
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2643 (save-restriction
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2644 (narrow-to-region (point-min) (point))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2645 (goto-char (window-start))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2646 (vertical-motion (window-height)))))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2647 (setq selective-display
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2648 (and arg (prefix-numeric-value arg)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2649 (recenter current-vpos))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2650 (set-window-start (selected-window) (window-start (selected-window)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2651 (princ "selective-display set to " t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2652 (prin1 selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2653 (princ "." t))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2654
17471
f383bfae3202 (overwrite-mode-binary, overwrite-mode-textual): Use defvar.
Richard M. Stallman <rms@gnu.org>
parents: 17355
diff changeset
2655 (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
2656 "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
2657 (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
2658 "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
2659
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2660 (defun overwrite-mode (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2661 "Toggle overwrite mode.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2662 With arg, turn overwrite mode on iff arg is positive.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2663 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
2664 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
2665 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
2666 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
2667 \\[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
2668 is supposed to make it easier to insert characters when necessary."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2669 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2670 (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
2671 (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
2672 (> (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
2673 '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
2674 (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
2675
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
2676 (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
2677 "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
2678 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
2679 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
2680 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
2681 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
2682 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
2683 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
2684 \\[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
2685 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
2686
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
2687 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
2688 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
2689 `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
2690 (interactive "P")
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
2691 (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
2692 (if (if (null arg)
2301
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2693 (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
2694 (> (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
2695 '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
2696 (force-mode-line-update))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2697
12789
6ee52fbbee75 (column-number-mode, line-number-mode): Default now t.
Richard M. Stallman <rms@gnu.org>
parents: 12718
diff changeset
2698 (defvar line-number-mode t
2301
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2699 "*Non-nil means display line number in mode line.")
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2700
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2701 (defun line-number-mode (arg)
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2702 "Toggle Line Number mode.
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2703 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
2704 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
2705 in the mode line."
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2706 (interactive "P")
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2707 (setq line-number-mode
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2708 (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
2709 (> (prefix-numeric-value arg) 0)))
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2710 (force-mode-line-update))
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2711
13328
344abd898be9 (column-number-mode): Make default value nil.
Richard M. Stallman <rms@gnu.org>
parents: 13171
diff changeset
2712 (defvar column-number-mode nil
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2713 "*Non-nil means display column number in mode line.")
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2714
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2715 (defun column-number-mode (arg)
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2716 "Toggle Column Number mode.
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2717 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
2718 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
2719 in the mode line."
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2720 (interactive "P")
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2721 (setq column-number-mode
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2722 (if (null arg) (not column-number-mode)
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2723 (> (prefix-numeric-value arg) 0)))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2724 (force-mode-line-update))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2725
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2726 (defvar blink-matching-paren t
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2727 "*Non-nil means show matching open-paren when close-paren is inserted.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2728
13810
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
2729 (defvar blink-matching-paren-on-screen t
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
2730 "*Non-nil means show matching open-paren when it is on screen.
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
2731 nil means don't show it (but the open-paren can still be shown
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
2732 when it is off screen.")
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
2733
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2734 (defvar blink-matching-paren-distance 12000
2669
0931cd677ff4 (blink-matching-paren-distance): Change default to 12,000.
Richard M. Stallman <rms@gnu.org>
parents: 2608
diff changeset
2735 "*If non-nil, is maximum distance to search for matching open-paren.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2736
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2737 (defvar blink-matching-delay 1
9771
3a51735d4a55 (blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9750
diff changeset
2738 "*The number of seconds that `blink-matching-open' will delay at a match.")
3a51735d4a55 (blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9750
diff changeset
2739
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2740 (defvar blink-matching-paren-dont-ignore-comments nil
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
2741 "*Non-nil means `blink-matching-paren' should not ignore comments.")
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
2742
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2743 (defun blink-matching-open ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2744 "Move cursor momentarily to the beginning of the sexp before point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2745 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2746 (and (> (point) (1+ (point-min)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2747 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
2748 ;; 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
2749 (= 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
2750 (save-excursion
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
2751 (forward-char -1)
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
2752 (skip-syntax-backward "/\\")
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
2753 (point)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2754 (let* ((oldpos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2755 (blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2756 (mismatch))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2757 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2758 (save-restriction
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2759 (if blink-matching-paren-distance
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2760 (narrow-to-region (max (point-min)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2761 (- (point) blink-matching-paren-distance))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2762 oldpos))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2763 (condition-case ()
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
2764 (let ((parse-sexp-ignore-comments
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
2765 (and parse-sexp-ignore-comments
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
2766 (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
2767 (setq blinkpos (scan-sexps oldpos -1)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2768 (error nil)))
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
2769 (and blinkpos
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
2770 (/= (char-syntax (char-after blinkpos))
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
2771 ?\$)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2772 (setq mismatch
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
2773 (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
2774 (/= (char-after (1- oldpos))
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
2775 (matching-paren (char-after blinkpos))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2776 (if mismatch (setq blinkpos nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2777 (if blinkpos
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2778 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2779 (goto-char blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2780 (if (pos-visible-in-window-p)
13810
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
2781 (and blink-matching-paren-on-screen
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
2782 (sit-for blink-matching-delay))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2783 (goto-char blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2784 (message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2785 "Matches %s"
6539
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2786 ;; Show what precedes the open in its line, if anything.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2787 (if (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2788 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2789 (not (bolp)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2790 (buffer-substring (progn (beginning-of-line) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2791 (1+ blinkpos))
6539
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2792 ;; 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
2793 (if (save-excursion
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2794 (forward-char 1)
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2795 (skip-chars-forward " \t")
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2796 (not (eolp)))
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2797 (buffer-substring blinkpos
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2798 (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
2799 ;; 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
2800 ;; if there is one.
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2801 (if (save-excursion
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2802 (skip-chars-backward "\n \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2803 (not (bobp)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2804 (concat
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2805 (buffer-substring (progn
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2806 (skip-chars-backward "\n \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2807 (beginning-of-line)
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2808 (point))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2809 (progn (end-of-line)
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2810 (skip-chars-backward " \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2811 (point)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2812 ;; 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
2813 "..."
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2814 (buffer-substring blinkpos (1+ blinkpos)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2815 ;; 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
2816 (buffer-substring blinkpos (1+ blinkpos))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2817 (cond (mismatch
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2818 (message "Mismatched parentheses"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2819 ((not blink-matching-paren-distance)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2820 (message "Unmatched parenthesis"))))))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2821
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2822 ;Turned off because it makes dbx bomb out.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2823 (setq blink-paren-function 'blink-matching-open)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2824
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
2825 ;; 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
2826 ;; 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
2827 ;; that happens in the QUIT macro at the C code level.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2828 (defun keyboard-quit ()
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2829 "Signal a quit condition.
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2830 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
2831 At top-level, as an editor command, this simply beeps."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2832 (interactive)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2833 (deactivate-mark)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2834 (signal 'quit nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2835
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2836 (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
2837
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2838 (defvar buffer-quit-function nil
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2839 "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
2840 \\[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
2841 \(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
2842
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2843 (defun keyboard-escape-quit ()
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2844 "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
2845 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
2846 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
2847 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
2848 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
2849 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
2850 (interactive)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2851 (cond ((eq last-command 'mode-exited) nil)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2852 ((> (minibuffer-depth) 0)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2853 (abort-recursive-edit))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2854 (current-prefix-arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2855 nil)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2856 ((and transient-mark-mode
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2857 mark-active)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2858 (deactivate-mark))
17355
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
2859 ((> (recursion-depth) 0)
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
2860 (exit-recursive-edit))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2861 (buffer-quit-function
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2862 (funcall buffer-quit-function))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2863 ((not (one-window-p t))
17355
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
2864 (delete-other-windows))
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
2865 ((string-match "^ \\*" (buffer-name (current-buffer)))
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
2866 (bury-buffer))))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2867
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2868 (define-key global-map "\e\e\e" 'keyboard-escape-quit)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2869
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2870 (defvar mail-user-agent 'sendmail-user-agent
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2871 "*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
2872 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
2873 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
2874 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
2875
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2876 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
2877
16624
cd1a0e1e6975 (sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents: 16508
diff changeset
2878 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
2879 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
2880 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
2881
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2882 Additional valid symbols may be available; check with the author of
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2883 your package for details.")
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2884
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2885 (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
2886 &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
2887 "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
2888
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2889 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
2890 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
2891 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
2892
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2893 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
2894 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
2895 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
2896 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
2897 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
2898
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2899 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
2900 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
2901
16624
cd1a0e1e6975 (sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents: 16508
diff changeset
2902 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
2903
cd1a0e1e6975 (sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents: 16508
diff changeset
2904 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
2905 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
2906 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
2907
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2908 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
2909 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
2910 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
2911 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
2912
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2913 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
2914 `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
2915 (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
2916 (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
2917 (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
2918 (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
2919
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2920 (defun assoc-ignore-case (key alist)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2921 "Like `assoc', but assumes KEY is a string and ignores case when comparing."
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2922 (let (element)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2923 (while (and alist (not element))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2924 (if (equal key (downcase (car (car alist))))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2925 (setq element (car alist)))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2926 (setq alist (cdr alist)))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2927 element))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2928
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2929 (define-mail-user-agent 'sendmail-user-agent
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2930 '(lambda (&optional to subject other-headers continue
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2931 switch-function yank-action send-actions)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2932 (if switch-function
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2933 (let ((special-display-buffer-names nil)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2934 (special-display-regexps nil)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2935 (same-window-buffer-names nil)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2936 (same-window-regexps nil))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2937 (funcall switch-function "*mail*")))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2938 (let ((cc (cdr (assoc-ignore-case "cc" other-headers)))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2939 (in-reply-to (cdr (assoc-ignore-case "in-reply-to" other-headers))))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2940 (or (mail continue to subject in-reply-to cc yank-action send-actions)
16723
55eedd7e16fb (sendmail-user-agent): Avoid error for CONTINUE non-nil.
Richard M. Stallman <rms@gnu.org>
parents: 16717
diff changeset
2941 continue
16955
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2942 (error "Message aborted"))
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2943 (save-excursion
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2944 (goto-char (point-min))
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2945 (search-forward mail-header-separator)
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2946 (beginning-of-line)
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2947 (while other-headers
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2948 (if (not (member (car (car other-headers)) '("in-reply-to" "cc")))
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2949 (insert (car (car other-headers)) ": "
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2950 (cdr (car other-headers)) "\n"))
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2951 (setq other-headers (cdr other-headers)))
228994bc4b43 (sendmail-user-agent): Insert all the OTHER-HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 16924
diff changeset
2952 t)))
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2953 '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
2954
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
2955 (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
2956 '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
2957 'mh-before-send-letter-hook)
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2958
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2959 (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
2960 switch-function yank-action send-actions)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2961 "Start composing a mail message to send.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2962 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
2963 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
2964 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
2965 and the initial Subject field, respectively.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2966
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2967 OTHER-HEADERS is an alist specifying additional
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2968 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
2969 HEADER and VALUE are strings.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2970
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2971 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
2972 being composed.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2973
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2974 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
2975 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
2976
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2977 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
2978 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
2979 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
2980 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
2981 \(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
2982 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
2983
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2984 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
2985 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
2986 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
2987 (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
2988 (let ((function (get mail-user-agent 'composefunc)))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2989 (funcall function to subject other-headers continue
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
2990 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
2991
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
2992 (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
2993 yank-action send-actions)
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
2994 "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
2995 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
2996 (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
2997 (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
2998 '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
2999
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3000
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3001 (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
3002 yank-action send-actions)
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3003 "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
3004 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3005 (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
3006 (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
3007 '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
3008
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3009 (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
3010 "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
3011
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3012 (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
3013 "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
3014 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
3015 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
3016 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
3017
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3018 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
3019 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
3020
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3021 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
3022 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
3023 (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
3024 (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
3025 (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
3026 (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
3027 (val (if prop
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3028 ;; 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
3029 ;; 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
3030 (call-interactively `(lambda (arg)
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3031 (interactive ,prop)
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3032 arg))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3033 (read
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3034 (read-string prompt nil
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3035 'set-variable-value-history)))))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3036 (list var val)))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3037
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3038 (let ((type (get var 'custom-type))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3039 widget)
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3040 (when type
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3041 ;; Match with custom type.
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3042 (require 'wid-edit)
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3043 (unless (listp type)
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3044 (setq widget (list type)))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3045 (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
3046 (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
3047 (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
3048 val (car type) var))))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3049 (set var val))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3050
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3051
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3052 (defun set-variable (var val)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3053 "Set VARIABLE to VALUE. VALUE is a Lisp object.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3054 When using this interactively, supply a Lisp expression for VALUE.
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3055 If you want VALUE to be a string, you must surround it with doublequotes.
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3056
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3057 If VARIABLE has a `variable-interactive' property, that is used as if
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3058 it were the arg to `interactive' (which see) to interactively read the value."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3059 (interactive
17254
831da82608c3 (set-variable): Use user-variable-p. Clean up.
Erik Naggum <erik@naggum.no>
parents: 17251
diff changeset
3060 (let* ((v (variable-at-point))
831da82608c3 (set-variable): Use user-variable-p. Clean up.
Erik Naggum <erik@naggum.no>
parents: 17251
diff changeset
3061 (enable-recursive-minibuffers t)
831da82608c3 (set-variable): Use user-variable-p. Clean up.
Erik Naggum <erik@naggum.no>
parents: 17251
diff changeset
3062 (val (completing-read
17276
fc3829279a06 (set-variable): Suggest only valid user variable.
Richard M. Stallman <rms@gnu.org>
parents: 17254
diff changeset
3063 (if (user-variable-p v)
17254
831da82608c3 (set-variable): Use user-variable-p. Clean up.
Erik Naggum <erik@naggum.no>
parents: 17251
diff changeset
3064 (format "Set variable (default %s): " v)
831da82608c3 (set-variable): Use user-variable-p. Clean up.
Erik Naggum <erik@naggum.no>
parents: 17251
diff changeset
3065 "Set variable: ")
831da82608c3 (set-variable): Use user-variable-p. Clean up.
Erik Naggum <erik@naggum.no>
parents: 17251
diff changeset
3066 obarray 'user-variable-p t))
831da82608c3 (set-variable): Use user-variable-p. Clean up.
Erik Naggum <erik@naggum.no>
parents: 17251
diff changeset
3067 (var (if (equal val "") v (intern val)))
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3068 )
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3069 (list var
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3070 (let ((prop (get var 'variable-interactive)))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3071 (if prop
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3072 ;; Use VAR's `variable-interactive' property
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3073 ;; as an interactive spec for prompting.
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3074 (call-interactively (list 'lambda '(arg)
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3075 (list 'interactive prop)
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3076 'arg))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
3077 (eval-minibuffer (format "Set %s to value: " var)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3078 (set var val))
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3079
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3080
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3081 ;; Define the major mode for lists of completions.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3082
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3083 (defvar completion-list-mode-map nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3084 "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
3085 (or completion-list-mode-map
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3086 (let ((map (make-sparse-keymap)))
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3087 (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
3088 (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
3089 (define-key map "\C-m" 'choose-completion)
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3090 (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
3091 (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
3092 (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
3093 (setq completion-list-mode-map map)))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3094
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3095 ;; 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
3096 (put 'completion-list-mode 'mode-class 'special)
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3097
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3098 (defvar completion-reference-buffer nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3099 "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
3100 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
3101 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
3102
16924
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3103 (defvar completion-no-auto-exit nil
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3104 "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
3105 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
3106 and `mouse-choose-completion'.")
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3107
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3108 (defvar completion-base-size nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3109 "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
3110 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
3111 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
3112 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
3113 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
3114
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3115 (defun delete-completion-window ()
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3116 "Delete the completion list window.
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3117 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
3118 (interactive)
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3119 (let ((buf completion-reference-buffer))
16851
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3120 (if (one-window-p t)
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3121 (if (window-dedicated-p (selected-window))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3122 (delete-frame (selected-frame)))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3123 (delete-window (selected-window))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3124 (if (get-buffer-window buf)
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3125 (select-window (get-buffer-window buf))))))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3126
10284
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3127 (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
3128 "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
3129 (interactive "p")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3130 (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
3131
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3132 (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
3133 "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
3134 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
3135 (interactive "p")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3136 (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
3137 (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
3138 (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
3139 ;; 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
3140 (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
3141 (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
3142 ;; 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
3143 (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
3144 (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
3145 (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
3146 (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
3147 (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
3148 ;; 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
3149 (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
3150 (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
3151 (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
3152 ;; 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
3153 (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
3154 ;; 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
3155 (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
3156 (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
3157
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3158 (defun choose-completion ()
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3159 "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
3160 (interactive)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3161 (let (beg end completion (buffer completion-reference-buffer)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3162 (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
3163 (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
3164 (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
3165 (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
3166 (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
3167 (if (null beg)
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3168 (error "No completion here"))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3169 (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
3170 (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
3171 (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
3172 (let ((owindow (selected-window)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3173 (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
3174 (window-dedicated-p (selected-window)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3175 ;; 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
3176 (iconify-frame (selected-frame))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3177 (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
3178 (bury-buffer)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3179 (select-window owindow))
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3180 (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
3181
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3182 ;; 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
3183 ;; that can be found before POINT.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3184 (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
3185 (let ((opoint (point))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3186 (len (min (length string)
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3187 (- (point) (point-min)))))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3188 (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
3189 (if completion-ignore-case
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
3190 (setq string (downcase string)))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3191 (while (and (> len 0)
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3192 (let ((tail (buffer-substring (point)
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3193 (+ (point) len))))
7574
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
3194 (if completion-ignore-case
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
3195 (setq tail (downcase tail)))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3196 (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
3197 (setq len (1- len))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3198 (forward-char 1))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3199 (delete-char len)))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3200
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3201 ;; 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
3202 ;; 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
3203 ;; 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
3204
e3f8bfd1bb1f (choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents: 15431
diff changeset
3205 ;; 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
3206 ;; 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
3207 ;; 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
3208 (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
3209 (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
3210 ;; 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
3211 ;; active minibuffer.
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
3212 (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
3213 (or (not (active-minibuffer-window))
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
3214 (not (equal buffer
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
3215 (window-buffer (active-minibuffer-window))))))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
3216 (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
3217 ;; 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
3218 (set-buffer buffer)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3219 (if base-size
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3220 (delete-region (+ base-size (point-min)) (point))
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3221 (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
3222 (insert choice)
7697
b52a92ea3796 (choose-completion-string): Clear mouse-face property.
Richard M. Stallman <rms@gnu.org>
parents: 7594
diff changeset
3223 (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
3224 '(mouse-face nil))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
3225 ;; 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
3226 (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
3227 (set-window-point window (point)))
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
3228 ;; 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
3229 (and (not completion-no-auto-exit)
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3230 (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
3231 minibuffer-completion-table
15484
e3f8bfd1bb1f (choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents: 15431
diff changeset
3232 ;; 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
3233 ;; 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
3234 (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
3235 (file-directory-p (buffer-string)))
e3f8bfd1bb1f (choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents: 15431
diff changeset
3236 (select-window (active-minibuffer-window))
e3f8bfd1bb1f (choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents: 15431
diff changeset
3237 (exit-minibuffer))))))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3238
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
3239 (defun completion-list-mode ()
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3240 "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
3241 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
3242 to select the completion near point.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3243 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
3244 with the mouse."
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3245 (interactive)
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3246 (kill-all-local-variables)
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
3247 (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
3248 (setq mode-name "Completion List")
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
3249 (setq major-mode 'completion-list-mode)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3250 (make-local-variable 'completion-base-size)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3251 (setq completion-base-size nil)
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
3252 (run-hooks 'completion-list-mode-hook))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3253
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3254 (defvar completion-fixup-function nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3255 "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
3256 `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
3257 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
3258 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
3259 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
3260
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3261 ;; 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
3262 ;; 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
3263
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3264 (defun completion-setup-function ()
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3265 (save-excursion
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3266 (let ((mainbuf (current-buffer)))
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3267 (set-buffer standard-output)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3268 (completion-list-mode)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3269 (make-local-variable 'completion-reference-buffer)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3270 (setq completion-reference-buffer mainbuf)
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3271 ;;; The value 0 is right in most cases, but not for file name completion.
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3272 ;;; so this has to be turned off.
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3273 ;;; (setq completion-base-size 0)
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3274 (goto-char (point-min))
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3275 (if window-system
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
3276 (insert (substitute-command-keys
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3277 "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
3278 (insert (substitute-command-keys
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3279 "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
3280 select the completion near point.\n\n"))
7ada27b4bf3c (completion-setup-function): Add mouse-face properties.
Karl Heuer <kwzh@gnu.org>
parents: 6549
diff changeset
3281 (forward-line 1)
8203
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3282 (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
3283 (let ((beg (match-beginning 0))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3284 (end (point)))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3285 (if completion-fixup-function
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3286 (funcall completion-fixup-function))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3287 (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
3288 (goto-char end))))))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3289
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3290 (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
3291
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3292 (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
3293 '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
3294 (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
3295 '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
3296 (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
3297 '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
3298 (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
3299 '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
3300
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3301 (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
3302 "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
3303 (interactive)
12483
ec77cb3940f1 (switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents: 12428
diff changeset
3304 ;; 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
3305 (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
3306 (minibuffer-completion-help))
10284
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3307 (select-window (get-buffer-window "*Completions*"))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3308 (goto-char (point-min))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3309 (search-forward "\n\n")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3310 (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
3311
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3312 ;; Support keyboard commands to turn on various modifiers.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3313
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3314 ;; 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
3315 ;; to the following event.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3316
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3317 (defun event-apply-alt-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3318 (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
3319 (defun event-apply-super-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3320 (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
3321 (defun event-apply-hyper-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3322 (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
3323 (defun event-apply-shift-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3324 (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
3325 (defun event-apply-control-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3326 (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
3327 (defun event-apply-meta-modifier (ignore-prompt)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3328 (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
3329
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3330 (defun event-apply-modifier (event symbol lshiftby prefix)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3331 "Apply a modifier flag to event EVENT.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3332 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
3333 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
3334 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
3335 (if (numberp event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3336 (cond ((eq symbol 'control)
11201
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
3337 (if (and (<= (downcase event) ?z)
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
3338 (>= (downcase event) ?a))
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3339 (- (downcase event) ?a -1)
11201
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
3340 (if (and (<= (downcase event) ?Z)
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
3341 (>= (downcase event) ?A))
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3342 (- (downcase event) ?A -1)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3343 (logior (lsh 1 lshiftby) event))))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3344 ((eq symbol 'shift)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3345 (if (and (<= (downcase event) ?z)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3346 (>= (downcase event) ?a))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3347 (upcase event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3348 (logior (lsh 1 lshiftby) event)))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3349 (t
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3350 (logior (lsh 1 lshiftby) event)))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3351 (if (memq symbol (event-modifiers event))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3352 event
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3353 (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
3354 (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
3355 (if (symbolp event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3356 event-type
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3357 (cons event-type (cdr event)))))))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
3358
11206
60b7ab7d4fec Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents: 11201
diff changeset
3359 (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
3360 (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
3361 (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
3362 (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
3363 (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
3364 (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
3365
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3366 ;;;; Keypad support.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3367
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3368 ;;; 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
3369 ;;; 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
3370 ;;; 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
3371 ;;; bindings.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3372
5342
f38861038093 (setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents: 5324
diff changeset
3373 ;; 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
3374 (mapcar
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3375 (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
3376 (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
3377 (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
3378 (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
3379 (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
3380 '((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
3381 (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
3382 (kp-space ?\ )
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3383 (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
3384 (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
3385 (kp-multiply ?*)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3386 (kp-add ?+)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3387 (kp-separator ?,)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3388 (kp-subtract ?-)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3389 (kp-decimal ?.)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3390 (kp-divide ?/)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3391 (kp-equal ?=)))
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
3392
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3393 ;;; simple.el ends here