annotate lisp/simple.el @ 53370:3f0eafd05a7b

Document the change in insert-for-yank.
author Eli Zaretskii <eliz@is.elta.co.il>
date Mon, 29 Dec 2003 11:46:03 +0000
parents bb31cf348e05
children f0c057d16a15
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
49032
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
3 ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 99,
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
4 ;; 2000, 2001, 2002, 2003
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5 ;; Free Software Foundation, Inc.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
45078
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 45064
diff changeset
7 ;; Maintainer: FSF
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 45064
diff changeset
8 ;; Keywords: internal
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 45064
diff changeset
9
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
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 free software; you can redistribute it and/or modify
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 ;; 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
14 ;; the Free Software Foundation; either version 2, or (at your option)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 ;; any later version.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20 ;; GNU General Public License for more details.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22 ;; 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
23 ;; 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
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13960
diff changeset
25 ;; Boston, MA 02111-1307, USA.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26
2315
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
27 ;;; Commentary:
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
28
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
29 ;; 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
30 ;; major mode or to file-handling.
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
31
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
32 ;;; Code:
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33
26466
b32572666174 (with-syntax-table): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26457
diff changeset
34 (eval-when-compile
30820
4b32734572d8 Autoload widget-convert when compiling.
Dave Love <fx@gnu.org>
parents: 30441
diff changeset
35 (autoload 'widget-convert "wid-edit")
45637
f749c4851f51 Don't require cl.
Richard M. Stallman <rms@gnu.org>
parents: 45615
diff changeset
36 (autoload 'shell-mode "shell"))
26466
b32572666174 (with-syntax-table): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26457
diff changeset
37
b32572666174 (with-syntax-table): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26457
diff changeset
38
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
39 (defgroup killing nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
40 "Killing and yanking commands"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
41 :group 'editing)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
42
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
43 (defgroup paren-matching nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
44 "Highlight (un)matching of parens and expressions."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
45 :group 'matching)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
46
44906
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
47 (define-key global-map [?\C-x right] 'next-buffer)
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
48 (define-key global-map [?\C-x left] 'prev-buffer)
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
49 (defun next-buffer ()
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
50 "Switch to the next buffer in cyclic order."
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
51 (interactive)
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
52 (let ((buffer (current-buffer)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
53 (switch-to-buffer (other-buffer buffer))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
54 (bury-buffer buffer)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
55
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
56 (defun prev-buffer ()
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
57 "Switch to the previous buffer in cyclic order."
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
58 (interactive)
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
59 (let ((list (nreverse (buffer-list)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
60 found)
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
61 (while (and (not found) list)
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
62 (let ((buffer (car list)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
63 (if (and (not (get-buffer-window buffer))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
64 (not (string-match "\\` " (buffer-name buffer))))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
65 (setq found buffer)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
66 (setq list (cdr list)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
67 (switch-to-buffer found)))
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
68
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
69 (defun fundamental-mode ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
70 "Major mode not specialized for anything in particular.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
71 Other major modes are defined by comparison with this one."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
72 (interactive)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
73 (kill-all-local-variables))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
74
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
75 ;; Making and deleting lines.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
76
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
77 (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
78 "Insert a newline, and move to left margin of the new line if it's blank.
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
79 If `use-hard-newlines' is non-nil, the newline is marked with the
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
80 text-property `hard'.
31978
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
81 With ARG, insert that many newlines.
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
82 Call `auto-fill-function' if the current column number is greater
50870
d36119648467 (newline): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 50685
diff changeset
83 than the value of `fill-column' and ARG is nil."
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
84 (interactive "*P")
13137
a83a1515fd9b (newline): Call barf-if-buffer-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 12975
diff changeset
85 (barf-if-buffer-read-only)
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
86 ;; 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
87 ;; 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
88 ;; 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
89 ;; the end of the previous line.
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
90 (let ((flag (and (not (bobp))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
91 (bolp)
17214
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
92 ;; 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
93 ;; 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
94 (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
95 (not before-change-functions)
16417
fb6785d0c256 (newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents: 16408
diff changeset
96 ;; Make sure there are no markers here.
fb6785d0c256 (newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents: 16408
diff changeset
97 (not (buffer-has-markers-at (1- (point))))
21459
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
98 (not (buffer-has-markers-at (point)))
17214
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
99 ;; 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
100 ;; 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
101 (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
102 (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
103 (or (eobp)
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
104 (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
105 ;; 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
106 (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
107 ;; 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
108 (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
109 ;; 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
110 (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
111 ;; 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
112 ;; properties as the char before it (if any).
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
113 (< (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
114 (- (point) 2))))
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
115 (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
116 (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
117 (beforepos (point)))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
118 (if flag (backward-char 1))
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
119 ;; 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
120 ;; 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
121 (let ((last-command-char ?\n)
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
122 ;; 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
123 ;; 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
124 ;; 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
125 (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
126 (unwind-protect
9e7727cdbb68 (newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents: 12355
diff changeset
127 (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
128 ;; 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
129 (if flag (forward-char 1))))
21459
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
130 ;; Even if we did *not* get an error, keep that forward-char;
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
131 ;; all further processing should apply to the newline that the user
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
132 ;; thinks he inserted.
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
133
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
134 ;; Mark the newline(s) `hard'.
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
135 (if use-hard-newlines
21459
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
136 (set-hard-newline-properties
16018
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
137 (- (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
138 ;; 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
139 ;; 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
140 (or flag
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
141 (save-excursion
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
142 (goto-char beforepos)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
143 (beginning-of-line)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
144 (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
145 (> (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
146 (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
147 ;; 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
148 ;; 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
149 ;; 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
150 (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
151 (move-to-left-margin nil t)))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
152 nil)
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
153
16018
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
154 (defun set-hard-newline-properties (from to)
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
155 (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
156 (put-text-property from to 'hard 't)
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
157 ;; 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
158 (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
159 (put-text-property from (point) 'rear-nonsticky
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
160 (cons 'hard sticky)))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
161
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
162 (defun open-line (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
163 "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
164 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
165 if the line would have been blank.
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
166 With arg N, insert N newlines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167 (interactive "*p")
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
168 (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
169 (do-left-margin (and (bolp) (> (current-left-margin) 0)))
35589
e334380bbb2c (next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents: 35346
diff changeset
170 (loc (point))
e334380bbb2c (next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents: 35346
diff changeset
171 ;; Don't expand an abbrev before point.
e334380bbb2c (next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents: 35346
diff changeset
172 (abbrev-mode nil))
11324
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
173 (newline arg)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
174 (goto-char loc)
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
175 (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
176 (cond ((bolp)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
177 (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
178 (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
179 (forward-line 1)
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
180 (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
181 (goto-char loc)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
182 (end-of-line)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
183
49032
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
184 (defun split-line (&optional arg)
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
185 "Split current line, moving portion beyond point vertically down.
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
186 If the current line starts with `fill-prefix', insert it on the new
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
187 line as well. With prefix arg, don't insert fill-prefix on new line.
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
188
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
189 When called from Lisp code, the arg may be a prefix string to copy."
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
190 (interactive "*P")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
191 (skip-chars-forward " \t")
49066
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
192 (let* ((col (current-column))
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
193 (pos (point))
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
194 ;; What prefix should we check for (nil means don't).
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
195 (prefix (cond ((stringp arg) arg)
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
196 (arg nil)
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
197 (t fill-prefix)))
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
198 ;; Does this line start with it?
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
199 (have-prfx (and prefix
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
200 (save-excursion
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
201 (beginning-of-line)
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
202 (looking-at (regexp-quote prefix))))))
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
203 (newline 1)
49066
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
204 (if have-prfx (insert-and-inherit prefix))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205 (indent-to col 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 (goto-char pos)))
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-indentation (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 "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
210 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
211 With argument, join this line to following line."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
214 (if arg (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215 (if (eq (preceding-char) ?\n)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 (delete-region (point) (1- (point)))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
218 ;; If the second line started with the fill prefix,
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
219 ;; delete the prefix.
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
220 (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
221 (<= (+ (point) (length fill-prefix)) (point-max))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
222 (string= fill-prefix
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
223 (buffer-substring (point)
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
224 (+ (point) (length fill-prefix)))))
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
225 (delete-region (point) (+ (point) (length fill-prefix))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 (fixup-whitespace))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227
24078
4de23887487f (join-line): New alias.
Dave Love <fx@gnu.org>
parents: 24028
diff changeset
228 (defalias 'join-line #'delete-indentation) ; easier to find
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
229
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230 (defun delete-blank-lines ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 "On blank line, delete all surrounding blank lines, leaving just one.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 On isolated blank line, delete that one.
7817
d729f75fff04 (delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7762
diff changeset
233 On nonblank line, delete any immediately following blank lines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 (let (thisblank singleblank)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 (setq thisblank (looking-at "[ \t]*$"))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
239 ;; Set singleblank if there is just one blank line here.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
240 (setq singleblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241 (and thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 (not (looking-at "[ \t]*\n[ \t]*$"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243 (or (bobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 (progn (forward-line -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
245 (not (looking-at "[ \t]*$")))))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
246 ;; 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
247 (if thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
248 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
249 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
250 (if singleblank (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
251 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
252 (if (re-search-backward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
253 (progn (forward-line 1) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
254 (point-min)))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
255 ;; Delete following blank lines, unless the current line is blank
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
256 ;; and there are no following blank lines.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
257 (if (not (and thisblank singleblank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
258 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
259 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
260 (forward-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
261 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
262 (if (re-search-forward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
263 (progn (beginning-of-line) (point))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
264 (point-max)))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
265 ;; 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
266 ;; Delete the line, leaving point at eob.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
267 (if (looking-at "^[ \t]*\n\\'")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
268 (delete-region (point) (point-max)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
269
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
270 (defun delete-trailing-whitespace ()
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
271 "Delete all the trailing whitespace across the current buffer.
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
272 All whitespace after the last non-whitespace character in a line is deleted.
36030
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
273 This respects narrowing, created by \\[narrow-to-region] and friends.
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
274 A formfeed is not considered whitespace by this function."
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
275 (interactive "*")
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
276 (save-match-data
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
277 (save-excursion
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
278 (goto-char (point-min))
34141
799f637fbc35 (delete-trailing-whitespace): Don't delete newlines too.
Miles Bader <miles@gnu.org>
parents: 34101
diff changeset
279 (while (re-search-forward "\\s-$" nil t)
799f637fbc35 (delete-trailing-whitespace): Don't delete newlines too.
Miles Bader <miles@gnu.org>
parents: 34101
diff changeset
280 (skip-syntax-backward "-" (save-excursion (forward-line 0) (point)))
35709
023e7de7806f (delete-trailing-whitespace): Don't delete formfeeds.
Gerd Moellmann <gerd@gnu.org>
parents: 35652
diff changeset
281 ;; Don't delete formfeeds, even if they are considered whitespace.
38498
08dafe901c44 (delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents: 38432
diff changeset
282 (save-match-data
08dafe901c44 (delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents: 38432
diff changeset
283 (if (looking-at ".*\f")
08dafe901c44 (delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents: 38432
diff changeset
284 (goto-char (match-end 0))))
34619
237139766bdc (delete-trailing-whitespace): Remove extraneous let.
Miles Bader <miles@gnu.org>
parents: 34570
diff changeset
285 (delete-region (point) (match-end 0))))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
286
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
287 (defun newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
288 "Insert a newline, then indent according to major mode.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
289 Indentation is done using the value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
290 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
291 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
292 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
293 (interactive "*")
34462
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
294 (delete-horizontal-space t)
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
295 (newline)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
296 (indent-according-to-mode))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
297
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
298 (defun reindent-then-newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
299 "Reindent current line, insert newline, then indent the new line.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
300 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
301 which means calling the current value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
302 In programming language modes, this is the same as TAB.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
303 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
304 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
305 (interactive "*")
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
306 (let ((pos (point)))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
307 ;; Be careful to insert the newline before indenting the line.
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
308 ;; Otherwise, the indentation might be wrong.
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
309 (newline)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
310 (save-excursion
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
311 (goto-char pos)
52944
ae9d36444079 (reindent-then-newline-and-indent): Delete space *after*
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52566
diff changeset
312 (indent-according-to-mode)
ae9d36444079 (reindent-then-newline-and-indent): Delete space *after*
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52566
diff changeset
313 (delete-horizontal-space t))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
314 (indent-according-to-mode)))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
315
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
316 (defun quoted-insert (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
317 "Read next input character and insert it.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
318 This is useful for inserting control characters.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
319
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
320 If the first character you type after this command is an octal digit,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
321 you should type a sequence of octal digits which specify a character code.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
322 Any nondigit terminates the sequence. If the terminator is a RET,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
323 it is discarded; any other terminator is used itself as input.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
324 The variable `read-quoted-char-radix' specifies the radix for this feature;
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
325 set it to 10 or 16 to use decimal or hex instead of octal.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
326
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
327 In overwrite mode, this function inserts the character anyway, and
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
328 does not handle octal digits specially. This means that if you use
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
329 overwrite as your normal editing mode, you can use this function to
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
330 insert characters when necessary.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
331
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
332 In binary overwrite mode, this function does overwrite, and octal
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
333 digits are interpreted as a character code. This is intended to be
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
334 useful for editing binary files."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
335 (interactive "*p")
48234
1ae575cd625c (quoted-insert): Bind translation-table-for-input, not
Dave Love <fx@gnu.org>
parents: 48180
diff changeset
336 (let* ((char (let (translation-table-for-input)
48180
9b71fc12ed85 (quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents: 48013
diff changeset
337 (if (or (not overwrite-mode)
9b71fc12ed85 (quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents: 48013
diff changeset
338 (eq overwrite-mode 'overwrite-mode-binary))
9b71fc12ed85 (quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents: 48013
diff changeset
339 (read-quoted-char)
9b71fc12ed85 (quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents: 48013
diff changeset
340 (read-char)))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
341 ;; Assume character codes 0240 - 0377 stand for characters in some
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
342 ;; single-byte character set, and convert them to Emacs
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
343 ;; characters.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
344 (if (and enable-multibyte-characters
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
345 (>= char ?\240)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
346 (<= char ?\377))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
347 (setq char (unibyte-char-to-multibyte char)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
348 (if (> arg 0)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
349 (if (eq overwrite-mode 'overwrite-mode-binary)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
350 (delete-char arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
351 (while (> arg 0)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
352 (insert-and-inherit char)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
353 (setq arg (1- arg)))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
354
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
355 (defun forward-to-indentation (&optional arg)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
356 "Move forward ARG lines and position at first nonblank character."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
357 (interactive "p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
358 (forward-line (or arg 1))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
359 (skip-chars-forward " \t"))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
360
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
361 (defun backward-to-indentation (&optional arg)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
362 "Move backward ARG lines and position at first nonblank character."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
363 (interactive "p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
364 (forward-line (- (or arg 1)))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
365 (skip-chars-forward " \t"))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
366
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
367 (defun back-to-indentation ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
368 "Move point to the first non-whitespace character on this line."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
369 (interactive)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
370 (beginning-of-line 1)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
371 (skip-syntax-forward " " (line-end-position))
50685
ee0efd6ecb89 (back-to-indentation): Call backward-prefix-chars.
Richard M. Stallman <rms@gnu.org>
parents: 50652
diff changeset
372 ;; Move back over chars that have whitespace syntax but have the p flag.
ee0efd6ecb89 (back-to-indentation): Call backward-prefix-chars.
Richard M. Stallman <rms@gnu.org>
parents: 50652
diff changeset
373 (backward-prefix-chars))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
374
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
375 (defun fixup-whitespace ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
376 "Fixup white space between objects around point.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
377 Leave one space or none, according to the context."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
378 (interactive "*")
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
379 (save-excursion
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
380 (delete-horizontal-space)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
381 (if (or (looking-at "^\\|\\s)")
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
382 (save-excursion (forward-char -1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
383 (looking-at "$\\|\\s(\\|\\s'")))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
384 nil
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
385 (insert ?\ ))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
386
34462
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
387 (defun delete-horizontal-space (&optional backward-only)
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
388 "Delete all spaces and tabs around point.
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
389 If BACKWARD-ONLY is non-nil, only delete spaces before point."
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
390 (interactive "*")
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
391 (let ((orig-pos (point)))
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
392 (delete-region
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
393 (if backward-only
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
394 orig-pos
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
395 (progn
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
396 (skip-chars-forward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
397 (constrain-to-field nil orig-pos t)))
34462
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
398 (progn
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
399 (skip-chars-backward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
400 (constrain-to-field nil orig-pos)))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
401
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
402 (defun just-one-space ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
403 "Delete all spaces and tabs around point, leaving one space."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
404 (interactive "*")
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
405 (let ((orig-pos (point)))
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
406 (skip-chars-backward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
407 (constrain-to-field nil orig-pos)
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
408 (if (= (following-char) ? )
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
409 (forward-char 1)
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
410 (insert ? ))
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
411 (delete-region
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
412 (point)
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
413 (progn
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
414 (skip-chars-forward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
415 (constrain-to-field nil orig-pos t)))))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
416
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
417 (defun beginning-of-buffer (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
418 "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
419 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
420
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
421 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
422 of the accessible part of the buffer.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
423
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
424 Don't use this command in Lisp programs!
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
425 \(goto-char (point-min)) is faster and avoids clobbering the mark."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
426 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
427 (push-mark)
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
428 (let ((size (- (point-max) (point-min))))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
429 (goto-char (if arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
430 (+ (point-min)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
431 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
432 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
433 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
434 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
435 (/ (+ 10 (* size (prefix-numeric-value arg))) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
436 (point-min))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
437 (if arg (forward-line 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
438
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
439 (defun end-of-buffer (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440 "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
441 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
442
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
443 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
444 of the accessible part of the buffer.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
445
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
446 Don't use this command in Lisp programs!
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
447 \(goto-char (point-max)) is faster and avoids clobbering the mark."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
448 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
449 (push-mark)
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
450 (let ((size (- (point-max) (point-min))))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
451 (goto-char (if arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
452 (- (point-max)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
453 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
454 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
455 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
456 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
457 (/ (* size (prefix-numeric-value arg)) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
458 (point-max))))
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
459 ;; 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
460 ;; adjust it to the beginning of a line.
26265
bcd25953e4cf (end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents: 26201
diff changeset
461 (cond (arg (forward-line 1))
39743
b6933b0f1ef2 (end-of-buffer): Fix code scrolling specially
Gerd Moellmann <gerd@gnu.org>
parents: 39612
diff changeset
462 ((> (point) (window-end nil t))
26265
bcd25953e4cf (end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents: 26201
diff changeset
463 ;; If the end of the buffer is not already on the screen,
bcd25953e4cf (end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents: 26201
diff changeset
464 ;; then scroll specially to put it near, but not at, the bottom.
bcd25953e4cf (end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents: 26201
diff changeset
465 (overlay-recenter (point))
bcd25953e4cf (end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents: 26201
diff changeset
466 (recenter -3))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
467
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
468 (defun mark-whole-buffer ()
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
469 "Put point at beginning and mark at end of buffer.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
470 You probably should not use this function in Lisp programs;
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
471 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
472 that uses or sets the mark."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
473 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
474 (push-mark (point))
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
475 (push-mark (point-max) nil t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
476 (goto-char (point-min)))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
477
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
478
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
479 ;; Counting lines, one way or another.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
480
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
481 (defun goto-line (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
482 "Goto line ARG, counting from line 1 at beginning of buffer."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
483 (interactive "NGoto line: ")
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
484 (setq arg (prefix-numeric-value arg))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
485 (save-restriction
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
486 (widen)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
487 (goto-char 1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
488 (if (eq selective-display t)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
489 (re-search-forward "[\n\C-m]" nil 'end (1- arg))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
490 (forward-line (1- arg)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
491
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
492 (defun count-lines-region (start end)
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3487
diff changeset
493 "Print number of lines and characters in the region."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
494 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
495 (message "Region has %d lines, %d characters"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
496 (count-lines start end) (- end start)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
497
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
498 (defun what-line ()
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
499 "Print the current buffer line number and narrowed line number of point."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
500 (interactive)
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
501 (let ((opoint (point)) start)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
502 (save-excursion
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
503 (save-restriction
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
504 (goto-char (point-min))
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
505 (widen)
40018
3f454d4a2b7c (what-line): Avoid problems with field properties.
Miles Bader <miles@gnu.org>
parents: 39942
diff changeset
506 (forward-line 0)
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
507 (setq start (point))
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
508 (goto-char opoint)
40018
3f454d4a2b7c (what-line): Avoid problems with field properties.
Miles Bader <miles@gnu.org>
parents: 39942
diff changeset
509 (forward-line 0)
47346
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
510 (if (/= start (point-min))
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
511 (message "line %d (narrowed line %d)"
47346
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
512 (1+ (count-lines (point-min) (point)))
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
513 (1+ (count-lines start (point))))
47346
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
514 (message "Line %d" (1+ (count-lines (point-min) (point)))))))))
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
515
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
516 (defun count-lines (start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
517 "Return number of lines between START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
518 This is usually the number of newlines between them,
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
519 but can be one more if START is not equal to END
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
520 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
521 (save-excursion
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
522 (save-restriction
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
523 (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
524 (goto-char (point-min))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
525 (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
526 (save-match-data
2421
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
527 (let ((done 0))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
528 (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
529 (setq done (+ 40 done)))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
530 (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
531 (setq done (+ 1 done)))
5151
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
532 (goto-char (point-max))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
533 (if (and (/= start end)
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
534 (not (bolp)))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
535 (1+ done)
9554
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
536 done)))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
537 (- (buffer-size) (forward-line (buffer-size)))))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
538
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
539 (defun what-cursor-position (&optional detail)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
540 "Print info on cursor position (on screen and within buffer).
23963
c242e2dc93a9 (what-cursor-position): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 23944
diff changeset
541 Also describe the character after point, and give its character code
24398
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
542 in octal, decimal and hex.
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
543
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
544 For a non-ASCII multibyte character, also give its encoding in the
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
545 buffer's selected coding system if the coding system encodes the
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
546 character safely. If the character is encoded into one byte, that
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
547 code is shown in hex. If the character is encoded into more than one
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
548 byte, just \"...\" is shown.
23963
c242e2dc93a9 (what-cursor-position): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 23944
diff changeset
549
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
550 In addition, with prefix argument, show details about that character
45870
8da973b0df20 (what-cursor-position): Use describe-char.
Richard M. Stallman <rms@gnu.org>
parents: 45730
diff changeset
551 in *Help* buffer. See also the command `describe-char'."
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
552 (interactive "P")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
553 (let* ((char (following-char))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
554 (beg (point-min))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
555 (end (point-max))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
556 (pos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
557 (total (buffer-size))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
558 (percent (if (> total 50000)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
559 ;; Avoid overflow from multiplying by 100!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
560 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
561 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
562 (hscroll (if (= (window-hscroll) 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
563 ""
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
564 (format " Hscroll=%d" (window-hscroll))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
565 (col (current-column)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
566 (if (= pos end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
567 (if (or (/= beg 1) (/= end (1+ total)))
27477
8a7e3bcab064 (what-cursor-position): Change formatting of
Gerd Moellmann <gerd@gnu.org>
parents: 27302
diff changeset
568 (message "point=%d of %d (%d%%) <%d - %d> column %d %s"
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
569 pos total percent beg end col hscroll)
27477
8a7e3bcab064 (what-cursor-position): Change formatting of
Gerd Moellmann <gerd@gnu.org>
parents: 27302
diff changeset
570 (message "point=%d of %d (%d%%) column %d %s"
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
571 pos total percent col hscroll))
24398
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
572 (let ((coding buffer-file-coding-system)
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
573 encoded encoding-msg)
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
574 (if (or (not coding)
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
575 (eq (coding-system-type coding) t))
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
576 (setq coding default-buffer-file-coding-system))
24508
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
577 (if (not (char-valid-p char))
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
578 (setq encoding-msg
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
579 (format "(0%o, %d, 0x%x, invalid)" char char char))
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
580 (setq encoded (and (>= char 128) (encode-coding-char char coding)))
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
581 (setq encoding-msg
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
582 (if encoded
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
583 (format "(0%o, %d, 0x%x, file %s)"
24508
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
584 char char char
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
585 (if (> (length encoded) 1)
24508
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
586 "..."
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
587 (encoded-string-description encoded coding)))
24508
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
588 (format "(0%o, %d, 0x%x)" char char char))))
23944
b5617ede97a8 (what-cursor-position): Print character encoding also.
Richard M. Stallman <rms@gnu.org>
parents: 23864
diff changeset
589 (if detail
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
590 ;; We show the detailed information about CHAR.
45870
8da973b0df20 (what-cursor-position): Use describe-char.
Richard M. Stallman <rms@gnu.org>
parents: 45730
diff changeset
591 (describe-char (point)))
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
592 (if (or (/= beg 1) (/= end (1+ total)))
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
593 (message "Char: %s %s point=%d of %d (%d%%) <%d - %d> column %d %s"
26884
8063bfbd8b08 (what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents: 26744
diff changeset
594 (if (< char 256)
8063bfbd8b08 (what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents: 26744
diff changeset
595 (single-key-description char)
8063bfbd8b08 (what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents: 26744
diff changeset
596 (buffer-substring-no-properties (point) (1+ (point))))
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
597 encoding-msg pos total percent beg end col hscroll)
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
598 (message "Char: %s %s point=%d of %d (%d%%) column %d %s"
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
599 (if (< char 256)
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
600 (single-key-description char)
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
601 (buffer-substring-no-properties (point) (1+ (point))))
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
602 encoding-msg pos total percent col hscroll))))))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
603
31978
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
604 (defvar read-expression-map
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
605 (let ((m (make-sparse-keymap)))
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
606 (define-key m "\M-\t" 'lisp-complete-symbol)
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
607 (set-keymap-parent m minibuffer-local-map)
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
608 m)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
609 "Minibuffer keymap used for reading Lisp expressions.")
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
610
4289
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
611 (defvar read-expression-history nil)
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
612
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
613 (defcustom eval-expression-print-level 4
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
614 "*Value to use for `print-level' when printing value in `eval-expression'.
42170
4cbdf5148953 (eval-expression-print-level, eval-expression-print-length): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 42128
diff changeset
615 A value of nil means no limit."
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
616 :group 'lisp
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
617 :type '(choice (const :tag "No Limit" nil) integer)
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
618 :version "21.1")
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
619
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
620 (defcustom eval-expression-print-length 12
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
621 "*Value to use for `print-length' when printing value in `eval-expression'.
42170
4cbdf5148953 (eval-expression-print-level, eval-expression-print-length): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 42128
diff changeset
622 A value of nil means no limit."
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
623 :group 'lisp
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
624 :type '(choice (const :tag "No Limit" nil) integer)
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
625 :version "21.1")
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
626
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
627 (defcustom eval-expression-debug-on-error t
27302
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
628 "*Non-nil means set `debug-on-error' when evaluating in `eval-expression'.
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
629 If nil, don't change the value of `debug-on-error'."
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
630 :group 'lisp
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
631 :type 'boolean
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
632 :version "21.1")
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
633
4289
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
634 ;; We define this, rather than making `eval' interactive,
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
635 ;; for the sake of completion of names like eval-region, eval-current-buffer.
19514
9f6b375ce842 (eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 19362
diff changeset
636 (defun eval-expression (eval-expression-arg
9f6b375ce842 (eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 19362
diff changeset
637 &optional eval-expression-insert-value)
36021
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
638 "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area.
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
639 Value is also consed on to front of the variable `values'.
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
640 Optional argument EVAL-EXPRESSION-INSERT-VALUE, if non-nil, means
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
641 insert the result into the current buffer instead of printing it in
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
642 the echo area."
4886
20e345c97e28 (eval-expression, edit-and-eval-command): Let
Brian Fox <bfox@gnu.org>
parents: 4869
diff changeset
643 (interactive
5068
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
644 (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
645 nil read-expression-map t
19514
9f6b375ce842 (eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 19362
diff changeset
646 'read-expression-history)
9f6b375ce842 (eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 19362
diff changeset
647 current-prefix-arg))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
648
27302
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
649 (if (null eval-expression-debug-on-error)
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
650 (setq values (cons (eval eval-expression-arg) values))
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
651 (let ((old-value (make-symbol "t")) new-value)
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
652 ;; Bind debug-on-error to something unique so that we can
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
653 ;; detect when evaled code changes it.
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
654 (let ((debug-on-error old-value))
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
655 (setq values (cons (eval eval-expression-arg) values))
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
656 (setq new-value debug-on-error))
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
657 ;; If evaled code has changed the value of debug-on-error,
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
658 ;; propagate that change to the global binding.
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
659 (unless (eq old-value new-value)
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
660 (setq debug-on-error new-value))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
661
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
662 (let ((print-length eval-expression-print-length)
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
663 (print-level eval-expression-print-level))
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
664 (if eval-expression-insert-value
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
665 (with-no-warnings
52566
38d8d37f129a (eval-expression): Bind standard-output in to-buffer case.
Richard M. Stallman <rms@gnu.org>
parents: 52464
diff changeset
666 (let ((standard-output (current-buffer)))
38d8d37f129a (eval-expression): Bind standard-output in to-buffer case.
Richard M. Stallman <rms@gnu.org>
parents: 52464
diff changeset
667 (eval-last-sexp-print-value (car values))))
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
668 (prin1 (car values) t))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
669
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
670 (defun edit-and-eval-command (prompt command)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
671 "Prompting with PROMPT, let user edit COMMAND and eval result.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
672 COMMAND is a Lisp expression. Let user edit that expression in
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
673 the minibuffer, then read and evaluate the result."
47599
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
674 (let ((command
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
675 (unwind-protect
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
676 (read-from-minibuffer prompt
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
677 (prin1-to-string command)
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
678 read-expression-map t
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
679 '(command-history . 1))
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
680 ;; If command was added to command-history as a string,
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
681 ;; get rid of that. We want only evaluable expressions there.
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
682 (if (stringp (car command-history))
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
683 (setq command-history (cdr command-history))))))
9629
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
684
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
685 ;; 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
686 ;; 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
687 (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
688 (setq command-history (cons command command-history)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
689 (eval command)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
690
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
691 (defun repeat-complex-command (arg)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
692 "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
693 A complex command is one which used the minibuffer.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
694 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
695 The result is executed, repeating the command as changed.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
696 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
697 it is added to the front of the command history.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
698 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
699 to get different commands to edit and resubmit."
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
700 (interactive "p")
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
701 (let ((elt (nth (1- arg) command-history))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
702 newcmd)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
703 (if elt
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
704 (progn
4821
2c16f99ef5dc (edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents: 4765
diff changeset
705 (setq newcmd
16803
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
706 (let ((print-level nil)
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
707 (minibuffer-history-position arg)
20022
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
708 (minibuffer-history-sexp-flag (1+ (minibuffer-depth))))
47599
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
709 (unwind-protect
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
710 (read-from-minibuffer
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
711 "Redo: " (prin1-to-string elt) read-expression-map t
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
712 (cons 'command-history arg))
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
713
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
714 ;; If command was added to command-history as a
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
715 ;; string, get rid of that. We want only
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
716 ;; evaluable expressions there.
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
717 (if (stringp (car command-history))
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
718 (setq command-history (cdr command-history))))))
5135
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
719
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
720 ;; 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
721 ;; add it to the history.
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
722 (or (equal newcmd (car command-history))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
723 (setq command-history (cons newcmd command-history)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
724 (eval newcmd))
48984
13c2502ecdc8 (repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents: 48628
diff changeset
725 (if command-history
13c2502ecdc8 (repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents: 48628
diff changeset
726 (error "Argument %d is beyond length of command history" arg)
13c2502ecdc8 (repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents: 48628
diff changeset
727 (error "There are no previous complex commands to repeat")))))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
728
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
729 (defvar minibuffer-history nil
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
730 "Default minibuffer history list.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
731 This is used for all minibuffer input
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
732 except when an alternate history list is specified.")
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
733 (defvar minibuffer-history-sexp-flag nil
41215
e4e7371d61e9 (minibuffer-history-sexp-flag): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 40966
diff changeset
734 "Non-nil when doing history operations on the variable `command-history'.
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
735 More generally, indicates that the history list being acted on
20022
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
736 contains expressions rather than strings.
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
737 It is only valid if its value equals the current minibuffer depth,
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
738 to handle recursive uses of the minibuffer.")
862
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
739 (setq minibuffer-history-variable 'minibuffer-history)
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
740 (setq minibuffer-history-position nil)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
741 (defvar minibuffer-history-search-history nil)
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
742
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
743 (defvar minibuffer-text-before-history nil
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
744 "Text that was in this minibuffer before any history commands.
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
745 This is nil if there have not yet been any history commands
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
746 in this use of the minibuffer.")
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
747
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
748 (add-hook 'minibuffer-setup-hook 'minibuffer-history-initialize)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
749
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
750 (defun minibuffer-history-initialize ()
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
751 (setq minibuffer-text-before-history nil))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
752
33683
8fc77111dd98 (minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents: 33352
diff changeset
753 (defun minibuffer-avoid-prompt (new old)
8fc77111dd98 (minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents: 33352
diff changeset
754 "A point-motion hook for the minibuffer, that moves point out of the prompt."
8fc77111dd98 (minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents: 33352
diff changeset
755 (constrain-to-field nil (point-max)))
8fc77111dd98 (minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents: 33352
diff changeset
756
22257
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
757 (defcustom minibuffer-history-case-insensitive-variables nil
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
758 "*Minibuffer history variables for which matching should ignore case.
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
759 If a history variable is a member of this list, then the
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
760 \\[previous-matching-history-element] and \\[next-matching-history-element]\
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
761 commands ignore case when searching it, regardless of `case-fold-search'."
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
762 :type '(repeat variable)
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
763 :group 'minibuffer)
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
764
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
765 (defun previous-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
766 "Find the previous history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
767 \(Previous history elements refer to earlier actions.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
768 With prefix argument N, search for Nth previous match.
20510
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
769 If N is negative, find the next or Nth next match.
35940
74a0bc65686f (previous-matching-history-element, next-matching-history-element): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35916
diff changeset
770 Normally, history elements are matched case-insensitively if
74a0bc65686f (previous-matching-history-element, next-matching-history-element): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35916
diff changeset
771 `case-fold-search' is non-nil, but an uppercase letter in REGEXP
74a0bc65686f (previous-matching-history-element, next-matching-history-element): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35916
diff changeset
772 makes the search case-sensitive.
22257
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
773 See also `minibuffer-history-case-insensitive-variables'."
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
774 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
775 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
776 (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
777 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
778 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
779 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
780 'minibuffer-history-search-history)))
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
781 ;; 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
782 (list (if (string= regexp "")
11961
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
783 (if minibuffer-history-search-history
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
784 (car minibuffer-history-search-history)
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
785 (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
786 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
787 (prefix-numeric-value current-prefix-arg))))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
788 (unless (zerop n)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
789 (if (and (zerop minibuffer-history-position)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
790 (null minibuffer-text-before-history))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
791 (setq minibuffer-text-before-history
39612
309d26eb8616 (previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents: 39597
diff changeset
792 (minibuffer-contents-no-properties)))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
793 (let ((history (symbol-value minibuffer-history-variable))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
794 (case-fold-search
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
795 (if (isearch-no-upper-case-p regexp t) ; assume isearch.el is dumped
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
796 ;; On some systems, ignore case for file names.
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
797 (if (memq minibuffer-history-variable
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
798 minibuffer-history-case-insensitive-variables)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
799 t
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
800 ;; Respect the user's setting for case-fold-search:
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
801 case-fold-search)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
802 nil))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
803 prevpos
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
804 match-string
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
805 match-offset
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
806 (pos minibuffer-history-position))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
807 (while (/= n 0)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
808 (setq prevpos pos)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
809 (setq pos (min (max 1 (+ pos (if (< n 0) -1 1))) (length history)))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
810 (when (= pos prevpos)
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
811 (error (if (= pos 1)
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
812 "No later matching history item"
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
813 "No earlier matching history item")))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
814 (setq match-string
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
815 (if (eq minibuffer-history-sexp-flag (minibuffer-depth))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
816 (let ((print-level nil))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
817 (prin1-to-string (nth (1- pos) history)))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
818 (nth (1- pos) history)))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
819 (setq match-offset
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
820 (if (< n 0)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
821 (and (string-match regexp match-string)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
822 (match-end 0))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
823 (and (string-match (concat ".*\\(" regexp "\\)") match-string)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
824 (match-beginning 1))))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
825 (when match-offset
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
826 (setq n (+ n (if (< n 0) 1 -1)))))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
827 (setq minibuffer-history-position pos)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
828 (goto-char (point-max))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
829 (delete-minibuffer-contents)
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
830 (insert match-string)
39612
309d26eb8616 (previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents: 39597
diff changeset
831 (goto-char (+ (minibuffer-prompt-end) match-offset))))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
832 (if (memq (car (car command-history)) '(previous-matching-history-element
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
833 next-matching-history-element))
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
834 (setq command-history (cdr command-history))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
835
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
836 (defun next-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
837 "Find the next history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
838 \(The next history element refers to a more recent action.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
839 With prefix argument N, search for Nth next match.
20510
d175ee25287e (previous-matching-history-element): Bind
Richard M. Stallman <rms@gnu.org>
parents: 20484
diff changeset
840 If N is negative, find the previous or Nth previous match.
35940
74a0bc65686f (previous-matching-history-element, next-matching-history-element): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35916
diff changeset
841 Normally, history elements are matched case-insensitively if
74a0bc65686f (previous-matching-history-element, next-matching-history-element): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35916
diff changeset
842 `case-fold-search' is non-nil, but an uppercase letter in REGEXP
74a0bc65686f (previous-matching-history-element, next-matching-history-element): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35916
diff changeset
843 makes the search case-sensitive."
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
844 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
845 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
846 (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
847 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
848 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
849 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
850 'minibuffer-history-search-history)))
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
851 ;; 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
852 (list (if (string= regexp "")
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
853 (setcar minibuffer-history-search-history
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
854 (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
855 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
856 (prefix-numeric-value current-prefix-arg))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
857 (previous-matching-history-element regexp (- n)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
858
32105
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
859 (defvar minibuffer-temporary-goal-position nil)
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
860
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
861 (defun next-history-element (n)
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
862 "Insert the next element of the minibuffer history into the minibuffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
863 (interactive "p")
10722
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
864 (or (zerop n)
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
865 (let ((narg (- minibuffer-history-position n))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
866 (minimum (if minibuffer-default -1 0))
24814
4c57b458fa9b (next-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 24798
diff changeset
867 elt minibuffer-returned-to-present)
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
868 (if (and (zerop minibuffer-history-position)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
869 (null minibuffer-text-before-history))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
870 (setq minibuffer-text-before-history
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
871 (minibuffer-contents-no-properties)))
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
872 (if (< narg minimum)
23472
d75fa19c5fc0 (next-history-element): Special error message if no default.
Richard M. Stallman <rms@gnu.org>
parents: 23471
diff changeset
873 (if minibuffer-default
d75fa19c5fc0 (next-history-element): Special error message if no default.
Richard M. Stallman <rms@gnu.org>
parents: 23471
diff changeset
874 (error "End of history; no next item")
d75fa19c5fc0 (next-history-element): Special error message if no default.
Richard M. Stallman <rms@gnu.org>
parents: 23471
diff changeset
875 (error "End of history; no default available")))
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
876 (if (> narg (length (symbol-value minibuffer-history-variable)))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
877 (error "Beginning of history; no preceding item"))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
878 (unless (memq last-command '(next-history-element
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
879 previous-history-element))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
880 (let ((prompt-end (minibuffer-prompt-end)))
32105
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
881 (set (make-local-variable 'minibuffer-temporary-goal-position)
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
882 (cond ((<= (point) prompt-end) prompt-end)
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
883 ((eobp) nil)
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
884 (t (point))))))
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
885 (goto-char (point-max))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
886 (delete-minibuffer-contents)
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
887 (setq minibuffer-history-position narg)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
888 (cond ((= narg -1)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
889 (setq elt minibuffer-default))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
890 ((= narg 0)
19888
45a077538366 (next-history-element):
Richard M. Stallman <rms@gnu.org>
parents: 19514
diff changeset
891 (setq elt (or minibuffer-text-before-history ""))
24814
4c57b458fa9b (next-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 24798
diff changeset
892 (setq minibuffer-returned-to-present t)
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
893 (setq minibuffer-text-before-history nil))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
894 (t (setq elt (nth (1- minibuffer-history-position)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
895 (symbol-value minibuffer-history-variable)))))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
896 (insert
24814
4c57b458fa9b (next-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 24798
diff changeset
897 (if (and (eq minibuffer-history-sexp-flag (minibuffer-depth))
4c57b458fa9b (next-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 24798
diff changeset
898 (not minibuffer-returned-to-present))
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
899 (let ((print-level nil))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
900 (prin1-to-string elt))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
901 elt))
32105
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
902 (goto-char (or minibuffer-temporary-goal-position (point-max))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
903
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
904 (defun previous-history-element (n)
1145
e6cefcaba564 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 1135
diff changeset
905 "Inserts the previous element of the minibuffer history into the minibuffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
906 (interactive "p")
859
5f325fbc093d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 858
diff changeset
907 (next-history-element (- n)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
908
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
909 (defun next-complete-history-element (n)
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
910 "Get next history element which completes the minibuffer before the point.
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
911 The contents of the minibuffer after the point are deleted, and replaced
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
912 by the new completion."
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
913 (interactive "p")
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
914 (let ((point-at-start (point)))
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
915 (next-matching-history-element
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
916 (concat
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
917 "^" (regexp-quote (buffer-substring (minibuffer-prompt-end) (point))))
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
918 n)
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
919 ;; 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
920 ;; 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
921 ;; 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
922 (goto-char point-at-start)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
923
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
924 (defun previous-complete-history-element (n)
5324
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
925 "\
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
926 Get previous history element which completes the minibuffer before the point.
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
927 The contents of the minibuffer after the point are deleted, and replaced
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
928 by the new completion."
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
929 (interactive "p")
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
930 (next-complete-history-element (- n)))
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
931
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
932 ;; For compatibility with the old subr of the same name.
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
933 (defun minibuffer-prompt-width ()
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
934 "Return the display width of the minibuffer prompt.
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
935 Return 0 if current buffer is not a mini-buffer."
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
936 ;; Return the width of everything before the field at the end of
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
937 ;; the buffer; this should be 0 for normal buffers.
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
938 (1- (minibuffer-prompt-end)))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
939
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
940 ;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
941 (defalias 'advertised-undo 'undo)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
942
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
943 (defconst undo-equiv-table (make-hash-table :test 'eq :weakness t)
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
944 "Table mapping redo records to the corresponding undo one.")
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
945
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
946 (defvar undo-in-region nil
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
947 "Non-nil if `pending-undo-list' is not just a tail of `buffer-undo-list'.")
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
948
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
949 (defvar undo-no-redo nil
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
950 "If t, `undo' doesn't go through redo entries.")
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
951
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
952 (defun undo (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
953 "Undo some previous changes.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
954 Repeat this command to undo more changes.
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
955 A numeric argument serves as a repeat count.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
956
32899
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
957 In Transient Mark mode when the mark is active, only undo changes within
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
958 the current region. Similarly, when not in Transient Mark mode, just \\[universal-argument]
32899
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
959 as an argument limits undo to changes within the current region."
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
960 (interactive "*P")
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
961 ;; Make last-command indicate for the next command that this was an undo.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
962 ;; That way, another undo will undo more.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
963 ;; If we get to the end of the undo history and get an error,
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
964 ;; another undo command will find the undo history empty
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
965 ;; and will get another error. To begin undoing the undos,
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
966 ;; you must type some other command.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
967 (setq this-command 'undo)
3408
8ffb00332c5f (undo): Pass proper arg to delete-auto-save-file-if-necessary.
Richard M. Stallman <rms@gnu.org>
parents: 3034
diff changeset
968 (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
969 (recent-save (recent-auto-save-p)))
32899
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
970 (unless (eq last-command 'undo)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
971 (setq undo-in-region
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
972 (if transient-mark-mode mark-active (and arg (not (numberp arg)))))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
973 (if undo-in-region
32899
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
974 (undo-start (region-beginning) (region-end))
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
975 (undo-start))
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
976 ;; get rid of initial undo boundary
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
977 (undo-more 1))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
978 ;; Check to see whether we're hitting a redo record, and if
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
979 ;; so, ask the user whether she wants to skip the redo/undo pair.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
980 (let ((equiv (gethash pending-undo-list undo-equiv-table)))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
981 (or (eq (selected-window) (minibuffer-window))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
982 (message (if undo-in-region
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
983 (if equiv "Redo in region!" "Undo in region!")
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
984 (if equiv "Redo!" "Undo!"))))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
985 (when (and equiv undo-no-redo)
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
986 ;; The equiv entry might point to another redo record if we have done
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
987 ;; undo-redo-undo-redo-... so skip to the very last equiv.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
988 (while (let ((next (gethash equiv undo-equiv-table)))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
989 (if next (setq equiv next))))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
990 (setq pending-undo-list equiv)))
32899
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
991 (undo-more
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
992 (if (or transient-mark-mode (numberp arg))
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
993 (prefix-numeric-value arg)
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
994 1))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
995 ;; Record the fact that the just-generated undo records come from an
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
996 ;; undo operation, so we can skip them later on.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
997 ;; I don't know how to do that in the undo-in-region case.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
998 (unless undo-in-region
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
999 (puthash buffer-undo-list pending-undo-list undo-equiv-table))
6386
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
1000 ;; 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
1001 ;; 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
1002 (let ((tail buffer-undo-list)
39157
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1003 (prev nil))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1004 (while (car tail)
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1005 (when (integerp (car tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1006 (let ((pos (car tail)))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1007 (if prev
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1008 (setcdr prev (cdr tail))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1009 (setq buffer-undo-list (cdr tail)))
39157
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1010 (setq tail (cdr tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1011 (while (car tail)
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1012 (if (eq pos (car tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1013 (if prev
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1014 (setcdr prev (cdr tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1015 (setq buffer-undo-list (cdr tail)))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1016 (setq prev tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1017 (setq tail (cdr tail)))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1018 (setq tail nil)))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1019 (setq prev tail tail (cdr tail))))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1020
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1021 (and modified (not (buffer-modified-p))
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1022 (delete-auto-save-file-if-necessary recent-save))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1023
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1024 (defun undo-only (&optional arg)
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1025 "Undo some previous changes.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1026 Repeat this command to undo more changes.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1027 A numeric argument serves as a repeat count.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1028 Contrary to `undo', this will not redo a previous undo."
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1029 (interactive "*p")
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1030 (let ((undo-no-redo t)) (undo arg)))
51118
f80e017c6464 (ctl-x-map): Remove the C-x U binding added recently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51101
diff changeset
1031 ;; Richard said that we should not use C-x <uppercase letter> and I have
f80e017c6464 (ctl-x-map): Remove the C-x U binding added recently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51101
diff changeset
1032 ;; no idea whereas to bind it. Any suggestion welcome. -stef
f80e017c6464 (ctl-x-map): Remove the C-x U binding added recently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51101
diff changeset
1033 ;; (define-key ctl-x-map "U" 'undo-only)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1034
2947
518509536741 (pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents: 2935
diff changeset
1035 (defvar pending-undo-list nil
518509536741 (pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents: 2935
diff changeset
1036 "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
1037
22725
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1038 (defvar undo-in-progress nil
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1039 "Non-nil while performing an undo.
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1040 Some change-hooks test this variable to do something different.")
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1041
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1042 (defun undo-more (count)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1043 "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
1044 Call `undo-start' to get ready to undo recent changes,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1045 then call `undo-more' one or more times to undo them."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1046 (or pending-undo-list
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
1047 (error (format "No further undo information%s"
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
1048 (if (and transient-mark-mode mark-active)
46647
cdd51b0b1929 (undo, undo-more): Adjust messages when undoing in a region.
Richard M. Stallman <rms@gnu.org>
parents: 46516
diff changeset
1049 " for region" ""))))
22725
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1050 (let ((undo-in-progress t))
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1051 (setq pending-undo-list (primitive-undo count pending-undo-list))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1052
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1053 ;; Deep copy of a list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1054 (defun undo-copy-list (list)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1055 "Make a copy of undo list LIST."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1056 (mapcar 'undo-copy-list-1 list))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1057
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1058 (defun undo-copy-list-1 (elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1059 (if (consp elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1060 (cons (car elt) (undo-copy-list-1 (cdr elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1061 elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1062
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1063 (defun undo-start (&optional beg end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1064 "Set `pending-undo-list' to the front of the undo list.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1065 The next call to `undo-more' will undo the most recently made change.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1066 If BEG and END are specified, then only undo elements
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1067 that apply to text between BEG and END are used; other undo elements
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1068 are ignored. If BEG and END are nil, all undo elements are used."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1069 (if (eq buffer-undo-list t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1070 (error "No undo information in this buffer"))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1071 (setq pending-undo-list
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1072 (if (and beg end (not (= beg end)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1073 (undo-make-selective-list (min beg end) (max beg end))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1074 buffer-undo-list)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1075
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1076 (defvar undo-adjusted-markers)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1077
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1078 (defun undo-make-selective-list (start end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1079 "Return a list of undo elements for the region START to END.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1080 The elements come from `buffer-undo-list', but we keep only
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1081 the elements inside this region, and discard those outside this region.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1082 If we find an element that crosses an edge of this region,
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1083 we stop and ignore all further elements."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1084 (let ((undo-list-copy (undo-copy-list buffer-undo-list))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1085 (undo-list (list nil))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1086 undo-adjusted-markers
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1087 some-rejected
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1088 undo-elt undo-elt temp-undo-list delta)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1089 (while undo-list-copy
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1090 (setq undo-elt (car undo-list-copy))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1091 (let ((keep-this
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1092 (cond ((and (consp undo-elt) (eq (car undo-elt) t))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1093 ;; This is a "was unmodified" element.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1094 ;; Keep it if we have kept everything thus far.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1095 (not some-rejected))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1096 (t
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1097 (undo-elt-in-region undo-elt start end)))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1098 (if keep-this
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1099 (progn
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1100 (setq end (+ end (cdr (undo-delta undo-elt))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1101 ;; Don't put two nils together in the list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1102 (if (not (and (eq (car undo-list) nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1103 (eq undo-elt nil)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1104 (setq undo-list (cons undo-elt undo-list))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1105 (if (undo-elt-crosses-region undo-elt start end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1106 (setq undo-list-copy nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1107 (setq some-rejected t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1108 (setq temp-undo-list (cdr undo-list-copy))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1109 (setq delta (undo-delta undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1110
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1111 (when (/= (cdr delta) 0)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1112 (let ((position (car delta))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1113 (offset (cdr delta)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1114
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1115 ;; Loop down the earlier events adjusting their buffer
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1116 ;; positions to reflect the fact that a change to the buffer
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1117 ;; isn't being undone. We only need to process those element
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1118 ;; types which undo-elt-in-region will return as being in
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1119 ;; the region since only those types can ever get into the
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1120 ;; output
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1121
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1122 (while temp-undo-list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1123 (setq undo-elt (car temp-undo-list))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1124 (cond ((integerp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1125 (if (>= undo-elt position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1126 (setcar temp-undo-list (- undo-elt offset))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1127 ((atom undo-elt) nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1128 ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1129 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1130 (let ((text-pos (abs (cdr undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1131 (point-at-end (< (cdr undo-elt) 0 )))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1132 (if (>= text-pos position)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1133 (setcdr undo-elt (* (if point-at-end -1 1)
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1134 (- text-pos offset))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1135 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1136 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1137 (when (>= (car undo-elt) position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1138 (setcar undo-elt (- (car undo-elt) offset))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1139 (setcdr undo-elt (- (cdr undo-elt) offset))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1140 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1141 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1142 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1143 (when (>= (car tail) position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1144 (setcar tail (- (car tail) offset))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1145 (setcdr tail (- (cdr tail) offset))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1146 (setq temp-undo-list (cdr temp-undo-list))))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1147 (setq undo-list-copy (cdr undo-list-copy)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1148 (nreverse undo-list)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1149
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1150 (defun undo-elt-in-region (undo-elt start end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1151 "Determine whether UNDO-ELT falls inside the region START ... END.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1152 If it crosses the edge, we return nil."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1153 (cond ((integerp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1154 (and (>= undo-elt start)
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
1155 (<= undo-elt end)))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1156 ((eq undo-elt nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1157 t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1158 ((atom undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1159 nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1160 ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1161 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1162 (and (>= (abs (cdr undo-elt)) start)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1163 (< (abs (cdr undo-elt)) end)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1164 ((and (consp undo-elt) (markerp (car undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1165 ;; This is a marker-adjustment element (MARKER . ADJUSTMENT).
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1166 ;; See if MARKER is inside the region.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1167 (let ((alist-elt (assq (car undo-elt) undo-adjusted-markers)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1168 (unless alist-elt
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1169 (setq alist-elt (cons (car undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1170 (marker-position (car undo-elt))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1171 (setq undo-adjusted-markers
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1172 (cons alist-elt undo-adjusted-markers)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1173 (and (cdr alist-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1174 (>= (cdr alist-elt) start)
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
1175 (<= (cdr alist-elt) end))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1176 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1177 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1178 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1179 (and (>= (car tail) start)
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
1180 (<= (cdr tail) end))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1181 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1182 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1183 (and (>= (car undo-elt) start)
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
1184 (<= (cdr undo-elt) end)))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1185
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1186 (defun undo-elt-crosses-region (undo-elt start end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1187 "Test whether UNDO-ELT crosses one edge of that region START ... END.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1188 This assumes we have already decided that UNDO-ELT
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1189 is not *inside* the region START...END."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1190 (cond ((atom undo-elt) nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1191 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1192 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1193 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1194 (not (or (< (car tail) end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1195 (> (cdr tail) start)))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1196 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1197 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1198 (not (or (< (car undo-elt) end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1199 (> (cdr undo-elt) start))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1200
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1201 ;; Return the first affected buffer position and the delta for an undo element
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1202 ;; delta is defined as the change in subsequent buffer positions if we *did*
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1203 ;; the undo.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1204 (defun undo-delta (undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1205 (if (consp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1206 (cond ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1207 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1208 (cons (abs (cdr undo-elt)) (length (car undo-elt))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1209 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1210 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1211 (cons (car undo-elt) (- (car undo-elt) (cdr undo-elt))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1212 (t
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1213 '(0 . 0)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1214 '(0 . 0)))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1215
4374
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
1216 (defvar shell-command-history nil
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
1217 "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
1218
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
1219 (defvar shell-command-switch "-c"
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
1220 "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
1221
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1222 (defvar shell-command-default-error-buffer nil
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1223 "*Buffer name for `shell-command' and `shell-command-on-region' error output.
46092
4eddd0d42a2f (shell-command-default-error-buffer): Doc fix.
Andreas Schwab <schwab@suse.de>
parents: 46090
diff changeset
1224 This buffer is used when `shell-command' or `shell-command-on-region'
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1225 is run interactively. A value of nil means that output to stderr and
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1226 stdout will be intermixed in the output stream.")
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1227
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1228 (defun shell-command (command &optional output-buffer error-buffer)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1229 "Execute string COMMAND in inferior shell; display output, if any.
33876
eba673dcc179 (shell-command): Mention the effect of the prefix
Eli Zaretskii <eliz@gnu.org>
parents: 33786
diff changeset
1230 With prefix argument, insert the COMMAND's output at point.
11072
c5fbb6f272f2 (shell-command): Use *Async Shell Command* for
Richard M. Stallman <rms@gnu.org>
parents: 11036
diff changeset
1231
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1232 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
1233 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
1234 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
1235
33312
1e1d6d077288 (shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents: 32899
diff changeset
1236 Otherwise, COMMAND is executed synchronously. The output appears in
1e1d6d077288 (shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents: 32899
diff changeset
1237 the buffer `*Shell Command Output*'. If the output is short enough to
1e1d6d077288 (shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents: 32899
diff changeset
1238 display in the echo area (which is determined by the variables
1e1d6d077288 (shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents: 32899
diff changeset
1239 `resize-mini-windows' and `max-mini-window-height'), it is shown
1e1d6d077288 (shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents: 32899
diff changeset
1240 there, but it is nonetheless available in buffer `*Shell Command
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1241 Output*' even though that buffer is not automatically displayed.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1242
19109
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1243 To specify a coding system for converting non-ASCII characters
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1244 in the shell command output, use \\[universal-coding-system-argument]
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1245 before this command.
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1246
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1247 Noninteractive callers can specify coding systems by binding
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1248 `coding-system-for-read' and `coding-system-for-write'.
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1249
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1250 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
1251 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
1252 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
1253 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
1254 insert output in current buffer. (This cannot be done asynchronously.)
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1255 In either case, the output is inserted after point (leaving mark after it).
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1256
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1257 If the command terminates without error, but generates output,
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1258 and you did not specify \"insert it in the current buffer\",
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1259 the output can be displayed in the echo area or in its buffer.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1260 If the output is short enough to display in the echo area
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1261 \(determined by the variable `max-mini-window-height' if
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1262 `resize-mini-windows' is non-nil), it is shown there. Otherwise,
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1263 the buffer containing the output is displayed.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1264
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1265 If there is output and an error, and you did not specify \"insert it
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1266 in the current buffer\", a message about the error goes at the end
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1267 of the output.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1268
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1269 If there is no output, or if output is inserted in the current buffer,
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1270 then `*Shell Command Output*' is deleted.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1271
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1272 If the optional third argument ERROR-BUFFER is non-nil, it is a buffer
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1273 or buffer name to which to direct the command's standard error output.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1274 If it is nil, error output is mingled with regular output.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1275 In an interactive call, the variable `shell-command-default-error-buffer'
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1276 specifies the value of ERROR-BUFFER."
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1277
4488
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
1278 (interactive (list (read-from-minibuffer "Shell command: "
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
1279 nil nil nil 'shell-command-history)
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1280 current-prefix-arg
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1281 shell-command-default-error-buffer))
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1282 ;; 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
1283 (let ((handler
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1284 (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
1285 'shell-command)))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1286 (if handler
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1287 (funcall handler 'shell-command command output-buffer error-buffer)
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1288 (if (and output-buffer
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1289 (not (or (bufferp output-buffer) (stringp output-buffer))))
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1290 ;; Output goes in current buffer.
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1291 (let ((error-file
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1292 (if error-buffer
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
1293 (make-temp-file
25483
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1294 (expand-file-name "scor"
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1295 (or small-temporary-file-directory
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1296 temporary-file-directory)))
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1297 nil)))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1298 (barf-if-buffer-read-only)
24825
f88179cfae99 (shell-command): Avoid printing "mark set" message.
Karl Heuer <kwzh@gnu.org>
parents: 24814
diff changeset
1299 (push-mark nil t)
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1300 ;; We do not use -f for csh; we will not support broken use of
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1301 ;; .cshrcs. Even the BSD csh manual says to use
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1302 ;; "if ($?prompt) exit" before things which are not useful
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1303 ;; non-interactively. Besides, if someone wants their other
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1304 ;; aliases for shell commands then they can still have them.
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1305 (call-process shell-file-name nil
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1306 (if error-file
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1307 (list t error-file)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1308 t)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1309 nil shell-command-switch command)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1310 (when (and error-file (file-exists-p error-file))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1311 (if (< 0 (nth 7 (file-attributes error-file)))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1312 (with-current-buffer (get-buffer-create error-buffer)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1313 (let ((pos-from-end (- (point-max) (point))))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1314 (or (bobp)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1315 (insert "\f\n"))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1316 ;; Do no formatting while reading error file,
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1317 ;; because that can run a shell command, and we
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1318 ;; don't want that to cause an infinite recursion.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1319 (format-insert-file error-file nil)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1320 ;; Put point after the inserted errors.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1321 (goto-char (- (point-max) pos-from-end)))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1322 (display-buffer (current-buffer))))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1323 (delete-file error-file))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1324 ;; This is like exchange-point-and-mark, but doesn't
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1325 ;; activate the mark. It is cleaner to avoid activation,
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1326 ;; even though the command loop would deactivate the mark
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1327 ;; because we inserted text.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1328 (goto-char (prog1 (mark t)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1329 (set-marker (mark-marker) (point)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1330 (current-buffer)))))
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1331 ;; Output goes in a separate buffer.
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1332 ;; 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
1333 (save-match-data
46026
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1334 (if (string-match "[ \t]*&[ \t]*\\'" command)
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1335 ;; Command ending with ampersand means asynchronous.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1336 (let ((buffer (get-buffer-create
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1337 (or output-buffer "*Async Shell Command*")))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1338 (directory default-directory)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1339 proc)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1340 ;; Remove the ampersand.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1341 (setq command (substring command 0 (match-beginning 0)))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1342 ;; If will kill a process, query first.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1343 (setq proc (get-buffer-process buffer))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1344 (if proc
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1345 (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
1346 (kill-process proc)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1347 (error "Shell command in progress")))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1348 (with-current-buffer buffer
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1349 (setq buffer-read-only nil)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1350 (erase-buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1351 (display-buffer buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1352 (setq default-directory directory)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1353 (setq proc (start-process "Shell" buffer shell-file-name
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1354 shell-command-switch command))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1355 (setq mode-line-process '(":%s"))
51026
8113316012c6 (shell-command): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50987
diff changeset
1356 (require 'shell) (shell-mode)
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1357 (set-process-sentinel proc 'shell-command-sentinel)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1358 ))
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1359 (shell-command-on-region (point) (point) command
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1360 output-buffer nil error-buffer)))))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
1361
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1362 (defun display-message-or-buffer (message
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1363 &optional buffer-name not-this-window frame)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1364 "Display MESSAGE in the echo area if possible, otherwise in a pop-up buffer.
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1365 MESSAGE may be either a string or a buffer.
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1366
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1367 A buffer is displayed using `display-buffer' if MESSAGE is too long for
33312
1e1d6d077288 (shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents: 32899
diff changeset
1368 the maximum height of the echo area, as defined by `max-mini-window-height'
1e1d6d077288 (shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents: 32899
diff changeset
1369 if `resize-mini-windows' is non-nil.
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1370
32260
b3df18daadfb Doc fix.
Miles Bader <miles@gnu.org>
parents: 32222
diff changeset
1371 Returns either the string shown in the echo area, or when a pop-up
b3df18daadfb Doc fix.
Miles Bader <miles@gnu.org>
parents: 32222
diff changeset
1372 buffer is used, the window used to display it.
b3df18daadfb Doc fix.
Miles Bader <miles@gnu.org>
parents: 32222
diff changeset
1373
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1374 If MESSAGE is a string, then the optional argument BUFFER-NAME is the
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1375 name of the buffer used to display it in the case where a pop-up buffer
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1376 is used, defaulting to `*Message*'. In the case where MESSAGE is a
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1377 string and it is displayed in the echo area, it is not specified whether
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1378 the contents are inserted into the buffer anyway.
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1379
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1380 Optional arguments NOT-THIS-WINDOW and FRAME are as for `display-buffer',
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1381 and only used if a buffer is displayed."
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1382 (cond ((and (stringp message) (not (string-match "\n" message)))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1383 ;; Trivial case where we can use the echo area
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1384 (message "%s" message))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1385 ((and (stringp message)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1386 (= (string-match "\n" message) (1- (length message))))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1387 ;; Trivial case where we can just remove single trailing newline
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1388 (message "%s" (substring message 0 (1- (length message)))))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1389 (t
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1390 ;; General case
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1391 (with-current-buffer
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1392 (if (bufferp message)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1393 message
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1394 (get-buffer-create (or buffer-name "*Message*")))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1395
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1396 (unless (bufferp message)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1397 (erase-buffer)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1398 (insert message))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1399
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1400 (let ((lines
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1401 (if (= (buffer-size) 0)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1402 0
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1403 (count-lines (point-min) (point-max)))))
48013
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
1404 (cond ((= lines 0))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
1405 ((and (or (<= lines 1)
46026
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1406 (<= lines
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1407 (if resize-mini-windows
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1408 (cond ((floatp max-mini-window-height)
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1409 (* (frame-height)
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1410 max-mini-window-height))
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1411 ((integerp max-mini-window-height)
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1412 max-mini-window-height)
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1413 (t
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1414 1))
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1415 1)))
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1416 ;; Don't use the echo area if the output buffer is
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1417 ;; already dispayed in the selected frame.
46090
f52b57f5e2a4 (display-message-or-buffer): Fix last change.
Andreas Schwab <schwab@suse.de>
parents: 46088
diff changeset
1418 (not (get-buffer-window (current-buffer))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1419 ;; Echo area
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1420 (goto-char (point-max))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1421 (when (bolp)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1422 (backward-char 1))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1423 (message "%s" (buffer-substring (point-min) (point))))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1424 (t
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1425 ;; Buffer
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1426 (goto-char (point-min))
39942
728d02aa7502 (display-message-or-buffer): Pass the correct buffer to `display-buffer'.
Miles Bader <miles@gnu.org>
parents: 39843
diff changeset
1427 (display-buffer (current-buffer)
728d02aa7502 (display-message-or-buffer): Pass the correct buffer to `display-buffer'.
Miles Bader <miles@gnu.org>
parents: 39843
diff changeset
1428 not-this-window frame))))))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1429
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1430
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1431 ;; We have a sentinel to prevent insertion of a termination message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1432 ;; in the buffer itself.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1433 (defun shell-command-sentinel (process signal)
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1434 (if (memq (process-status process) '(exit signal))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1435 (message "%s: %s."
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1436 (car (cdr (cdr (process-command process))))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1437 (substring signal 0 -1))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1438
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1439 (defun shell-command-on-region (start end command
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1440 &optional output-buffer replace
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1441 error-buffer)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1442 "Execute string COMMAND in inferior shell with region as input.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1443 Normally display output (if any) in temp buffer `*Shell Command Output*';
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1444 Prefix arg means replace the region with it. Return the exit code of
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1445 COMMAND.
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
1446
19109
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1447 To specify a coding system for converting non-ASCII characters
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1448 in the input and output to the shell command, use \\[universal-coding-system-argument]
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1449 before this command. By default, the input (from the current buffer)
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1450 is encoded in the same coding system that will be used to save the file,
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1451 `buffer-file-coding-system'. If the output is going to replace the region,
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1452 then it is decoded from that same coding system.
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1453
23471
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
1454 The noninteractive arguments are START, END, COMMAND, OUTPUT-BUFFER,
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
1455 REPLACE, ERROR-BUFFER. Noninteractive callers can specify coding
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
1456 systems by binding `coding-system-for-read' and
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
1457 `coding-system-for-write'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1458
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1459 If the command generates output, the output may be displayed
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1460 in the echo area or in a buffer.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1461 If the output is short enough to display in the echo area
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1462 \(determined by the variable `max-mini-window-height' if
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1463 `resize-mini-windows' is non-nil), it is shown there. Otherwise
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1464 it is displayed in the buffer `*Shell Command Output*'. The output
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1465 is available in that buffer in both cases.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1466
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1467 If there is output and an error, a message about the error
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1468 appears at the end of the output.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1469
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1470 If there is no output, or if output is inserted in the current buffer,
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1471 then `*Shell Command Output*' is deleted.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1472
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
1473 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
1474 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
1475 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
1476 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
1477 insert output in the current buffer.
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1478 In either case, the output is inserted after point (leaving mark after it).
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1479
23471
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
1480 If REPLACE, the optional fifth argument, is non-nil, that means insert
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
1481 the output in place of text from START to END, putting point and mark
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
1482 around it.
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
1483
23588
cec6b3f8f355 (shell-command-on-region): Doc fix.
Andreas Schwab <schwab@suse.de>
parents: 23520
diff changeset
1484 If optional sixth argument ERROR-BUFFER is non-nil, it is a buffer
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1485 or buffer name to which to direct the command's standard error output.
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1486 If it is nil, error output is mingled with regular output.
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1487 In an interactive call, the variable `shell-command-default-error-buffer'
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1488 specifies the value of ERROR-BUFFER."
43032
27a9a1ef61f9 (shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents: 42691
diff changeset
1489 (interactive (let (string)
27a9a1ef61f9 (shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents: 42691
diff changeset
1490 (unless (mark)
27a9a1ef61f9 (shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents: 42691
diff changeset
1491 (error "The mark is not set now, so there is no region"))
27a9a1ef61f9 (shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents: 42691
diff changeset
1492 ;; Do this before calling region-beginning
27a9a1ef61f9 (shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents: 42691
diff changeset
1493 ;; and region-end, in case subprocess output
27a9a1ef61f9 (shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents: 42691
diff changeset
1494 ;; relocates them while we are in the minibuffer.
27a9a1ef61f9 (shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents: 42691
diff changeset
1495 (setq string (read-from-minibuffer "Shell command on region: "
27a9a1ef61f9 (shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents: 42691
diff changeset
1496 nil nil nil
27a9a1ef61f9 (shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents: 42691
diff changeset
1497 'shell-command-history))
13482
e49cd471ced7 (do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13328
diff changeset
1498 ;; call-interactively recognizes region-beginning and
e49cd471ced7 (do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13328
diff changeset
1499 ;; 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
1500 (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
1501 string
7b7874738e7c (shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents: 10779
diff changeset
1502 current-prefix-arg
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1503 current-prefix-arg
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1504 shell-command-default-error-buffer)))
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1505 (let ((error-file
25483
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1506 (if error-buffer
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
1507 (make-temp-file
25483
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1508 (expand-file-name "scor"
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1509 (or small-temporary-file-directory
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1510 temporary-file-directory)))
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1511 nil))
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1512 exit-status)
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1513 (if (or replace
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1514 (and output-buffer
24400
a4a1ad877482 (shell-command-on-region): Don't go into the REPLACE = t
Richard M. Stallman <rms@gnu.org>
parents: 24398
diff changeset
1515 (not (or (bufferp output-buffer) (stringp output-buffer)))))
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1516 ;; Replace specified region with output from command.
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1517 (let ((swap (and replace (< start end))))
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1518 ;; Don't muck with mark unless REPLACE says we should.
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1519 (goto-char start)
43794
8acd1399d389 (shell-command-on-region): Call push-mark with
Eli Zaretskii <eliz@gnu.org>
parents: 43581
diff changeset
1520 (and replace (push-mark (point) 'nomsg))
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1521 (setq exit-status
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1522 (call-process-region start end shell-file-name t
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1523 (if error-file
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1524 (list t error-file)
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1525 t)
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1526 nil shell-command-switch command))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1527 ;; It is rude to delete a buffer which the command is not using.
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1528 ;; (let ((shell-buffer (get-buffer "*Shell Command Output*")))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1529 ;; (and shell-buffer (not (eq shell-buffer (current-buffer)))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1530 ;; (kill-buffer shell-buffer)))
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1531 ;; Don't muck with mark unless REPLACE says we should.
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1532 (and replace swap (exchange-point-and-mark)))
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1533 ;; No prefix argument: put the output in a temp buffer,
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1534 ;; replacing its entire contents.
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1535 (let ((buffer (get-buffer-create
46088
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1536 (or output-buffer "*Shell Command Output*"))))
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1537 (unwind-protect
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1538 (if (eq buffer (current-buffer))
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1539 ;; If the input is the same buffer as the output,
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1540 ;; delete everything but the specified region,
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1541 ;; then replace that region with the output.
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1542 (progn (setq buffer-read-only nil)
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1543 (delete-region (max start end) (point-max))
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1544 (delete-region (point-min) (min start end))
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1545 (setq exit-status
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1546 (call-process-region (point-min) (point-max)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1547 shell-file-name t
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1548 (if error-file
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1549 (list t error-file)
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1550 t)
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1551 nil shell-command-switch
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1552 command)))
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1553 ;; Clear the output buffer, then run the command with
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1554 ;; output there.
28703
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1555 (let ((directory default-directory))
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1556 (save-excursion
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1557 (set-buffer buffer)
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1558 (setq buffer-read-only nil)
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1559 (if (not output-buffer)
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1560 (setq default-directory directory))
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1561 (erase-buffer)))
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1562 (setq exit-status
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1563 (call-process-region start end shell-file-name nil
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1564 (if error-file
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1565 (list buffer error-file)
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1566 buffer)
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1567 nil shell-command-switch command)))
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1568 ;; Report the output.
43581
d7536b0977ac (shell-command-on-region): Report non-zero exit
Kim F. Storm <storm@cua.dk>
parents: 43436
diff changeset
1569 (with-current-buffer buffer
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
1570 (setq mode-line-process
46088
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1571 (cond ((null exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1572 " - Error")
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1573 ((stringp exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1574 (format " - Signal [%s]" exit-status))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1575 ((not (equal 0 exit-status))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1576 (format " - Exit [%d]" exit-status)))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1577 (if (with-current-buffer buffer (> (point-max) (point-min)))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1578 ;; There's some output, display it
43581
d7536b0977ac (shell-command-on-region): Report non-zero exit
Kim F. Storm <storm@cua.dk>
parents: 43436
diff changeset
1579 (display-message-or-buffer buffer)
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1580 ;; No output; error?
43436
1f1affb402ce (shell-command-on-region): Display the exit status when a command fails.
Richard M. Stallman <rms@gnu.org>
parents: 43301
diff changeset
1581 (let ((output
1f1affb402ce (shell-command-on-region): Display the exit status when a command fails.
Richard M. Stallman <rms@gnu.org>
parents: 43301
diff changeset
1582 (if (and error-file
1f1affb402ce (shell-command-on-region): Display the exit status when a command fails.
Richard M. Stallman <rms@gnu.org>
parents: 43301
diff changeset
1583 (< 0 (nth 7 (file-attributes error-file))))
1f1affb402ce (shell-command-on-region): Display the exit status when a command fails.
Richard M. Stallman <rms@gnu.org>
parents: 43301
diff changeset
1584 "some error output"
1f1affb402ce (shell-command-on-region): Display the exit status when a command fails.
Richard M. Stallman <rms@gnu.org>
parents: 43301
diff changeset
1585 "no output")))
46088
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1586 (cond ((null exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1587 (message "(Shell command failed with error)"))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1588 ((equal 0 exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1589 (message "(Shell command succeeded with %s)"
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1590 output))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1591 ((stringp exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1592 (message "(Shell command killed by signal %s)"
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1593 exit-status))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1594 (t
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1595 (message "(Shell command failed with code %d and %s)"
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1596 exit-status output))))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1597 ;; Don't kill: there might be useful info in the undo-log.
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1598 ;; (kill-buffer buffer)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1599 ))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1600
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1601 (when (and error-file (file-exists-p error-file))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1602 (if (< 0 (nth 7 (file-attributes error-file)))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1603 (with-current-buffer (get-buffer-create error-buffer)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1604 (let ((pos-from-end (- (point-max) (point))))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1605 (or (bobp)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1606 (insert "\f\n"))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1607 ;; Do no formatting while reading error file,
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1608 ;; because that can run a shell command, and we
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1609 ;; don't want that to cause an infinite recursion.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1610 (format-insert-file error-file nil)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1611 ;; Put point after the inserted errors.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1612 (goto-char (- (point-max) pos-from-end)))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1613 (display-buffer (current-buffer))))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1614 (delete-file error-file))
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1615 exit-status))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1616
16312
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
1617 (defun shell-command-to-string (command)
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
1618 "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
1619 (with-output-to-string
16316
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
1620 (with-current-buffer
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
1621 standard-output
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
1622 (call-process shell-file-name nil t nil shell-command-switch command))))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
1623
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
1624 (defvar universal-argument-map
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1625 (let ((map (make-sparse-keymap)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1626 (define-key map [t] 'universal-argument-other-key)
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
1627 (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
1628 (define-key map [switch-frame] nil)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1629 (define-key map [?\C-u] 'universal-argument-more)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1630 (define-key map [?-] 'universal-argument-minus)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1631 (define-key map [?0] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1632 (define-key map [?1] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1633 (define-key map [?2] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1634 (define-key map [?3] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1635 (define-key map [?4] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1636 (define-key map [?5] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1637 (define-key map [?6] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1638 (define-key map [?7] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1639 (define-key map [?8] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1640 (define-key map [?9] 'digit-argument)
30347
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1641 (define-key map [kp-0] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1642 (define-key map [kp-1] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1643 (define-key map [kp-2] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1644 (define-key map [kp-3] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1645 (define-key map [kp-4] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1646 (define-key map [kp-5] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1647 (define-key map [kp-6] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1648 (define-key map [kp-7] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1649 (define-key map [kp-8] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1650 (define-key map [kp-9] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1651 (define-key map [kp-subtract] 'universal-argument-minus)
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1652 map)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1653 "Keymap used while processing \\[universal-argument].")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1654
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1655 (defvar universal-argument-num-events nil
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1656 "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
1657 `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
1658 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
1659
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1660 (defvar overriding-map-is-bound nil
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1661 "Non-nil when `overriding-terminal-local-map' is `universal-argument-map'.")
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1662
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1663 (defvar saved-overriding-map nil
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1664 "The saved value of `overriding-terminal-local-map'.
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1665 That variable gets restored to this value on exiting \"universal
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1666 argument mode\".")
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1667
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1668 (defun ensure-overriding-map-is-bound ()
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1669 "Check `overriding-terminal-local-map' is `universal-argument-map'."
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1670 (unless overriding-map-is-bound
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1671 (setq saved-overriding-map overriding-terminal-local-map)
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1672 (setq overriding-terminal-local-map universal-argument-map)
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1673 (setq overriding-map-is-bound t)))
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1674
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1675 (defun restore-overriding-map ()
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1676 "Restore `overriding-terminal-local-map' to its saved value."
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1677 (setq overriding-terminal-local-map saved-overriding-map)
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1678 (setq overriding-map-is-bound nil))
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1679
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1680 (defun universal-argument ()
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1681 "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
1682 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
1683 \\[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
1684 \\[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
1685 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
1686 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
1687 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
1688 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
1689 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
1690 (interactive)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1691 (setq prefix-arg (list 4))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1692 (setq universal-argument-num-events (length (this-command-keys)))
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1693 (ensure-overriding-map-is-bound))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1694
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1695 ;; 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
1696 ;; 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
1697 (defun universal-argument-more (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1698 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1699 (if (consp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1700 (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
1701 (if (eq arg '-)
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
1702 (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
1703 (setq prefix-arg arg)
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1704 (restore-overriding-map)))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1705 (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
1706
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1707 (defun negative-argument (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1708 "Begin a negative numeric argument for the next command.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1709 \\[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
1710 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1711 (cond ((integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1712 (setq prefix-arg (- arg)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1713 ((eq arg '-)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1714 (setq prefix-arg nil))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1715 (t
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
1716 (setq prefix-arg '-)))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1717 (setq universal-argument-num-events (length (this-command-keys)))
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1718 (ensure-overriding-map-is-bound))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1719
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1720 (defun digit-argument (arg)
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1721 "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
1722 \\[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
1723 (interactive "P")
30347
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1724 (let* ((char (if (integerp last-command-char)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1725 last-command-char
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1726 (get last-command-char 'ascii-character)))
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
1727 (digit (- (logand char ?\177) ?0)))
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1728 (cond ((integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1729 (setq prefix-arg (+ (* arg 10)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1730 (if (< arg 0) (- digit) digit))))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1731 ((eq arg '-)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1732 ;; Treat -0 as just -, so that -01 will work.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1733 (setq prefix-arg (if (zerop digit) '- (- digit))))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1734 (t
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
1735 (setq prefix-arg digit))))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1736 (setq universal-argument-num-events (length (this-command-keys)))
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1737 (ensure-overriding-map-is-bound))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1738
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1739 ;; 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
1740 ;; command if digits have already been entered.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1741 (defun universal-argument-minus (arg)
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
1742 (interactive "P")
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1743 (if (integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1744 (universal-argument-other-key arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1745 (negative-argument arg)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1746
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1747 ;; 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
1748 ;; executed as a command.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1749 (defun universal-argument-other-key (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1750 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
1751 (setq prefix-arg arg)
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1752 (let* ((key (this-command-keys))
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1753 (keylist (listify-key-sequence key)))
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
1754 (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
1755 (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
1756 unread-command-events)))
12320
979836b1a1a9 (universal-argument-other-key): Call reset-this-command-lengths.
Richard M. Stallman <rms@gnu.org>
parents: 12313
diff changeset
1757 (reset-this-command-lengths)
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
1758 (restore-overriding-map))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
1759
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1760 ;;;; Window system cut and paste hooks.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1761
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1762 (defvar interprogram-cut-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1763 "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
1764
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1765 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
1766 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
1767 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
1768 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
1769 programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1770
3034
dd65780e6246 (kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents: 3029
diff changeset
1771 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
1772 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
1773 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
1774 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
1775 nil means appending to an \"old\" kill.")
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1776
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1777 (defvar interprogram-paste-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1778 "Function to call to get text cut from other programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1779
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1780 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
1781 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
1782 This variable holds a function that Emacs calls to obtain
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1783 text that other programs have provided for pasting.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1784
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1785 The function should be called with no arguments. If the function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1786 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
1787 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
1788 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
1789
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1790 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
1791 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
1792 most recent string, the function should return nil. If it is
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1793 difficult to tell whether Emacs or some other program provided the
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1794 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
1795 is equal (according to `string=') to the last text Emacs provided.")
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
1796
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1797
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
1798
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1799 ;;;; The kill ring data structure.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1800
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1801 (defvar kill-ring nil
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1802 "List of killed text sequences.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1803 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
1804 facilities offered by window systems, use of this variable should
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1805 interact nicely with `interprogram-cut-function' and
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1806 `interprogram-paste-function'. The functions `kill-new',
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1807 `kill-append', and `current-kill' are supposed to implement this
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1808 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
1809 ring directly.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1810
23495
d5f08ad9a40b (kill-ring-max): Increased to 60.
Richard M. Stallman <rms@gnu.org>
parents: 23491
diff changeset
1811 (defcustom kill-ring-max 60
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1812 "*Maximum length of kill ring before oldest elements are thrown away."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1813 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1814 :group 'killing)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1815
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1816 (defvar kill-ring-yank-pointer nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1817 "The tail of the kill ring whose car is the last thing yanked.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1818
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1819 (defun kill-new (string &optional replace yank-handler)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1820 "Make STRING the latest kill in the kill ring.
44273
5180d0ff95f6 (kill-new): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 44252
diff changeset
1821 Set `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
1822 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
1823 Optional second argument REPLACE non-nil means that STRING will replace
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1824 the front of the kill ring, rather than being added to the list.
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1825
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1826 Optional third arguments YANK-HANDLER controls how the STRING is later
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
1827 inserted into a buffer; see `insert-for-yank' for details.
49491
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1828 When a yank handler is specified, STRING must be non-empty (the yank
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1829 handler is stored as a `yank-handler'text property on STRING).
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1830
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1831 When the yank handler has a non-nil PARAM element, the original STRING
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1832 argument is not used by `insert-for-yank'. However, since Lisp code
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1833 may access and use elements from the kill-ring directly, the STRING
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1834 argument should still be a \"useful\" string for such uses."
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1835 (if (> (length string) 0)
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
1836 (if yank-handler
51606
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
1837 (put-text-property 0 1 'yank-handler yank-handler string))
49491
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1838 (if yank-handler
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
1839 (signal 'args-out-of-range
49491
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1840 (list string "yank-handler specified for empty string"))))
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1841 (if (fboundp 'menu-bar-update-yank-menu)
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
1842 (menu-bar-update-yank-menu string (and replace (car kill-ring))))
34443
599c8d8e833a (kill-new): Don't try to setcar kill-ring if it is
Gerd Moellmann <gerd@gnu.org>
parents: 34141
diff changeset
1843 (if (and replace kill-ring)
8763
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1844 (setcar kill-ring string)
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1845 (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
1846 (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
1847 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1848 (setq kill-ring-yank-pointer kill-ring)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1849 (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
1850 (funcall interprogram-cut-function string (not replace))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1851
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1852 (defun kill-append (string before-p &optional yank-handler)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1853 "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
1854 If BEFORE-P is non-nil, prepend STRING to the kill.
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1855 Optional third argument YANK-HANDLER specifies the yank-handler text
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1856 property to be set on the combined kill ring string. If the specified
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1857 yank-handler arg differs from the yank-handler property of the latest
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1858 kill string, STRING is added as a new kill ring element instead of
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
1859 being appending to the last kill.
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1860 If `interprogram-cut-function' is set, pass the resulting kill to it."
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1861 (let* ((cur (car kill-ring)))
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1862 (kill-new (if before-p (concat string cur) (concat cur string))
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1863 (or (= (length cur) 0)
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1864 (equal yank-handler (get-text-property 0 'yank-handler cur)))
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1865 yank-handler)))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1866
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1867 (defun current-kill (n &optional do-not-move)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1868 "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
1869 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
1870 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
1871 kill ring and returned as the latest kill.
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1872 If optional arg DO-NOT-MOVE is non-nil, then don't actually move the
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1873 yanking point; just return the Nth kill forward."
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1874 (let ((interprogram-paste (and (= n 0)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1875 interprogram-paste-function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1876 (funcall interprogram-paste-function))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1877 (if interprogram-paste
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1878 (progn
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1879 ;; Disable the interprogram cut function when we add the new
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1880 ;; 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
1881 ;; selection, with identical text.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1882 (let ((interprogram-cut-function nil))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1883 (kill-new interprogram-paste))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1884 interprogram-paste)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1885 (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
1886 (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
1887 (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
1888 (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
1889 kill-ring)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1890 (or do-not-move
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1891 (setq kill-ring-yank-pointer ARGth-kill-element))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1892 (car ARGth-kill-element)))))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1893
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1894
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
1895
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1896 ;;;; Commands for manipulating the kill ring.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1897
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1898 (defcustom kill-read-only-ok nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1899 "*Non-nil means don't signal an error for killing read-only text."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1900 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
1901 :group 'killing)
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1902
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1903 (put 'text-read-only 'error-conditions
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1904 '(text-read-only buffer-read-only error))
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1905 (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
1906
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1907 (defun kill-region (beg end &optional yank-handler)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1908 "Kill between point and mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1909 The text is deleted but saved in the kill ring.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1910 The command \\[yank] can retrieve it from there.
36110
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
1911 \(If you want to kill and then yank immediately, use \\[kill-ring-save].)
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
1912
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
1913 If you want to append the killed region to the last killed text,
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
1914 use \\[append-next-kill] before \\[kill-region].
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
1915
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1916 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
1917 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
1918 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
1919
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1920 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
1921 Supply two arguments, character numbers indicating the stretch of text
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1922 to be killed.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1923 Any command that calls this function is a \"kill command\".
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1924 If the previous command was also a kill command,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1925 the text killed this time appends to the text killed last time
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1926 to make one entry in the kill ring.
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1927
49364
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
1928 In Lisp code, optional third arg YANK-HANDLER specifies the yank-handler
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
1929 text property to be set on the killed text. See `insert-for-yank'."
27836
132294fa754e (zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents: 27477
diff changeset
1930 (interactive "r")
20279
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1931 (condition-case nil
26744
f14026cd9767 (kill-region): Use the new `delete-and-extract-region'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26723
diff changeset
1932 (let ((string (delete-and-extract-region beg end)))
f14026cd9767 (kill-region): Use the new `delete-and-extract-region'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26723
diff changeset
1933 (when string ;STRING is nil if BEG = END
f14026cd9767 (kill-region): Use the new `delete-and-extract-region'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26723
diff changeset
1934 ;; Add that string to the kill ring, one way or another.
f14026cd9767 (kill-region): Use the new `delete-and-extract-region'
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26723
diff changeset
1935 (if (eq last-command 'kill-region)
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1936 (kill-append string (< end beg) yank-handler)
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
1937 (kill-new string nil yank-handler)))
51304
955ff3c53a87 (kill-region): If nothing was killed, and the
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51220
diff changeset
1938 (when (or string (eq last-command 'kill-region))
955ff3c53a87 (kill-region): If nothing was killed, and the
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51220
diff changeset
1939 (setq this-command 'kill-region)))
20279
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1940 ((buffer-read-only text-read-only)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1941 ;; The code above failed because the buffer, or some of the characters
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1942 ;; in the region, are read-only.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1943 ;; We should beep, in case the user just isn't aware of this.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1944 ;; However, there's no harm in putting
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1945 ;; the region's text in the kill ring, anyway.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1946 (copy-region-as-kill beg end)
22144
632fc074e4d7 (kill-region): Set this-command unconditionally in a read-only buffer.
Richard M. Stallman <rms@gnu.org>
parents: 21906
diff changeset
1947 ;; Set this-command now, so it will be set even if we get an error.
632fc074e4d7 (kill-region): Set this-command unconditionally in a read-only buffer.
Richard M. Stallman <rms@gnu.org>
parents: 21906
diff changeset
1948 (setq this-command 'kill-region)
632fc074e4d7 (kill-region): Set this-command unconditionally in a read-only buffer.
Richard M. Stallman <rms@gnu.org>
parents: 21906
diff changeset
1949 ;; This should barf, if appropriate, and give us the correct error.
20279
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1950 (if kill-read-only-ok
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1951 (message "Read only text copied to kill ring")
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1952 ;; Signal an error if the buffer is read-only.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1953 (barf-if-buffer-read-only)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1954 ;; If the buffer isn't read-only, the text is.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
1955 (signal 'text-read-only (list (current-buffer)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1956
9876
75ecf866cfb8 Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents: 9870
diff changeset
1957 ;; 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
1958 ;; 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
1959 ;; then corrects it with the intended C-w.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1960 (defun copy-region-as-kill (beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1961 "Save the region as if killed, but don't kill it.
20484
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1962 In Transient Mark mode, deactivate the mark.
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
1963 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
1964 system cut and paste."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1965 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1966 (if (eq last-command 'kill-region)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1967 (kill-append (buffer-substring beg end) (< end beg))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1968 (kill-new (buffer-substring beg end)))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1969 (if transient-mark-mode
21193
20bba919ec72 (copy-region-as-kill): Set deactivate-mark
Richard M. Stallman <rms@gnu.org>
parents: 21175
diff changeset
1970 (setq deactivate-mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1971 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1972
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1973 (defun kill-ring-save (beg end)
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1974 "Save the region as if killed, but don't kill it.
20484
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1975 In Transient Mark mode, deactivate the mark.
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1976 If `interprogram-cut-function' is non-nil, also save the text for a window
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1977 system cut and paste.
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1978
36110
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
1979 If you want to append the killed line to the last killed text,
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
1980 use \\[append-next-kill] before \\[kill-ring-save].
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
1981
3467
002945794814 (kill-ring-save): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3408
diff changeset
1982 This command is similar to `copy-region-as-kill', except that it gives
20484
089c85c48eab (copy-region-as-kill): Deactivate mark in transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 20482
diff changeset
1983 visual feedback indicating the extent of the region being copied."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1984 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1985 (copy-region-as-kill beg end)
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
1986 (if (interactive-p)
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1987 (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
1988 (opoint (point))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1989 ;; 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
1990 ;; 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
1991 (inhibit-quit t))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1992 (if (pos-visible-in-window-p other-end (selected-window))
40069
bd85ab6cffed Don't let kill-ring-save show extent if transient-mark-mode and region
Kim F. Storm <storm@cua.dk>
parents: 40018
diff changeset
1993 (unless transient-mark-mode
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1994 ;; Swap point and mark.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1995 (set-marker (mark-marker) (point) (current-buffer))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1996 (goto-char other-end)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1997 (sit-for 1)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1998 ;; Swap back.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1999 (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
2000 (goto-char opoint)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2001 ;; If user quit, deactivate the mark
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2002 ;; 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
2003 (and quit-flag mark-active
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
2004 (deactivate-mark)))
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2005 (let* ((killed-text (current-kill 0))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2006 (message-len (min (length killed-text) 40)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2007 (if (= (point) beg)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2008 ;; Don't say "killed"; that is misleading.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2009 (message "Saved text until \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2010 (substring killed-text (- message-len)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2011 (message "Saved text from \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2012 (substring killed-text 0 message-len))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013
24798
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
2014 (defun append-next-kill (&optional interactive)
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
2015 "Cause following command, if it kills, to append to previous kill.
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
2016 The argument is used for internal purposes; do not supply one."
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
2017 (interactive "p")
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
2018 ;; We don't use (interactive-p), since that breaks kbd macros.
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
2019 (if interactive
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2020 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2021 (setq this-command 'kill-region)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2022 (message "If the next command is a kill, it will append"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2023 (setq last-command 'kill-region)))
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2024
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2025 ;; Yanking.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2026
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2027 ;; This is actually used in subr.el but defcustom does not work there.
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2028 (defcustom yank-excluded-properties
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2029 '(read-only invisible intangible field mouse-face help-echo local-map keymap
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2030 yank-handler)
51461
5bcd833ec510 (yank-excluded-properties): Expand documentation string.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51324
diff changeset
2031 "*Text properties to discard when yanking.
5bcd833ec510 (yank-excluded-properties): Expand documentation string.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51324
diff changeset
2032 The value should be a list of text properties to discard or t,
5bcd833ec510 (yank-excluded-properties): Expand documentation string.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51324
diff changeset
2033 which means to discard all text properties."
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2034 :type '(choice (const :tag "All" t) (repeat symbol))
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2035 :group 'editing
45386
453e599fd7f8 (yank-excluded-properties): Change :version attribute to a string.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 45078
diff changeset
2036 :version "21.4")
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2037
48583
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
2038 (defvar yank-window-start nil)
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2039 (defvar yank-undo-function nil
49364
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
2040 "If non-nil, function used by `yank-pop' to delete last stretch of yanked text.
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
2041 Function is called with two parameters, START and END corresponding to
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
2042 the value of the mark and point; it is guaranteed that START <= END.
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
2043 Normally set from the UNDO element of a yank-handler; see `insert-for-yank'.")
48583
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
2044
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2045 (defun yank-pop (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2046 "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
2047 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
2048 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
2049 previously-killed text. `yank-pop' deletes that text and inserts in its
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2050 place a different stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2051
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2052 With no argument, the previous kill is inserted.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2053 With argument N, insert the Nth previous kill.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2054 If N is negative, this is a more recent kill.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2055
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2056 The sequence of kills wraps around, so that after the oldest one
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2057 comes the newest one."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2058 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2059 (if (not (eq last-command 'yank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2060 (error "Previous command was not a yank"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2061 (setq this-command 'yank)
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
2062 (let ((inhibit-read-only t)
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
2063 (before (< (point) (mark t))))
49312
ebc6f47b202e (yank-pop): Always call yank-undo-function with start <= end.
Kim F. Storm <storm@cua.dk>
parents: 49309
diff changeset
2064 (if before
ebc6f47b202e (yank-pop): Always call yank-undo-function with start <= end.
Kim F. Storm <storm@cua.dk>
parents: 49309
diff changeset
2065 (funcall (or yank-undo-function 'delete-region) (point) (mark t))
ebc6f47b202e (yank-pop): Always call yank-undo-function with start <= end.
Kim F. Storm <storm@cua.dk>
parents: 49309
diff changeset
2066 (funcall (or yank-undo-function 'delete-region) (mark t) (point)))
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2067 (setq yank-undo-function nil)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2068 (set-marker (mark-marker) (point) (current-buffer))
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2069 (insert-for-yank (current-kill arg))
48583
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
2070 ;; Set the window start back where it was in the yank command,
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
2071 ;; if possible.
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
2072 (set-window-start (selected-window) yank-window-start t)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2073 (if before
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2074 ;; 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
2075 ;; 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
2076 ;; 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
2077 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2078 (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
2079 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2080
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2081 (defun yank (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2082 "Reinsert the last stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2083 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
2084 killed OR yanked. Put point at end, and set mark at beginning.
47346
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
2085 With just \\[universal-argument] as argument, same but put point at beginning (and mark at end).
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2086 With argument N, reinsert the Nth most recently killed stretch of killed
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2087 text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2088 See also the command \\[yank-pop]."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2089 (interactive "*P")
48583
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
2090 (setq yank-window-start (window-start))
5935
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
2091 ;; 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
2092 ;; for the following command.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
2093 (setq this-command t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2094 (push-mark (point))
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2095 (insert-for-yank (current-kill (cond
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2096 ((listp arg) 0)
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2097 ((eq arg '-) -1)
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2098 (t (1- arg)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2099 (if (consp arg)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2100 ;; 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
2101 ;; 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
2102 ;; 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
2103 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2104 (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
2105 ;; If we do get all the way thru, make this-command indicate that.
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2106 (if (eq this-command t)
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2107 (setq this-command 'yank))
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
2108 nil)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2109
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2110 (defun rotate-yank-pointer (arg)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2111 "Rotate the yanking point in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2112 With argument, rotate that many kills forward (or backward, if negative)."
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2113 (interactive "p")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2114 (current-kill arg))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2115
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2116 ;; Some kill commands.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2117
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2118 ;; Internal subroutine of delete-char
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2119 (defun kill-forward-chars (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2120 (if (listp arg) (setq arg (car arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2121 (if (eq arg '-) (setq arg -1))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2122 (kill-region (point) (forward-point arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2123
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2124 ;; Internal subroutine of backward-delete-char
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2125 (defun kill-backward-chars (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2126 (if (listp arg) (setq arg (car arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2127 (if (eq arg '-) (setq arg -1))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2128 (kill-region (point) (forward-point (- arg))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2129
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2130 (defcustom backward-delete-char-untabify-method 'untabify
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2131 "*The method for untabifying when deleting backward.
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2132 Can be `untabify' -- turn a tab to many spaces, then delete one space;
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2133 `hungry' -- delete all whitespace, both tabs and spaces;
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2134 `all' -- delete all whitespace, including tabs, spaces and newlines;
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2135 nil -- just delete one character."
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2136 :type '(choice (const untabify) (const hungry) (const all) (const nil))
35327
9c153544050c (backward-delete-char-untabify-method): Add :version.
Dave Love <fx@gnu.org>
parents: 35203
diff changeset
2137 :version "20.3"
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2138 :group 'killing)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2139
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2140 (defun backward-delete-char-untabify (arg &optional killp)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2141 "Delete characters backward, changing tabs into spaces.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2142 The exact behavior depends on `backward-delete-char-untabify-method'.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2143 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2144 Interactively, ARG is the prefix arg (default 1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2145 and KILLP is t if a prefix arg was specified."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2146 (interactive "*p\nP")
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2147 (when (eq backward-delete-char-untabify-method 'untabify)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2148 (let ((count arg))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2149 (save-excursion
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2150 (while (and (> count 0) (not (bobp)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2151 (if (= (preceding-char) ?\t)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2152 (let ((col (current-column)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2153 (forward-char -1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2154 (setq col (- col (current-column)))
49784
48e671543e1e (backward-delete-char-untabify): Fix use of character constant.
Juanma Barranquero <lekktu@gmail.com>
parents: 49597
diff changeset
2155 (insert-char ?\ col)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2156 (delete-char 1)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2157 (forward-char -1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2158 (setq count (1- count))))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2159 (delete-backward-char
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2160 (let ((skip (cond ((eq backward-delete-char-untabify-method 'hungry) " \t")
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2161 ((eq backward-delete-char-untabify-method 'all)
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2162 " \t\n\r"))))
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2163 (if skip
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2164 (let ((wh (- (point) (save-excursion (skip-chars-backward skip)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2165 (point)))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2166 (+ arg (if (zerop wh) 0 (1- wh))))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2167 arg))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2168 killp))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2169
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2170 (defun zap-to-char (arg char)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2171 "Kill up to and including ARG'th occurrence of CHAR.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2172 Case is ignored if `case-fold-search' is non-nil in the current buffer.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2173 Goes backward if ARG is negative; error if CHAR not found."
27836
132294fa754e (zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents: 27477
diff changeset
2174 (interactive "p\ncZap to char: ")
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2175 (kill-region (point) (progn
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2176 (search-forward (char-to-string char) nil nil arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2177 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2178 (point))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
2179
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2180 ;; kill-line and its subroutines.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2181
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2182 (defcustom kill-whole-line nil
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2183 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2184 :type 'boolean
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2185 :group 'killing)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2186
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2187 (defun kill-line (&optional arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2188 "Kill the rest of the current line; if no nonblanks there, kill thru newline.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2189 With prefix argument, kill that many lines from point.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2190 Negative arguments kill lines backward.
32267
b84a9fb24453 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 32260
diff changeset
2191 With zero argument, kills the text before point on the current line.
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2192
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2193 When calling from a program, nil means \"no arg\",
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2194 a number counts as a prefix arg.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2195
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2196 To kill a whole line, when point is not at the beginning, type \
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2197 \\[beginning-of-line] \\[kill-line] \\[kill-line].
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2198
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2199 If `kill-whole-line' is non-nil, then this command kills the whole line
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2200 including its terminating newline, when used at the beginning of a line
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2201 with no argument. As a consequence, you can always kill a whole line
35916
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
2202 by typing \\[beginning-of-line] \\[kill-line].
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
2203
36110
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
2204 If you want to append the killed line to the last killed text,
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
2205 use \\[append-next-kill] before \\[kill-line].
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
2206
35916
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
2207 If the buffer is read-only, Emacs will beep and refrain from deleting
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
2208 the line, but put the line in the kill ring anyway. This means that
50652
b108545d1f24 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50383
diff changeset
2209 you can use this command to copy text from a read-only buffer.
b108545d1f24 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50383
diff changeset
2210 \(If the variable `kill-read-only-ok' is non-nil, then this won't
b108545d1f24 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50383
diff changeset
2211 even beep.)"
27836
132294fa754e (zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents: 27477
diff changeset
2212 (interactive "P")
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2213 (kill-region (point)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2214 ;; It is better to move point to the other end of the kill
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2215 ;; before killing. That way, in a read-only buffer, point
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2216 ;; moves across the text that is copied to the kill ring.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2217 ;; The choice has no effect on undo now that undo records
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2218 ;; the value of point from before the command was run.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2219 (progn
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2220 (if arg
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2221 (forward-visible-line (prefix-numeric-value arg))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2222 (if (eobp)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2223 (signal 'end-of-buffer nil))
47182
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2224 (let ((end
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2225 (save-excursion
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2226 (end-of-visible-line) (point))))
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2227 (if (or (save-excursion
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2228 (skip-chars-forward " \t" end)
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2229 (= (point) end))
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2230 (and kill-whole-line (bolp)))
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2231 (forward-visible-line 1)
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2232 (goto-char end))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2233 (point))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2234
51101
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2235 (defun kill-whole-line (&optional arg)
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2236 "Kill current line.
51324
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2237 With prefix arg, kill that many lines starting from the current line.
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2238 If arg is negative, kill backward. Also kill the preceding newline.
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2239 \(This is meant to make C-x z work well with negative arguments.\)
51101
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2240 If arg is zero, kill current line but exclude the trailing newline."
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2241 (interactive "P")
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2242 (setq arg (prefix-numeric-value arg))
51324
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2243 (if (and (> arg 0) (eobp) (save-excursion (forward-visible-line 0) (eobp)))
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2244 (signal 'end-of-buffer nil))
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2245 (if (and (< arg 0) (bobp) (save-excursion (end-of-visible-line) (bobp)))
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2246 (signal 'beginning-of-buffer nil))
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2247 (unless (eq last-command 'kill-region)
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2248 (kill-new "")
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2249 (setq last-command 'kill-region))
51101
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2250 (cond ((zerop arg)
51324
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2251 ;; We need to kill in two steps, because the previous command
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2252 ;; could have been a kill command, in which case the text
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2253 ;; before point needs to be prepended to the current kill
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2254 ;; ring entry and the text after point appended. Also, we
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2255 ;; need to use save-excursion to avoid copying the same text
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2256 ;; twice to the kill ring in read-only buffers.
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2257 (save-excursion
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2258 (kill-region (point) (progn (forward-visible-line 0) (point))))
51101
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2259 (kill-region (point) (progn (end-of-visible-line) (point))))
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2260 ((< arg 0)
51324
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2261 (save-excursion
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2262 (kill-region (point) (progn (end-of-visible-line) (point))))
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2263 (kill-region (point)
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2264 (progn (forward-visible-line (1+ arg))
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2265 (unless (bobp) (backward-char))
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2266 (point))))
51101
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2267 (t
51324
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2268 (save-excursion
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2269 (kill-region (point) (progn (forward-visible-line 0) (point))))
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2270 (kill-region (point)
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2271 (progn (forward-visible-line arg) (point))))))
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2272
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2273 (defun forward-visible-line (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2274 "Move forward by ARG lines, ignoring currently invisible newlines only.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2275 If ARG is negative, move backward -ARG lines.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2276 If ARG is zero, move to the beginning of the current line."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2277 (condition-case nil
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2278 (if (> arg 0)
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2279 (progn
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2280 (while (> arg 0)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2281 (or (zerop (forward-line 1))
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2282 (signal 'end-of-buffer nil))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2283 ;; If the newline we just skipped is invisible,
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2284 ;; don't count it.
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2285 (let ((prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2286 (get-char-property (1- (point)) 'invisible)))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2287 (if (if (eq buffer-invisibility-spec t)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2288 prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2289 (or (memq prop buffer-invisibility-spec)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2290 (assq prop buffer-invisibility-spec)))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2291 (setq arg (1+ arg))))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2292 (setq arg (1- arg)))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2293 ;; If invisible text follows, and it is a number of complete lines,
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2294 ;; skip it.
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2295 (let ((opoint (point)))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2296 (while (and (not (eobp))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2297 (let ((prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2298 (get-char-property (point) 'invisible)))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2299 (if (eq buffer-invisibility-spec t)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2300 prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2301 (or (memq prop buffer-invisibility-spec)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2302 (assq prop buffer-invisibility-spec)))))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2303 (goto-char
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2304 (if (get-text-property (point) 'invisible)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2305 (or (next-single-property-change (point) 'invisible)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2306 (point-max))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2307 (next-overlay-change (point)))))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2308 (unless (bolp)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2309 (goto-char opoint))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2310 (let ((first t))
51219
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2311 (while (or first (<= arg 0))
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2312 (if first
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2313 (beginning-of-line)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2314 (or (zerop (forward-line -1))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2315 (signal 'beginning-of-buffer nil)))
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2316 ;; If the newline we just moved to is invisible,
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2317 ;; don't count it.
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2318 (unless (bobp)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2319 (let ((prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2320 (get-char-property (1- (point)) 'invisible)))
51219
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2321 (unless (if (eq buffer-invisibility-spec t)
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2322 prop
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2323 (or (memq prop buffer-invisibility-spec)
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2324 (assq prop buffer-invisibility-spec)))
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2325 (setq arg (1+ arg)))))
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2326 (setq first nil))
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2327 ;; If invisible text follows, and it is a number of complete lines,
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2328 ;; skip it.
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2329 (let ((opoint (point)))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2330 (while (and (not (bobp))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2331 (let ((prop
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2332 (get-char-property (1- (point)) 'invisible)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2333 (if (eq buffer-invisibility-spec t)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2334 prop
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2335 (or (memq prop buffer-invisibility-spec)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2336 (assq prop buffer-invisibility-spec)))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2337 (goto-char
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2338 (if (get-text-property (1- (point)) 'invisible)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2339 (or (previous-single-property-change (point) 'invisible)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2340 (point-min))
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2341 (previous-overlay-change (point)))))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2342 (unless (bolp)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2343 (goto-char opoint)))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2344 ((beginning-of-buffer end-of-buffer)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2345 nil)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2346
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2347 (defun end-of-visible-line ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2348 "Move to end of current visible line."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2349 (end-of-line)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2350 ;; If the following character is currently invisible,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2351 ;; skip all characters with that same `invisible' property value,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2352 ;; then find the next newline.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2353 (while (and (not (eobp))
47182
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2354 (save-excursion
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2355 (skip-chars-forward "^\n")
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2356 (let ((prop
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2357 (get-char-property (point) 'invisible)))
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2358 (if (eq buffer-invisibility-spec t)
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2359 prop
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2360 (or (memq prop buffer-invisibility-spec)
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2361 (assq prop buffer-invisibility-spec))))))
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2362 (skip-chars-forward "^\n")
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2363 (if (get-text-property (point) 'invisible)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2364 (goto-char (next-single-property-change (point) 'invisible))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2365 (goto-char (next-overlay-change (point))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2366 (end-of-line)))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2367
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2368 (defun insert-buffer (buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2369 "Insert after point the contents of BUFFER.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2370 Puts mark after the inserted text.
26723
b4f7c98850f0 (insert-buffer): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 26521
diff changeset
2371 BUFFER may be a buffer or a buffer name.
b4f7c98850f0 (insert-buffer): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 26521
diff changeset
2372
b4f7c98850f0 (insert-buffer): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 26521
diff changeset
2373 This function is meant for the user to run interactively.
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
2374 Don't call it from programs: use `insert-buffer-substring' instead!"
14835
eb78ddcff331 (insert-buffer): Fix typo in previous change.
Erik Naggum <erik@naggum.no>
parents: 14834
diff changeset
2375 (interactive
14834
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
2376 (list
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
2377 (progn
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
2378 (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
2379 (read-buffer "Insert buffer: "
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
2380 (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
2381 (other-buffer (current-buffer))
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
2382 (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
2383 t))))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
2384 (push-mark
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
2385 (save-excursion
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
2386 (insert-buffer-substring (get-buffer buffer))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
2387 (point)))
1982
d65c1fefc636 * simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents: 1838
diff changeset
2388 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2389
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2390 (defun append-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2391 "Append to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2392 It is inserted into that buffer before its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2393
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2394 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2395 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2396 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
2397 (interactive
10048
db01a04d2afb (append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents: 10034
diff changeset
2398 (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
2399 (region-beginning) (region-end)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2400 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2401 (save-excursion
28187
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2402 (let* ((append-to (get-buffer-create buffer))
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2403 (windows (get-buffer-window-list append-to t t))
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2404 point)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2405 (set-buffer append-to)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2406 (setq point (point))
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2407 (barf-if-buffer-read-only)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2408 (insert-buffer-substring oldbuf start end)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2409 (dolist (window windows)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2410 (when (= (window-point window) point)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2411 (set-window-point window (point))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2412
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2413 (defun prepend-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2414 "Prepend to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2415 It is inserted into that buffer after its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2416
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2417 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2418 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2419 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2420 (interactive "BPrepend to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2421 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2422 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2423 (set-buffer (get-buffer-create buffer))
24973
57d2a2f294cb (append-to-buffer, prepend-to-buffer, copy-to-buffer): Check for
Dave Love <fx@gnu.org>
parents: 24831
diff changeset
2424 (barf-if-buffer-read-only)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2425 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2426 (insert-buffer-substring oldbuf start end)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2427
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2428 (defun copy-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2429 "Copy to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2430 It is inserted into that buffer, replacing existing text there.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2431
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2432 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2433 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2434 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2435 (interactive "BCopy to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2436 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2437 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2438 (set-buffer (get-buffer-create buffer))
24973
57d2a2f294cb (append-to-buffer, prepend-to-buffer, copy-to-buffer): Check for
Dave Love <fx@gnu.org>
parents: 24831
diff changeset
2439 (barf-if-buffer-read-only)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2440 (erase-buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2441 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2442 (insert-buffer-substring oldbuf start end)))))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2443
4040
d06d7295d3eb Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents: 3967
diff changeset
2444 (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
2445 (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
2446
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2447 (defun mark (&optional force)
3487
8c151ebeff9c (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3467
diff changeset
2448 "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
2449 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
2450 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
2451 if there is no mark at all.
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2452
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2453 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
2454 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
2455 (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
2456 (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
2457 (signal 'mark-inactive nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2458
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2459 ;; 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
2460 ;; run deactivate-mark-hook. This shorthand should simplify.
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2461 (defsubst deactivate-mark ()
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2462 "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
2463 \(That makes a difference only in Transient Mark mode.)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2464 Also runs the hook `deactivate-mark-hook'."
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2465 (cond
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2466 ((eq transient-mark-mode 'lambda)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2467 (setq transient-mark-mode nil))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2468 (transient-mark-mode
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2469 (setq mark-active nil)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2470 (run-hooks 'deactivate-mark-hook))))
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2471
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2472 (defun set-mark (pos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2473 "Set this buffer's mark to POS. Don't use this function!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2474 That is to say, don't use this function unless you want
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2475 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
2476 mark position to be lost.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2477
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2478 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
2479 This is why most applications should use push-mark, not set-mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2480
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2481 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
2482 purposes. The mark saves a location for the user's convenience.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2483 Most editing commands should not alter the mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2484 To remember a location for internal use in the Lisp program,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2485 store it in a Lisp variable. Example:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2486
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2487 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2488
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
2489 (if pos
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
2490 (progn
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
2491 (setq mark-active t)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
2492 (run-hooks 'activate-mark-hook)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
2493 (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
2494 ;; 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
2495 ;; 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
2496 ;; 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
2497 (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
2498 (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
2499 (set-marker (mark-marker) nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2500
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2501 (defvar mark-ring nil
8695
0f702e9ab06d (mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8660
diff changeset
2502 "The list of former marks of the current buffer, most recent first.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2503 (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
2504 (put 'mark-ring 'permanent-local t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2505
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2506 (defcustom mark-ring-max 16
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2507 "*Maximum size of mark ring. Start discarding off end if gets this big."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2508 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2509 :group 'editing-basics)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2510
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2511 (defvar global-mark-ring nil
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2512 "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
2513
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2514 (defcustom global-mark-ring-max 16
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2515 "*Maximum size of global mark ring. \
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2516 Start discarding off end if gets this big."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2517 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2518 :group 'editing-basics)
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2519
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2520 (defun pop-to-mark-command ()
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2521 "Jump to mark, and pop a new position for mark off the ring
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2522 \(does not affect global mark ring\)."
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2523 (interactive)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2524 (if (null (mark t))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2525 (error "No mark set in this buffer")
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2526 (goto-char (mark t))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2527 (pop-mark)))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2528
45540
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
2529 (defun push-mark-command (arg &optional nomsg)
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2530 "Set mark at where point is.
45540
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
2531 If no prefix arg and mark is already set there, just activate it.
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
2532 Display `Mark set' unless the optional second arg NOMSG is non-nil."
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2533 (interactive "P")
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2534 (let ((mark (marker-position (mark-marker))))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2535 (if (or arg (null mark) (/= mark (point)))
45540
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
2536 (push-mark nil nomsg t)
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2537 (setq mark-active t)
45540
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
2538 (unless nomsg
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
2539 (message "Mark activated")))))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2540
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2541 (defun set-mark-command (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2542 "Set mark at where point is, or jump to mark.
50251
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2543 With no prefix argument, set mark, and push old mark position on local
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2544 mark ring; also push mark on global mark ring if last mark was set in
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2545 another buffer. Immediately repeating the command activates
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2546 `transient-mark-mode' temporarily.
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2547
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2548 With argument, e.g. \\[universal-argument] \\[set-mark-command], \
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2549 jump to mark, and pop a new position
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2550 for mark off the local mark ring \(this does not affect the global
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2551 mark ring\). Use \\[pop-global-mark] to jump to a mark off the global
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2552 mark ring \(see `pop-global-mark'\).
50292
24db6dc3fc9e Rework last change so C-x C-SPC C-SPC does not
Kim F. Storm <storm@cua.dk>
parents: 50251
diff changeset
2553
50383
2018e9013e52 (pop-global-mark-quick-repeat): Remove defcustom.
Kim F. Storm <storm@cua.dk>
parents: 50292
diff changeset
2554 Repeating the \\[set-mark-command] command without the prefix jumps to
2018e9013e52 (pop-global-mark-quick-repeat): Remove defcustom.
Kim F. Storm <storm@cua.dk>
parents: 50292
diff changeset
2555 the next position off the local (or global) mark ring.
50251
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2556
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2557 With a double \\[universal-argument] prefix argument, e.g. \\[universal-argument] \
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2558 \\[universal-argument] \\[set-mark-command], unconditionally
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2559 set mark where point is.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2560
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2561 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
2562 purposes. See the documentation of `set-mark' for more information."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2563 (interactive "P")
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2564 (if (eq transient-mark-mode 'lambda)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2565 (setq transient-mark-mode nil))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2566 (cond
50292
24db6dc3fc9e Rework last change so C-x C-SPC C-SPC does not
Kim F. Storm <storm@cua.dk>
parents: 50251
diff changeset
2567 ((and (consp arg) (> (prefix-numeric-value arg) 4))
24db6dc3fc9e Rework last change so C-x C-SPC C-SPC does not
Kim F. Storm <storm@cua.dk>
parents: 50251
diff changeset
2568 (push-mark-command nil))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2569 ((not (eq this-command 'set-mark-command))
44664
92b336df72b8 (pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents: 44586
diff changeset
2570 (if arg
92b336df72b8 (pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents: 44586
diff changeset
2571 (pop-to-mark-command)
92b336df72b8 (pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents: 44586
diff changeset
2572 (push-mark-command t)))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2573 ((eq last-command 'pop-to-mark-command)
50251
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2574 (setq this-command 'pop-to-mark-command)
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2575 (pop-to-mark-command))
50383
2018e9013e52 (pop-global-mark-quick-repeat): Remove defcustom.
Kim F. Storm <storm@cua.dk>
parents: 50292
diff changeset
2576 ((and (eq last-command 'pop-global-mark) (not arg))
50251
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2577 (setq this-command 'pop-global-mark)
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
2578 (pop-global-mark))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2579 (arg
44664
92b336df72b8 (pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents: 44586
diff changeset
2580 (setq this-command 'pop-to-mark-command)
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2581 (pop-to-mark-command))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2582 ((and (eq last-command 'set-mark-command)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2583 mark-active (null transient-mark-mode))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2584 (setq transient-mark-mode 'lambda)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2585 (message "Transient-mark-mode temporarily enabled"))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2586 (t
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2587 (push-mark-command nil))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2588
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2589 (defun push-mark (&optional location nomsg activate)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2590 "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
2591 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
2592 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
2593 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
2594 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
2595
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2596 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
2597 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
2598
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
2599 In Transient Mark mode, this does not activate the mark."
52046
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2600 (unless (null (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2601 (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring))
52046
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2602 (when (> (length mark-ring) mark-ring-max)
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2603 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil)
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2604 (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
2605 (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
2606 ;; 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
2607 (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
2608 (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
2609 ;; 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
2610 ;; 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
2611 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
2612 (setq global-mark-ring (cons (copy-marker (mark-marker)) global-mark-ring))
52046
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2613 (when (> (length global-mark-ring) global-mark-ring-max)
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2614 (move-marker (car (nthcdr global-mark-ring-max global-mark-ring)) nil)
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2615 (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
2616 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2617 (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
2618 (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
2619 (set-mark (mark t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2620 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2621
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2622 (defun pop-mark ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2623 "Pop off mark ring into the buffer's actual mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2624 Does not set point. Does nothing if mark ring is empty."
52046
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2625 (when mark-ring
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2626 (setq mark-ring (nconc mark-ring (list (copy-marker (mark-marker)))))
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2627 (set-marker (mark-marker) (+ 0 (car mark-ring)) (current-buffer))
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2628 (deactivate-mark)
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2629 (move-marker (car mark-ring) nil)
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2630 (if (null (mark t)) (ding))
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
2631 (setq mark-ring (cdr mark-ring))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2632
16436
d2acc84badf4 Use defalias not define-function.
Richard M. Stallman <rms@gnu.org>
parents: 16417
diff changeset
2633 (defalias 'exchange-dot-and-mark 'exchange-point-and-mark)
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2634 (defun exchange-point-and-mark (&optional arg)
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2635 "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
2636 This command works even when the mark is not active,
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2637 and it reactivates the mark.
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2638 With prefix arg, `transient-mark-mode' is enabled temporarily."
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2639 (interactive "P")
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2640 (if arg
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
2641 (if mark-active
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2642 (if (null transient-mark-mode)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2643 (setq transient-mark-mode 'lambda))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2644 (setq arg nil)))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2645 (unless arg
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2646 (let ((omark (mark t)))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2647 (if (null omark)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2648 (error "No mark set in this buffer"))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2649 (set-mark (point))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2650 (goto-char omark)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
2651 nil)))
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
2652
47408
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
2653 (define-minor-mode transient-mark-mode
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
2654 "Toggle Transient Mark mode.
2935
653e14f61220 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 2850
diff changeset
2655 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
2656
5372
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
2657 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
2658 Changing the buffer \"deactivates\" the mark.
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
2659 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
2660 but whose main purpose is something else--for example,
35631
bc0a3dbd22f6 (transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents: 35589
diff changeset
2661 incremental search, \\[beginning-of-buffer], and \\[end-of-buffer].
bc0a3dbd22f6 (transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents: 35589
diff changeset
2662
37092
c365952bf534 (transient-mark-mode): Mention ESC ESC ESC in the doc string as well.
Eli Zaretskii <eliz@gnu.org>
parents: 37074
diff changeset
2663 You can also deactivate the mark by typing \\[keyboard-quit] or
c365952bf534 (transient-mark-mode): Mention ESC ESC ESC in the doc string as well.
Eli Zaretskii <eliz@gnu.org>
parents: 37074
diff changeset
2664 \\[keyboard-escape-quit].
37074
43067b78ec71 (transient-mark-mode): Mention C-g in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents: 36668
diff changeset
2665
35631
bc0a3dbd22f6 (transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents: 35589
diff changeset
2666 Many commands change their behavior when Transient Mark mode is in effect
bc0a3dbd22f6 (transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents: 35589
diff changeset
2667 and the mark is active, by acting on the region instead of their usual
35652
26d2f0a7687d (transient-mark-mode): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35635
diff changeset
2668 default part of the buffer's text. Examples of such commands include
35631
bc0a3dbd22f6 (transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents: 35589
diff changeset
2669 \\[comment-dwim], \\[flush-lines], \\[ispell], \\[keep-lines],
bc0a3dbd22f6 (transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents: 35589
diff changeset
2670 \\[query-replace], \\[query-replace-regexp], and \\[undo]. Invoke
35635
11e5d55ea163 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 35631
diff changeset
2671 \\[apropos-documentation] and type \"transient\" or \"mark.*active\" at
11e5d55ea163 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 35631
diff changeset
2672 the prompt, to see the documentation of commands which are sensitive to
11e5d55ea163 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 35631
diff changeset
2673 the Transient Mark mode."
47464
b8282a873821 (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47462
diff changeset
2674 :global t :group 'editing-basics :require nil)
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2675
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2676 (defun pop-global-mark ()
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2677 "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
2678 (interactive)
7881
4ab8723cd491 (pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents: 7877
diff changeset
2679 ;; 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
2680 (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
2681 (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
2682 (or global-mark-ring
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2683 (error "No global mark set"))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2684 (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
2685 (buffer (marker-buffer marker))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2686 (position (marker-position marker)))
10351
e34cbd5276bd (pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents: 10284
diff changeset
2687 (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
2688 (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
2689 (set-buffer buffer)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2690 (or (and (>= position (point-min))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2691 (<= position (point-max)))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2692 (widen))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2693 (goto-char position)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
2694 (switch-to-buffer buffer)))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2695
34101
559c35839090 (next-line-add-newlines): Change default to nil.
Gerd Moellmann <gerd@gnu.org>
parents: 34071
diff changeset
2696 (defcustom next-line-add-newlines nil
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2697 "*If non-nil, `next-line' inserts newline to avoid `end of buffer' error."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2698 :type 'boolean
35333
ac14700e2c6b (next-line-add-newlines): Add :version.
Dave Love <fx@gnu.org>
parents: 35327
diff changeset
2699 :version "21.1"
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2700 :group 'editing-basics)
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
2701
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
2702 (defun next-line (&optional arg)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2703 "Move cursor vertically down ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2704 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
2705 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2706 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
2707 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
2708 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
2709 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
2710 cursor to the end of the buffer.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2711
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2712 The command \\[set-goal-column] can be used to create
18593
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2713 a semipermanent goal column for this command.
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2714 Then instead of trying to move exactly vertically (or as close as possible),
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2715 this command moves to the specified goal column (or as close as possible).
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2716 The goal column is stored in the variable `goal-column', which is nil
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2717 when there is no goal column.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2718
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2719 If you are thinking of using this in a Lisp program, consider
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2720 using `forward-line' instead. It is usually easier to use
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2721 and more reliable (no dependence on goal column, etc.)."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2722 (interactive "p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
2723 (or arg (setq arg 1))
5675
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
2724 (if (and next-line-add-newlines (= arg 1))
35589
e334380bbb2c (next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents: 35346
diff changeset
2725 (if (save-excursion (end-of-line) (eobp))
e334380bbb2c (next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents: 35346
diff changeset
2726 ;; When adding a newline, don't expand an abbrev.
e334380bbb2c (next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents: 35346
diff changeset
2727 (let ((abbrev-mode nil))
35886
65f3042831db (next-line): Goto end-of-line before inserting a newline.
Gerd Moellmann <gerd@gnu.org>
parents: 35776
diff changeset
2728 (end-of-line)
65f3042831db (next-line): Goto end-of-line before inserting a newline.
Gerd Moellmann <gerd@gnu.org>
parents: 35776
diff changeset
2729 (insert "\n"))
35589
e334380bbb2c (next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents: 35346
diff changeset
2730 (line-move arg))
10226
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2731 (if (interactive-p)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2732 (condition-case nil
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2733 (line-move arg)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2734 ((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
2735 (line-move arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2736 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2737
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
2738 (defun previous-line (&optional arg)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2739 "Move cursor vertically up ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2740 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
2741 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2742 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
2743
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2744 The command \\[set-goal-column] can be used to create
18593
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2745 a semipermanent goal column for this command.
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2746 Then instead of trying to move exactly vertically (or as close as possible),
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2747 this command moves to the specified goal column (or as close as possible).
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2748 The goal column is stored in the variable `goal-column', which is nil
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
2749 when there is no goal column.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2750
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2751 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
2752 `forward-line' with a negative argument instead. It is usually easier
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2753 to use and more reliable (no dependence on goal column, etc.)."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2754 (interactive "p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
2755 (or arg (setq arg 1))
10226
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2756 (if (interactive-p)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2757 (condition-case nil
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2758 (line-move (- arg))
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
2759 ((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
2760 (line-move (- arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2761 nil)
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
2762
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2763 (defcustom track-eol nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2764 "*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
2765 This means moving to the end of each line moved onto.
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2766 The beginning of a blank line does not count as the end of a line."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2767 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2768 :group 'editing-basics)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2769
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2770 (defcustom goal-column nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2771 "*Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2772 :type '(choice integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2773 (const :tag "None" nil))
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2774 :group 'editing-basics)
1466
04b4499061fd (goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents: 1459
diff changeset
2775 (make-variable-buffer-local 'goal-column)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2776
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2777 (defvar temporary-goal-column 0
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2778 "Current goal column for vertical motion.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2779 It is the column where point was
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2780 at the start of current run of vertical motion commands.
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
2781 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
2782
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2783 (defcustom line-move-ignore-invisible nil
10949
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
2784 "*Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines.
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2785 Outline mode sets this."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2786 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2787 :group 'editing-basics)
10949
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
2788
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2789 (defun line-move-invisible (pos)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2790 "Return non-nil if the character after POS is currently invisible."
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2791 (let ((prop
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2792 (get-char-property pos 'invisible)))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2793 (if (eq buffer-invisibility-spec t)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2794 prop
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2795 (or (memq prop buffer-invisibility-spec)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2796 (assq prop buffer-invisibility-spec)))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2797
11326
0d5ebc078c51 (line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents: 11324
diff changeset
2798 ;; 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
2799 ;; Arg says how many lines to move.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2800 (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
2801 ;; 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
2802 ;; for intermediate positions.
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2803 (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
2804 (opoint (point))
19003
9d24caacda44 (line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents: 18902
diff changeset
2805 new line-end line-beg)
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2806 (unwind-protect
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2807 (progn
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
2808 (if (not (memq last-command '(next-line previous-line)))
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2809 (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
2810 (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
2811 ;; 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
2812 ;; 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
2813 (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
2814 9999
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2815 (current-column))))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2816 (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
2817 (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
2818 ;; Use just newline characters.
42691
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2819 ;; Set ARG to 0 if we move as many lines as requested.
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2820 (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
2821 (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
2822 ;; 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
2823 ;; 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
2824 ;; 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
2825 (end-of-line)
42691
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2826 (if (zerop (forward-line 1))
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2827 (setq arg 0)))
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2828 (and (zerop (forward-line arg))
42691
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2829 (bolp)
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2830 (setq arg 0)))
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2831 (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
2832 'beginning-of-buffer
42691
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2833 'end-of-buffer)
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2834 nil))
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2835 ;; 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
2836 (while (> arg 0)
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2837 ;; If the following character is currently invisible,
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2838 ;; skip all characters with that same `invisible' property value.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2839 (while (and (not (eobp)) (line-move-invisible (point)))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2840 (goto-char (next-char-property-change (point))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2841 ;; Now move a line.
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2842 (end-of-line)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2843 (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
2844 (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
2845 (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
2846 (while (< arg 0)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2847 (beginning-of-line)
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
2848 (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
2849 (signal 'beginning-of-buffer nil))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2850 (setq arg (1+ arg))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2851 (while (and (not (bobp)) (line-move-invisible (1- (point))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2852 (goto-char (previous-char-property-change (point)))))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2853
42691
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2854 (cond ((> arg 0)
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2855 ;; If we did not move down as far as desired,
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2856 ;; at least go to end of line.
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2857 (end-of-line))
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2858 ((< arg 0)
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2859 ;; If we did not move down as far as desired,
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2860 ;; at least go to end of line.
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2861 (beginning-of-line))
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2862 (t
b9928a414b19 (line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents: 42660
diff changeset
2863 (line-move-finish (or goal-column temporary-goal-column) opoint)))))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2864 nil)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2865
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2866 (defun line-move-finish (column opoint)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2867 (let ((repeat t))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2868 (while repeat
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2869 ;; Set REPEAT to t to repeat the whole thing.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2870 (setq repeat nil)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2871
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2872 (let (new
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2873 (line-beg (save-excursion (beginning-of-line) (point)))
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2874 (line-end
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2875 ;; Compute the end of the line
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2876 ;; ignoring effectively intangible newlines.
45730
93ebda6f1155 (line-move-finish): Inhibit field motion when computing `line-end'.
Miles Bader <miles@gnu.org>
parents: 45637
diff changeset
2877 (let ((inhibit-point-motion-hooks nil)
93ebda6f1155 (line-move-finish): Inhibit field motion when computing `line-end'.
Miles Bader <miles@gnu.org>
parents: 45637
diff changeset
2878 (inhibit-field-text-motion t))
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2879 (save-excursion (end-of-line) (point)))))
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2880
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2881 ;; Move to the desired column.
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2882 (line-move-to-column column)
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2883 (setq new (point))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2884
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2885 ;; Process intangibility within a line.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2886 ;; Move to the chosen destination position from above,
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2887 ;; with intangibility processing enabled.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2888
19003
9d24caacda44 (line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents: 18902
diff changeset
2889 (goto-char (point-min))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2890 (let ((inhibit-point-motion-hooks nil))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2891 (goto-char new)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2892
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2893 ;; If intangibility moves us to a different (later) place
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2894 ;; in the same line, use that as the destination.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2895 (if (<= (point) line-end)
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2896 (setq new (point))
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2897 ;; If that position is "too late",
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2898 ;; try the previous allowable position.
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2899 ;; See if it is ok.
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2900 (backward-char)
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2901 (if (<= (point) line-end)
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2902 (setq new (point))
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2903 ;; As a last resort, use the end of the line.
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2904 (setq new line-end))))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2905
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2906 ;; Now move to the updated destination, processing fields
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2907 ;; as well as intangibility.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2908 (goto-char opoint)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2909 (let ((inhibit-point-motion-hooks nil))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2910 (goto-char
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2911 (constrain-to-field new opoint nil t
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2912 'inhibit-line-move-field-capture)))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2913
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
2914 ;; If all this moved us to a different line,
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2915 ;; retry everything within that new line.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2916 (when (or (< (point) line-beg) (> (point) line-end))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2917 ;; Repeat the intangibility and field processing.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2918 (setq repeat t))))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2919
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2920 (defun line-move-to-column (col)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2921 "Try to find column COL, considering invisibility.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2922 This function works only in certain cases,
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2923 because what we really need is for `move-to-column'
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2924 and `current-column' to be able to ignore invisible text."
44208
7213f46c80a0 (line-move-to-column): Don't call move-to-column if COL=0.
Richard M. Stallman <rms@gnu.org>
parents: 44152
diff changeset
2925 (if (zerop col)
7213f46c80a0 (line-move-to-column): Don't call move-to-column if COL=0.
Richard M. Stallman <rms@gnu.org>
parents: 44152
diff changeset
2926 (beginning-of-line)
7213f46c80a0 (line-move-to-column): Don't call move-to-column if COL=0.
Richard M. Stallman <rms@gnu.org>
parents: 44152
diff changeset
2927 (move-to-column col))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2928
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2929 (when (and line-move-ignore-invisible
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2930 (not (bolp)) (line-move-invisible (1- (point))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2931 (let ((normal-location (point))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2932 (normal-column (current-column)))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2933 ;; If the following character is currently invisible,
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2934 ;; skip all characters with that same `invisible' property value.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2935 (while (and (not (eobp))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2936 (line-move-invisible (point)))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2937 (goto-char (next-char-property-change (point))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2938 ;; Have we advanced to a larger column position?
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2939 (if (> (current-column) normal-column)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2940 ;; We have made some progress towards the desired column.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2941 ;; See if we can make any further progress.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2942 (line-move-to-column (+ (current-column) (- col normal-column)))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2943 ;; Otherwise, go to the place we originally found
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2944 ;; and move back over invisible text.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2945 ;; that will get us to the same place on the screen
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2946 ;; but with a more reasonable buffer position.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2947 (goto-char normal-location)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2948 (let ((line-beg (save-excursion (beginning-of-line) (point))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2949 (while (and (not (bolp)) (line-move-invisible (1- (point))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
2950 (goto-char (previous-char-property-change (point) line-beg))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2951
1771
3f0f18d4eb8c * simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents: 1760
diff changeset
2952 ;;; 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
2953 ;;; 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
2954 (put 'set-goal-column 'disabled t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2955
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2956 (defun set-goal-column (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2957 "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
2958 Those commands will move to this position in the line moved to
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2959 rather than trying to keep the same horizontal position.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2960 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
2961 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
2962 The goal column is stored in the variable `goal-column'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2963 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2964 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2965 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2966 (setq goal-column nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2967 (message "No goal column"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2968 (setq goal-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2969 (message (substitute-command-keys
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2970 "Goal column %d (use \\[set-goal-column] with an arg to unset it)")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2971 goal-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2972 nil)
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2973
8006
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2974
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2975 (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
2976 "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
2977 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
2978 (interactive "P")
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2979 (scroll-other-window
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2980 ;; Just invert the argument's meaning.
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2981 ;; 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
2982 (if (eq lines '-) nil
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2983 (if (null lines) '-
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2984 (- (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
2985 (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
2986
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2987 (defun beginning-of-buffer-other-window (arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2988 "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
2989 Leave mark at previous position.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2990 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
2991 (interactive "P")
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2992 (let ((orig-window (selected-window))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2993 (window (other-window-for-scrolling)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2994 ;; 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
2995 ;; 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
2996 (unwind-protect
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2997 (progn
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2998 (select-window window)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
2999 ;; 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
3000 (beginning-of-buffer arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3001 ;; Set point accordingly.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3002 (recenter '(t)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3003 (select-window orig-window))))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3004
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3005 (defun end-of-buffer-other-window (arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3006 "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
3007 Leave mark at previous position.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3008 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
3009 (interactive "P")
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3010 ;; See beginning-of-buffer-other-window for comments.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3011 (let ((orig-window (selected-window))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3012 (window (other-window-for-scrolling)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3013 (unwind-protect
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3014 (progn
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3015 (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
3016 (end-of-buffer arg)
8057
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3017 (recenter '(t)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3018 (select-window orig-window))))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3019
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3020 (defun transpose-chars (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3021 "Interchange characters around point, moving forward one character.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3022 With prefix arg ARG, effect is to take character before point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3023 and drag it forward past ARG other characters (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3024 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
3025 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3026 (and (null arg) (eolp) (forward-char -1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3027 (transpose-subr 'forward-char (prefix-numeric-value arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3028
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3029 (defun transpose-words (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3030 "Interchange words around point, leaving point at end of them.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3031 With prefix arg ARG, effect is to take word before or around point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3032 and drag it forward past ARG other words (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3033 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
3034 are interchanged."
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3035 ;; FIXME: `foo a!nd bar' should transpose into `bar and foo'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3036 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3037 (transpose-subr 'forward-word arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3038
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3039 (defun transpose-sexps (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3040 "Like \\[transpose-words] but applies to sexps.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3041 Does not work on a sexp that point is in the middle of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3042 if it is a list or string."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3043 (interactive "*p")
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3044 (transpose-subr
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3045 (lambda (arg)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3046 ;; Here we should try to simulate the behavior of
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3047 ;; (cons (progn (forward-sexp x) (point))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3048 ;; (progn (forward-sexp (- x)) (point)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3049 ;; Except that we don't want to rely on the second forward-sexp
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3050 ;; putting us back to where we want to be, since forward-sexp-function
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3051 ;; might do funny things like infix-precedence.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3052 (if (if (> arg 0)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3053 (looking-at "\\sw\\|\\s_")
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3054 (and (not (bobp))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3055 (save-excursion (forward-char -1) (looking-at "\\sw\\|\\s_"))))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3056 ;; Jumping over a symbol. We might be inside it, mind you.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3057 (progn (funcall (if (> arg 0)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3058 'skip-syntax-backward 'skip-syntax-forward)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3059 "w_")
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3060 (cons (save-excursion (forward-sexp arg) (point)) (point)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3061 ;; Otherwise, we're between sexps. Take a step back before jumping
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3062 ;; to make sure we'll obey the same precedence no matter which direction
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3063 ;; we're going.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3064 (funcall (if (> arg 0) 'skip-syntax-backward 'skip-syntax-forward) " .")
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3065 (cons (save-excursion (forward-sexp arg) (point))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3066 (progn (while (or (forward-comment (if (> arg 0) 1 -1))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3067 (not (zerop (funcall (if (> arg 0)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3068 'skip-syntax-forward
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3069 'skip-syntax-backward)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3070 ".")))))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3071 (point)))))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3072 arg 'special))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3073
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3074 (defun transpose-lines (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3075 "Exchange current line and previous line, leaving point after both.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3076 With argument ARG, takes previous line and moves it past ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3077 With argument 0, interchanges line point is in with line mark is in."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3078 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3079 (transpose-subr (function
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3080 (lambda (arg)
20465
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3081 (if (> arg 0)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3082 (progn
20465
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3083 ;; Move forward over ARG lines,
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3084 ;; but create newlines if necessary.
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3085 (setq arg (forward-line arg))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3086 (if (/= (preceding-char) ?\n)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3087 (setq arg (1+ arg)))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3088 (if (> arg 0)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3089 (newline arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3090 (forward-line arg))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3091 arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3092
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3093 (defun transpose-subr (mover arg &optional special)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3094 (let ((aux (if special mover
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3095 (lambda (x)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3096 (cons (progn (funcall mover x) (point))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3097 (progn (funcall mover (- x)) (point))))))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3098 pos1 pos2)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3099 (cond
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3100 ((= arg 0)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3101 (save-excursion
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3102 (setq pos1 (funcall aux 1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3103 (goto-char (mark))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3104 (setq pos2 (funcall aux 1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3105 (transpose-subr-1 pos1 pos2))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3106 (exchange-point-and-mark))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3107 ((> arg 0)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3108 (setq pos1 (funcall aux -1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3109 (setq pos2 (funcall aux arg))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3110 (transpose-subr-1 pos1 pos2)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3111 (goto-char (car pos2)))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3112 (t
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3113 (setq pos1 (funcall aux -1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3114 (goto-char (car pos1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3115 (setq pos2 (funcall aux arg))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3116 (transpose-subr-1 pos1 pos2)))))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3117
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3118 (defun transpose-subr-1 (pos1 pos2)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3119 (when (> (car pos1) (cdr pos1)) (setq pos1 (cons (cdr pos1) (car pos1))))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3120 (when (> (car pos2) (cdr pos2)) (setq pos2 (cons (cdr pos2) (car pos2))))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3121 (when (> (car pos1) (car pos2))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3122 (let ((swap pos1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3123 (setq pos1 pos2 pos2 swap)))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3124 (if (> (cdr pos1) (car pos2)) (error "Don't have two things to transpose"))
43125
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
3125 (atomic-change-group
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
3126 (let (word2)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
3127 ;; FIXME: We first delete the two pieces of text, so markers that
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
3128 ;; used to point to after the text end up pointing to before it :-(
43125
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
3129 (setq word2 (delete-and-extract-region (car pos2) (cdr pos2)))
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
3130 (goto-char (car pos2))
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
3131 (insert (delete-and-extract-region (car pos1) (cdr pos1)))
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
3132 (goto-char (car pos1))
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
3133 (insert word2))))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3134
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
3135 (defun backward-word (&optional arg)
39110
9e2ff77fc88a (backward-word): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 39039
diff changeset
3136 "Move backward until encountering the beginning of a word.
32222
ae7e7e548bf3 (backward-word): Doc fix.
Dave Love <fx@gnu.org>
parents: 32203
diff changeset
3137 With argument, do this that many times."
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
3138 (interactive "p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
3139 (forward-word (- (or arg 1))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3140
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3141 (defun mark-word (arg)
43301
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3142 "Set mark arg words away from point.
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3143 If this command is repeated, it marks the next ARG words after the ones
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3144 already marked."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3145 (interactive "p")
43301
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3146 (cond ((and (eq last-command this-command) (mark t))
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3147 (set-mark
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3148 (save-excursion
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3149 (goto-char (mark))
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3150 (forward-word arg)
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3151 (point))))
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3152 (t
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3153 (push-mark
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3154 (save-excursion
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3155 (forward-word arg)
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3156 (point))
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3157 nil t))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3158
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3159 (defun kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3160 "Kill characters forward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3161 With argument, do this that many times."
27836
132294fa754e (zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents: 27477
diff changeset
3162 (interactive "p")
25400
c75839c09c84 (kill-word): Undo previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 25342
diff changeset
3163 (kill-region (point) (progn (forward-word arg) (point))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3164
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3165 (defun backward-kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3166 "Kill characters backward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3167 With argument, do this that many times."
27836
132294fa754e (zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents: 27477
diff changeset
3168 (interactive "p")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3169 (kill-word (- arg)))
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
3170
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3171 (defun current-word (&optional strict really-word)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3172 "Return the symbol or word that point is on (or a nearby one) as a string.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3173 The return value includes no text properties.
6174
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
3174 If optional arg STRICT is non-nil, return nil unless point is within
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3175 or adjacent to a symbol or word.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3176 The function, belying its name, normally finds a symbol.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3177 If optional arg REALLY-WORD is non-nil, it finds just a word."
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
3178 (save-excursion
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3179 (let* ((oldpoint (point)) (start (point)) (end (point))
51957
af9092ef950b (current-word): Don't include punctuation char when
John Paul Wallington <jpw@pobox.com>
parents: 51802
diff changeset
3180 (syntaxes (if really-word "w" "w_"))
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3181 (not-syntaxes (concat "^" syntaxes)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3182 (skip-syntax-backward syntaxes) (setq start (point))
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
3183 (goto-char oldpoint)
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3184 (skip-syntax-forward syntaxes) (setq end (point))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3185 (when (and (eq start oldpoint) (eq end oldpoint)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3186 ;; Point is neither within nor adjacent to a word.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3187 (not strict))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3188 ;; Look for preceding word in same line.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3189 (skip-syntax-backward not-syntaxes
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3190 (save-excursion (beginning-of-line)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3191 (point)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3192 (if (bolp)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3193 ;; No preceding word in same line.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3194 ;; Look for following word in same line.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3195 (progn
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3196 (skip-syntax-forward not-syntaxes
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3197 (save-excursion (end-of-line)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3198 (point)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3199 (setq start (point))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3200 (skip-syntax-forward syntaxes)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3201 (setq end (point)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3202 (setq end (point))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3203 (skip-syntax-backward syntaxes)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3204 (setq start (point))))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3205 ;; If we found something nonempty, return it as a string.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3206 (unless (= start end)
18379
1dd6f63f0ea3 (paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18334
diff changeset
3207 (buffer-substring-no-properties start end)))))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3208
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3209 (defcustom fill-prefix nil
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3210 "*String for filling to insert at front of new line, or nil for none."
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3211 :type '(choice (const :tag "None" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3212 string)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3213 :group 'fill)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3214 (make-variable-buffer-local 'fill-prefix)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3215
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3216 (defcustom auto-fill-inhibit-regexp nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3217 "*Regexp to match lines which should not be auto-filled."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3218 :type '(choice (const :tag "None" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3219 regexp)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3220 :group 'fill)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3221
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3222 (defvar comment-line-break-function 'comment-indent-new-line
19160
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3223 "*Mode-specific function which line breaks and continues a comment.
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3224
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3225 This function is only called during auto-filling of a comment section.
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3226 The function should take a single optional argument, which is a flag
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3227 indicating whether it should use soft newlines.
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3228
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3229 Setting this variable automatically makes it local to the current buffer.")
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3230
21122
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
3231 ;; This function is used as the auto-fill-function of a buffer
15263
0d7899c372ed (do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents: 15115
diff changeset
3232 ;; 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
3233 ;; It returns t if it really did any work.
21122
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
3234 ;; (Actually some major modes use a different auto-fill function,
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
3235 ;; but this one is the default one.)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3236 (defun do-auto-fill ()
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
3237 (let (fc justify bol give-up
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
3238 (fill-prefix fill-prefix))
10471
3eb77f03f53e (do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents: 10469
diff changeset
3239 (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
3240 (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
3241 (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
3242 (<= (current-column) fc))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3243 (save-excursion (beginning-of-line)
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
3244 (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
3245 (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
3246 (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
3247 nil ;; Auto-filling not required
10813
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
3248 (if (memq justify '(full center right))
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
3249 (save-excursion (unjustify-current-line)))
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
3250
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
3251 ;; Choose a fill-prefix automatically.
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3252 (when (and adaptive-fill-mode
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3253 (or (null fill-prefix) (string= fill-prefix "")))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3254 (let ((prefix
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3255 (fill-context-prefix
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3256 (save-excursion (backward-paragraph 1) (point))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3257 (save-excursion (forward-paragraph 1) (point)))))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3258 (and prefix (not (equal prefix ""))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3259 ;; Use auto-indentation rather than a guessed empty prefix.
47362
e1687eeb0232 (do-auto-fill): `fill-indent-according-to-mode' is a variable, not a
Miles Bader <miles@gnu.org>
parents: 47353
diff changeset
3260 (not (and fill-indent-according-to-mode
47346
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
3261 (string-match "\\`[ \t]*\\'" prefix)))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3262 (setq fill-prefix prefix))))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
3263
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
3264 (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
3265 ;; Determine where to split the line.
19343
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3266 (let* (after-prefix
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3267 (fill-point
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3268 (let ((opoint (point)))
19343
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3269 (save-excursion
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3270 (beginning-of-line)
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3271 (setq after-prefix (point))
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3272 (and fill-prefix
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3273 (looking-at (regexp-quote fill-prefix))
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3274 (setq after-prefix (match-end 0)))
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3275 (move-to-column (1+ fc))
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3276 (fill-move-to-break-point after-prefix)
19343
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3277 (point)))))
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3278
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3279 ;; See whether the place we found is any good.
12718
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
3280 (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
3281 (goto-char fill-point)
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3282 (or (bolp)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3283 ;; There is no use breaking at end of line.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3284 (save-excursion (skip-chars-forward " ") (eolp))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3285 ;; It is futile to split at the end of the prefix
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3286 ;; since we would just insert the prefix again.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3287 (and after-prefix (<= (point) after-prefix))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3288 ;; Don't split right after a comment starter
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3289 ;; since we would just make another comment starter.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3290 (and comment-start-skip
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3291 (let ((limit (point)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3292 (beginning-of-line)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3293 (and (re-search-forward comment-start-skip
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3294 limit t)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3295 (eq (point) limit))))))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3296 ;; No good place to break => stop trying.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3297 (setq give-up t)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3298 ;; Ok, we have a useful place to break the line. Do it.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3299 (let ((prev-column (current-column)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3300 ;; If point is at the fill-point, do not `save-excursion'.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3301 ;; Otherwise, if a comment prefix or fill-prefix is inserted,
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3302 ;; point will end up before it rather than after it.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3303 (if (save-excursion
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3304 (skip-chars-backward " \t")
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3305 (= (point) fill-point))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3306 (funcall comment-line-break-function t)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3307 (save-excursion
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3308 (goto-char fill-point)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3309 (funcall comment-line-break-function t)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3310 ;; Now do justification, if required
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3311 (if (not (eq justify 'left))
12718
0a8b4f086ffc (do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12708
diff changeset
3312 (save-excursion
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3313 (end-of-line 0)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3314 (justify-current-line justify nil t)))
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3315 ;; If making the new line didn't reduce the hpos of
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3316 ;; the end of the line, then give up now;
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3317 ;; trying again will not help.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3318 (if (>= (current-column) prev-column)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3319 (setq give-up t))))))
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
3320 ;; Justify last line.
15263
0d7899c372ed (do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents: 15115
diff changeset
3321 (justify-current-line justify t t)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3322 t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3323
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
3324 (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
3325 "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
3326 Some major modes set this.")
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
3327
47346
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
3328 ;; FIXME: turn into a proper minor mode.
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
3329 ;; Add a global minor mode version of it.
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3330 (defun auto-fill-mode (&optional arg)
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
3331 "Toggle Auto Fill mode.
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
3332 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
3333 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
3334 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
3335
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
3336 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
3337 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
3338 (interactive "P")
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3339 (prog1 (setq auto-fill-function
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3340 (if (if (null arg)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3341 (not auto-fill-function)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3342 (> (prefix-numeric-value arg) 0))
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
3343 normal-auto-fill-function
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3344 nil))
11572
09d49f6e0af9 (auto-fill-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents: 11479
diff changeset
3345 (force-mode-line-update)))
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3346
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3347 ;; 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
3348 (defun auto-fill-function ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3349 "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
3350 nil)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3351
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3352 (defun turn-on-auto-fill ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3353 "Unconditionally turn on Auto Fill mode."
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3354 (auto-fill-mode 1))
29808
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
3355
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
3356 (defun turn-off-auto-fill ()
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
3357 "Unconditionally turn off Auto Fill mode."
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
3358 (auto-fill-mode -1))
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
3359
24343
d00b069a7d17 (turn-on-auto-fill): Mark it as an option for `text-mode-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 24301
diff changeset
3360 (custom-add-option 'text-mode-hook 'turn-on-auto-fill)
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3361
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
3362 (defun set-fill-column (arg)
15431
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
3363 "Set `fill-column' to specified argument.
23447
7ccd43d053fd (set-fill-column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23251
diff changeset
3364 Use \\[universal-argument] followed by a number to specify a column.
15431
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
3365 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
3366 (interactive "P")
17874
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
3367 (if (consp arg)
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
3368 (setq arg (current-column)))
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
3369 (if (not (integerp arg))
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
3370 ;; Disallow missing argument; it's probably a typo for C-x C-f.
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
3371 (error "Set-fill-column requires an explicit argument")
17874
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
3372 (message "Fill column set to %d (was %d)" arg fill-column)
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
3373 (setq fill-column arg)))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3374
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3375 (defun set-selective-display (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3376 "Set `selective-display' to ARG; clear it if no arg.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3377 When the value of `selective-display' is a number > 0,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3378 lines whose indentation is >= that value are not displayed.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3379 The variable `selective-display' has a separate value for each buffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3380 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3381 (if (eq selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3382 (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
3383 (let ((current-vpos
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3384 (save-restriction
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3385 (narrow-to-region (point-min) (point))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3386 (goto-char (window-start))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3387 (vertical-motion (window-height)))))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3388 (setq selective-display
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3389 (and arg (prefix-numeric-value arg)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3390 (recenter current-vpos))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3391 (set-window-start (selected-window) (window-start (selected-window)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3392 (princ "selective-display set to " t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3393 (prin1 selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3394 (princ "." t))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3395
48406
e670dd0e8087 (indicate-unused-lines, default-indicate-unused-lines): New variable aliases.
Richard M. Stallman <rms@gnu.org>
parents: 48234
diff changeset
3396 (defvaralias 'indicate-unused-lines 'indicate-empty-lines)
e670dd0e8087 (indicate-unused-lines, default-indicate-unused-lines): New variable aliases.
Richard M. Stallman <rms@gnu.org>
parents: 48234
diff changeset
3397 (defvaralias 'default-indicate-unused-lines 'default-indicate-empty-lines)
e670dd0e8087 (indicate-unused-lines, default-indicate-unused-lines): New variable aliases.
Richard M. Stallman <rms@gnu.org>
parents: 48234
diff changeset
3398
46175
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
3399 (defun toggle-truncate-lines (arg)
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
3400 "Toggle whether to fold or truncate long lines on the screen.
46872
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
3401 With arg, truncate long lines iff arg is positive.
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
3402 Note that in side-by-side windows, truncation is always enabled."
46175
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
3403 (interactive "P")
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
3404 (setq truncate-lines
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
3405 (if (null arg)
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
3406 (not truncate-lines)
46872
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
3407 (> (prefix-numeric-value arg) 0)))
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
3408 (force-mode-line-update)
48013
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
3409 (unless truncate-lines
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
3410 (let ((buffer (current-buffer)))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
3411 (walk-windows (lambda (window)
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
3412 (if (eq buffer (window-buffer window))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
3413 (set-window-hscroll window 0)))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
3414 nil t)))
46872
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
3415 (message "Truncate long lines %s"
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
3416 (if truncate-lines "enabled" "disabled")))
46175
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
3417
17471
f383bfae3202 (overwrite-mode-binary, overwrite-mode-textual): Use defvar.
Richard M. Stallman <rms@gnu.org>
parents: 17355
diff changeset
3418 (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
3419 "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
3420 (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
3421 "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
3422
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3423 (defun overwrite-mode (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3424 "Toggle overwrite mode.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3425 With arg, turn overwrite mode on iff arg is positive.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3426 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
3427 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
3428 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
3429 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
3430 \\[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
3431 is supposed to make it easier to insert characters when necessary."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3432 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3433 (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
3434 (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
3435 (> (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
3436 '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
3437 (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
3438
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
3439 (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
3440 "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
3441 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
3442 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
3443 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
3444 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
3445 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
3446 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
3447 \\[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
3448 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
3449
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
3450 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
3451 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
3452 `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
3453 (interactive "P")
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
3454 (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
3455 (if (if (null arg)
2301
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3456 (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
3457 (> (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
3458 '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
3459 (force-mode-line-update))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
3460
47408
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
3461 (define-minor-mode line-number-mode
2301
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3462 "Toggle Line Number mode.
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
3463 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
3464 When Line Number mode is enabled, the line number appears
23660
68edff9e7389 (line-number-mode): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23588
diff changeset
3465 in the mode line.
68edff9e7389 (line-number-mode): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23588
diff changeset
3466
38908
f917490db0d6 (line-number-mode): Mention the variable line-number-display-limit-width
Eli Zaretskii <eliz@gnu.org>
parents: 38847
diff changeset
3467 Line numbers do not appear for very large buffers and buffers
f917490db0d6 (line-number-mode): Mention the variable line-number-display-limit-width
Eli Zaretskii <eliz@gnu.org>
parents: 38847
diff changeset
3468 with very long lines; see variables `line-number-display-limit'
f917490db0d6 (line-number-mode): Mention the variable line-number-display-limit-width
Eli Zaretskii <eliz@gnu.org>
parents: 38847
diff changeset
3469 and `line-number-display-limit-width'."
47464
b8282a873821 (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47462
diff changeset
3470 :init-value t :global t :group 'editing-basics :require nil)
47408
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
3471
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
3472 (define-minor-mode column-number-mode
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3473 "Toggle Column Number mode.
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
3474 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
3475 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
3476 in the mode line."
47464
b8282a873821 (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47462
diff changeset
3477 :global t :group 'editing-basics :require nil)
52464
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
3478
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
3479 (define-minor-mode size-indication-mode
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
3480 "Toggle Size Indication mode.
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
3481 With arg, turn Size Indication mode on iff arg is positive. When
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
3482 Size Indication mode is enabled, the size of the accessible part
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
3483 of the buffer appears in the mode line."
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
3484 :global t :group 'editing-basics :require nil)
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3485
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3486 (defgroup paren-blinking nil
18379
1dd6f63f0ea3 (paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18334
diff changeset
3487 "Blinking matching of parens and expressions."
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3488 :prefix "blink-matching-"
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3489 :group 'paren-matching)
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3490
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3491 (defcustom blink-matching-paren t
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3492 "*Non-nil means show matching open-paren when close-paren is inserted."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3493 :type 'boolean
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3494 :group 'paren-blinking)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3495
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3496 (defcustom blink-matching-paren-on-screen t
13810
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
3497 "*Non-nil means show matching open-paren when it is on screen.
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3498 If nil, means don't show it (but the open-paren can still be shown
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3499 when it is off screen)."
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3500 :type 'boolean
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3501 :group 'paren-blinking)
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3502
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3503 (defcustom blink-matching-paren-distance (* 25 1024)
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3504 "*If non-nil, is maximum distance to search for matching open-paren."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3505 :type 'integer
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3506 :group 'paren-blinking)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3507
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3508 (defcustom blink-matching-delay 1
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3509 "*Time in seconds to delay after showing a matching paren."
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3510 :type 'number
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3511 :group 'paren-blinking)
9771
3a51735d4a55 (blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9750
diff changeset
3512
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3513 (defcustom blink-matching-paren-dont-ignore-comments nil
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3514 "*Non-nil means `blink-matching-paren' will not ignore comments."
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3515 :type 'boolean
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
3516 :group 'paren-blinking)
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3517
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3518 (defun blink-matching-open ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3519 "Move cursor momentarily to the beginning of the sexp before point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3520 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3521 (and (> (point) (1+ (point-min)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3522 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
3523 ;; 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
3524 (= 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
3525 (save-excursion
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
3526 (forward-char -1)
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
3527 (skip-syntax-backward "/\\")
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
3528 (point)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3529 (let* ((oldpos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3530 (blinkpos)
52367
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3531 (mismatch)
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3532 matching-paren)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3533 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3534 (save-restriction
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3535 (if blink-matching-paren-distance
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3536 (narrow-to-region (max (point-min)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3537 (- (point) blink-matching-paren-distance))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3538 oldpos))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3539 (condition-case ()
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3540 (let ((parse-sexp-ignore-comments
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3541 (and parse-sexp-ignore-comments
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3542 (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
3543 (setq blinkpos (scan-sexps oldpos -1)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3544 (error nil)))
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3545 (and blinkpos
52367
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3546 (save-excursion
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3547 (goto-char blinkpos)
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3548 (not (looking-at "\\s$")))
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3549 (setq matching-paren
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3550 (or (and parse-sexp-lookup-properties
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3551 (let ((prop (get-text-property blinkpos 'syntax-table)))
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3552 (and (consp prop)
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3553 (eq (car prop) 4)
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3554 (cdr prop))))
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3555 (matching-paren (char-after blinkpos)))
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3556 mismatch
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3557 (or (null matching-paren)
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
3558 (/= (char-after (1- oldpos))
52367
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
3559 matching-paren))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3560 (if mismatch (setq blinkpos nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3561 (if blinkpos
23251
f19f44b54f00 (blink-matching-open): Don't log paren matching
Karl Heuer <kwzh@gnu.org>
parents: 22877
diff changeset
3562 ;; Don't log messages about paren matching.
f19f44b54f00 (blink-matching-open): Don't log paren matching
Karl Heuer <kwzh@gnu.org>
parents: 22877
diff changeset
3563 (let (message-log-max)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3564 (goto-char blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3565 (if (pos-visible-in-window-p)
13810
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
3566 (and blink-matching-paren-on-screen
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
3567 (sit-for blink-matching-delay))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3568 (goto-char blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3569 (message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3570 "Matches %s"
6539
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3571 ;; Show what precedes the open in its line, if anything.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3572 (if (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3573 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3574 (not (bolp)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3575 (buffer-substring (progn (beginning-of-line) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3576 (1+ blinkpos))
6539
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3577 ;; 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
3578 (if (save-excursion
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3579 (forward-char 1)
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3580 (skip-chars-forward " \t")
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3581 (not (eolp)))
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3582 (buffer-substring blinkpos
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
3583 (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
3584 ;; 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
3585 ;; if there is one.
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3586 (if (save-excursion
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3587 (skip-chars-backward "\n \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3588 (not (bobp)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3589 (concat
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3590 (buffer-substring (progn
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3591 (skip-chars-backward "\n \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3592 (beginning-of-line)
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3593 (point))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3594 (progn (end-of-line)
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3595 (skip-chars-backward " \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3596 (point)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3597 ;; 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
3598 "..."
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3599 (buffer-substring blinkpos (1+ blinkpos)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
3600 ;; 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
3601 (buffer-substring blinkpos (1+ blinkpos))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3602 (cond (mismatch
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3603 (message "Mismatched parentheses"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3604 ((not blink-matching-paren-distance)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3605 (message "Unmatched parenthesis"))))))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3606
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3607 ;Turned off because it makes dbx bomb out.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3608 (setq blink-paren-function 'blink-matching-open)
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3609
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
3610 ;; 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
3611 ;; 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
3612 ;; that happens in the QUIT macro at the C code level.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3613 (defun keyboard-quit ()
22304
f322afba9154 (keyboard-quit): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 22257
diff changeset
3614 "Signal a `quit' condition.
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
3615 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
3616 At top-level, as an editor command, this simply beeps."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3617 (interactive)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
3618 (deactivate-mark)
47353
6979a589f9c7 (keyboard-quit): Set defining-kbd-macro to nil to
Kim F. Storm <storm@cua.dk>
parents: 47346
diff changeset
3619 (setq defining-kbd-macro nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3620 (signal 'quit nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3621
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3622 (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
3623
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3624 (defvar buffer-quit-function nil
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3625 "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
3626 \\[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
3627 \(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
3628
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3629 (defun keyboard-escape-quit ()
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3630 "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
3631 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
3632 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
3633 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
3634 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
3635 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
3636 (interactive)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3637 (cond ((eq last-command 'mode-exited) nil)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3638 ((> (minibuffer-depth) 0)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3639 (abort-recursive-edit))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3640 (current-prefix-arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3641 nil)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3642 ((and transient-mark-mode
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3643 mark-active)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3644 (deactivate-mark))
17355
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
3645 ((> (recursion-depth) 0)
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
3646 (exit-recursive-edit))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3647 (buffer-quit-function
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3648 (funcall buffer-quit-function))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3649 ((not (one-window-p t))
17355
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
3650 (delete-other-windows))
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
3651 ((string-match "^ \\*" (buffer-name (current-buffer)))
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
3652 (bury-buffer))))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
3653
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3654 (defun play-sound-file (file &optional volume device)
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3655 "Play sound stored in FILE.
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3656 VOLUME and DEVICE correspond to the keywords of the sound
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3657 specification for `play-sound'."
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3658 (interactive "fPlay sound file: ")
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3659 (let ((sound (list :file file)))
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3660 (if volume
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3661 (plist-put sound :volume volume))
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3662 (if device
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3663 (plist-put sound :device device))
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3664 (push 'sound sound)
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3665 (play-sound sound)))
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3666
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3667 (define-key global-map "\e\e\e" 'keyboard-escape-quit)
26201
097072728e80 (input-mode-8-bit): New defcustom.
Dave Love <fx@gnu.org>
parents: 26063
diff changeset
3668
27234
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
3669 (defcustom read-mail-command 'rmail
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
3670 "*Your preference for a mail reading package.
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3671 This is used by some keybindings which support reading mail.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3672 See also `mail-user-agent' concerning sending mail."
27234
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
3673 :type '(choice (function-item rmail)
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
3674 (function-item gnus)
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
3675 (function-item mh-rmail)
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
3676 (function :tag "Other"))
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
3677 :version "21.1"
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
3678 :group 'mail)
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
3679
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3680 (defcustom mail-user-agent 'sendmail-user-agent
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3681 "*Your preference for a mail composition package.
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3682 Various Emacs Lisp packages (e.g. Reporter) require you to compose an
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3683 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
3684 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
3685
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3686 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
3687
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3688 `sendmail-user-agent' -- use the default Emacs Mail package.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3689 See Info node `(emacs)Sending Mail'.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3690 `mh-e-user-agent' -- use the Emacs interface to the MH mail system.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3691 See Info node `(mh-e)'.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3692 `message-user-agent' -- use the Gnus Message package.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3693 See Info node `(message)'.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3694 `gnus-user-agent' -- like `message-user-agent', but with Gnus
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3695 paraphernalia, particularly the Gcc: header for
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3696 archiving.
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3697
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3698 Additional valid symbols may be available; check with the author of
34687
48e5a31a2ff0 (mail-user-agent): Doc fix.
Dave Love <fx@gnu.org>
parents: 34619
diff changeset
3699 your package for details. The function should return non-nil if it
48e5a31a2ff0 (mail-user-agent): Doc fix.
Dave Love <fx@gnu.org>
parents: 34619
diff changeset
3700 succeeds.
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3701
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3702 See also `read-mail-command' concerning reading mail."
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3703 :type '(radio (function-item :tag "Default Emacs mail"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3704 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3705 sendmail-user-agent)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3706 (function-item :tag "Emacs interface to MH"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3707 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3708 mh-e-user-agent)
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3709 (function-item :tag "Gnus Message package"
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3710 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3711 message-user-agent)
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3712 (function-item :tag "Gnus Message with full Gnus features"
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3713 :format "%t\n"
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
3714 gnus-user-agent)
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3715 (function :tag "Other"))
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3716 :group 'mail)
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3717
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3718 (define-mail-user-agent 'sendmail-user-agent
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3719 'sendmail-user-agent-compose
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3720 '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
3721
21906
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3722 (defun rfc822-goto-eoh ()
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3723 ;; Go to header delimiter line in a mail message, following RFC822 rules
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3724 (goto-char (point-min))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3725 (when (re-search-forward
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3726 "^\\([:\n]\\|[^: \t\n]+[ \t\n]\\)" nil 'move)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3727 (goto-char (match-beginning 0))))
21906
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3728
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3729 (defun sendmail-user-agent-compose (&optional to subject other-headers continue
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3730 switch-function yank-action
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3731 send-actions)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3732 (if switch-function
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3733 (let ((special-display-buffer-names nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3734 (special-display-regexps nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3735 (same-window-buffer-names nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3736 (same-window-regexps nil))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3737 (funcall switch-function "*mail*")))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3738 (let ((cc (cdr (assoc-ignore-case "cc" other-headers)))
28491
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
3739 (in-reply-to (cdr (assoc-ignore-case "in-reply-to" other-headers)))
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
3740 (body (cdr (assoc-ignore-case "body" other-headers))))
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3741 (or (mail continue to subject in-reply-to cc yank-action send-actions)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3742 continue
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3743 (error "Message aborted"))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3744 (save-excursion
21906
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
3745 (rfc822-goto-eoh)
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3746 (while other-headers
28491
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
3747 (unless (member-ignore-case (car (car other-headers))
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
3748 '("in-reply-to" "cc" "body"))
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3749 (insert (car (car other-headers)) ": "
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3750 (cdr (car other-headers)) "\n"))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3751 (setq other-headers (cdr other-headers)))
28491
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
3752 (when body
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
3753 (forward-line 1)
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
3754 (insert body))
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3755 t)))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
3756
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
3757 (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
3758 '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
3759 'mh-before-send-letter-hook)
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3760
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3761 (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
3762 switch-function yank-action send-actions)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3763 "Start composing a mail message to send.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3764 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
3765 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
3766 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
3767 and the initial Subject field, respectively.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3768
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3769 OTHER-HEADERS is an alist specifying additional
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3770 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
3771 HEADER and VALUE are strings.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3772
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3773 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
3774 being composed.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3775
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3776 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
3777 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
3778
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3779 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
3780 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
3781 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
3782 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
3783 \(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
3784 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
3785
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3786 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
3787 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
3788 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3789 (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
3790 (let ((function (get mail-user-agent 'composefunc)))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3791 (funcall function to subject other-headers continue
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
3792 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
3793
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3794 (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
3795 yank-action send-actions)
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3796 "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
3797 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3798 (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
3799 (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
3800 '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
3801
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3802
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3803 (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
3804 yank-action send-actions)
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3805 "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
3806 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
3807 (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
3808 (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
3809 'switch-to-buffer-other-frame yank-action send-actions))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
3810
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3811 (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
3812 "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
3813
46845
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
3814 (defun set-variable (var val &optional make-local)
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3815 "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
3816 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
3817 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
3818 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
3819
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3820 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
3821 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
3822
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3823 If VARIABLE has been defined with `defcustom', then the type information
46845
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
3824 in the definition is used to check that VALUE is valid.
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
3825
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
3826 With a prefix argument, set VARIABLE to VALUE buffer-locally."
22157
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
3827 (interactive
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
3828 (let* ((default-var (variable-at-point))
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
3829 (var (if (symbolp default-var)
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
3830 (read-variable (format "Set variable (default %s): " default-var)
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
3831 default-var)
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
3832 (read-variable "Set variable: ")))
53097
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3833 (minibuffer-help-form '(describe-variable var))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3834 (prop (get var 'variable-interactive))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3835 (prompt (format "Set %s%s to value: " var
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3836 (cond ((local-variable-p var)
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3837 " (buffer-local)")
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3838 ((or current-prefix-arg
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3839 (local-variable-if-set-p var))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3840 " buffer-locally")
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3841 (t " globally"))))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3842 (val (if prop
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3843 ;; Use VAR's `variable-interactive' property
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3844 ;; as an interactive spec for prompting.
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3845 (call-interactively `(lambda (arg)
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3846 (interactive ,prop)
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3847 arg))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3848 (read
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3849 (read-string prompt nil
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3850 'set-variable-value-history)))))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
3851 (list var val current-prefix-arg)))
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3852
49103
7c84e7bb3879 (set-variable): Load deps of custom variables without type.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 49066
diff changeset
3853 (and (custom-variable-p var)
7c84e7bb3879 (set-variable): Load deps of custom variables without type.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 49066
diff changeset
3854 (not (get var 'custom-type))
7c84e7bb3879 (set-variable): Load deps of custom variables without type.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 49066
diff changeset
3855 (custom-load-symbol var))
17613
7dadfa677617 (set-variable): Simplify previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17606
diff changeset
3856 (let ((type (get var 'custom-type)))
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3857 (when type
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3858 ;; Match with custom type.
38432
4bbb59858499 (set-variable): Require 'cus-edit' instead of
Gerd Moellmann <gerd@gnu.org>
parents: 38027
diff changeset
3859 (require 'cus-edit)
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3860 (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
3861 (unless (widget-apply type :match val)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3862 (error "Value `%S' does not match type %S of %S"
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
3863 val (car type) var))))
46845
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
3864
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
3865 (if make-local
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
3866 (make-local-variable var))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
3867
35203
dcf1f0621dbb (set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents: 34909
diff changeset
3868 (set var val)
dcf1f0621dbb (set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents: 34909
diff changeset
3869
dcf1f0621dbb (set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents: 34909
diff changeset
3870 ;; Force a thorough redisplay for the case that the variable
dcf1f0621dbb (set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents: 34909
diff changeset
3871 ;; has an effect on the display, like `tab-width' has.
dcf1f0621dbb (set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents: 34909
diff changeset
3872 (force-mode-line-update))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
3873
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3874 ;; Define the major mode for lists of completions.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3875
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3876 (defvar completion-list-mode-map nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3877 "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
3878 (or completion-list-mode-map
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3879 (let ((map (make-sparse-keymap)))
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3880 (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
3881 (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
3882 (define-key map "\C-m" 'choose-completion)
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3883 (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
3884 (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
3885 (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
3886 (setq completion-list-mode-map map)))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3887
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3888 ;; 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
3889 (put 'completion-list-mode 'mode-class 'special)
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
3890
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3891 (defvar completion-reference-buffer nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3892 "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
3893 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
3894 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
3895
16924
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3896 (defvar completion-no-auto-exit nil
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3897 "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
3898 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
3899 and `mouse-choose-completion'.")
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
3900
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3901 (defvar completion-base-size nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3902 "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
3903 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
3904 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
3905 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
3906 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
3907
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3908 (defun delete-completion-window ()
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3909 "Delete the completion list window.
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3910 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
3911 (interactive)
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3912 (let ((buf completion-reference-buffer))
16851
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3913 (if (one-window-p t)
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3914 (if (window-dedicated-p (selected-window))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3915 (delete-frame (selected-frame)))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3916 (delete-window (selected-window))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3917 (if (get-buffer-window buf)
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
3918 (select-window (get-buffer-window buf))))))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
3919
10284
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3920 (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
3921 "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
3922 (interactive "p")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3923 (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
3924
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3925 (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
3926 "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
3927 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
3928 (interactive "p")
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3929 (let ((beg (point-min)) (end (point-max)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3930 (while (and (> n 0) (not (eobp)))
10284
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3931 ;; If in a completion, move to the end of it.
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3932 (when (get-text-property (point) 'mouse-face)
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3933 (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
3934 ;; Move to start of next one.
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3935 (unless (get-text-property (point) 'mouse-face)
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3936 (goto-char (next-single-property-change (point) 'mouse-face nil end)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3937 (setq n (1- n)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3938 (while (and (< n 0) (not (bobp)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3939 (let ((prop (get-text-property (1- (point)) 'mouse-face)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3940 ;; If in a completion, move to the start of it.
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3941 (when (and prop (eq prop (get-text-property (point) 'mouse-face)))
13171
ed9465203ed6 (next-completion): Specify the LIMIT arg when searching for text properties.
Richard M. Stallman <rms@gnu.org>
parents: 13137
diff changeset
3942 (goto-char (previous-single-property-change
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3943 (point) 'mouse-face nil beg)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3944 ;; Move to end of the previous completion.
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3945 (unless (or (bobp) (get-text-property (1- (point)) 'mouse-face))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3946 (goto-char (previous-single-property-change
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3947 (point) 'mouse-face nil beg)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3948 ;; Move to the start of that one.
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3949 (goto-char (previous-single-property-change
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3950 (point) 'mouse-face nil beg))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3951 (setq n (1+ n))))))
10284
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
3952
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3953 (defun choose-completion ()
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3954 "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
3955 (interactive)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3956 (let (beg end completion (buffer completion-reference-buffer)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3957 (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
3958 (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
3959 (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
3960 (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
3961 (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
3962 (if (null beg)
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3963 (error "No completion here"))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
3964 (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
3965 (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
3966 (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
3967 (let ((owindow (selected-window)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3968 (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
3969 (window-dedicated-p (selected-window)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3970 ;; 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
3971 (iconify-frame (selected-frame))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3972 (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
3973 (bury-buffer)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
3974 (select-window owindow))
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
3975 (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
3976
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3977 ;; 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
3978 ;; that can be found before POINT.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3979 (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
3980 (let ((opoint (point))
46516
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
3981 len)
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
3982 ;; Try moving back by the length of the string.
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
3983 (goto-char (max (- (point) (length string))
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
3984 (minibuffer-prompt-end)))
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
3985 ;; See how far back we were actually able to move. That is the
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
3986 ;; upper bound on how much we can match and delete.
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
3987 (setq len (- opoint (point)))
7574
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
3988 (if completion-ignore-case
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
3989 (setq string (downcase string)))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3990 (while (and (> len 0)
46516
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
3991 (let ((tail (buffer-substring (point) opoint)))
7574
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
3992 (if completion-ignore-case
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
3993 (setq tail (downcase tail)))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3994 (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
3995 (setq len (1- len))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3996 (forward-char 1))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3997 (delete-char len)))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
3998
45607
98941f178aa2 (choose-completion-string-functions): New special hook.
Kim F. Storm <storm@cua.dk>
parents: 45586
diff changeset
3999 (defvar choose-completion-string-functions nil
45612
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4000 "Functions that may override the normal insertion of a completion choice.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4001 These functions are called in order with four arguments:
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4002 CHOICE - the string to insert in the buffer,
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4003 BUFFER - the buffer in which the choice should be inserted,
47266
b8ac98a8d336 (choose-completion-string-functions): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents: 47182
diff changeset
4004 MINI-P - non-nil iff BUFFER is a minibuffer, and
45615
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4005 BASE-SIZE - the number of characters in BUFFER before
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4006 the string being completed.
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4007
45612
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4008 If a function in the list returns non-nil, that function is supposed
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4009 to have inserted the CHOICE in the BUFFER, and possibly exited
45615
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4010 the minibuffer; no further functions will be called.
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4011
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4012 If all functions in the list return nil, that means to use
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4013 the default method of inserting the completion in BUFFER.")
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4014
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
4015 (defun choose-completion-string (choice &optional buffer base-size)
45615
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4016 "Switch to BUFFER and insert the completion choice CHOICE.
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4017 BASE-SIZE, if non-nil, says how many characters of BUFFER's text
46409
cb5bcb2c81ee (choose-completion-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 46175
diff changeset
4018 to keep. If it is nil, we call `choose-completion-delete-max-match'
cb5bcb2c81ee (choose-completion-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 46175
diff changeset
4019 to decide what to delete."
45615
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4020
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4021 ;; If BUFFER is the minibuffer, exit the minibuffer
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4022 ;; unless it is reading a file name and CHOICE is a directory,
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4023 ;; or completion-no-auto-exit is non-nil.
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4024
52046
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
4025 (let* ((buffer (or buffer completion-reference-buffer))
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
4026 (mini-p (minibufferp buffer)))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
4027 ;; 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
4028 ;; active minibuffer.
27050
5c0c5089979c (choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents: 26884
diff changeset
4029 (if (and mini-p
11159
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
4030 (or (not (active-minibuffer-window))
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
4031 (not (equal buffer
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
4032 (window-buffer (active-minibuffer-window))))))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
4033 (error "Minibuffer is not active for completion")
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
4034 (unless (run-hook-with-args-until-success
47346
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
4035 'choose-completion-string-functions
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
4036 choice buffer mini-p base-size)
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
4037 ;; Insert the completion into the buffer where it was requested.
45612
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4038 (set-buffer buffer)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4039 (if base-size
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4040 (delete-region (+ base-size (if mini-p
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4041 (minibuffer-prompt-end)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4042 (point-min)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4043 (point))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4044 (choose-completion-delete-max-match choice))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4045 (insert choice)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4046 (remove-text-properties (- (point) (length choice)) (point)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4047 '(mouse-face nil))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4048 ;; Update point in the window that BUFFER is showing in.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4049 (let ((window (get-buffer-window buffer t)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4050 (set-window-point window (point)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4051 ;; If completing for the minibuffer, exit it with this choice.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4052 (and (not completion-no-auto-exit)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4053 (equal buffer (window-buffer (minibuffer-window)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4054 minibuffer-completion-table
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4055 ;; If this is reading a file name, and the file name chosen
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4056 ;; is a directory, don't exit the minibuffer.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4057 (if (and (eq minibuffer-completion-table 'read-file-name-internal)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4058 (file-directory-p (field-string (point-max))))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4059 (let ((mini (active-minibuffer-window)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4060 (select-window mini)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4061 (when minibuffer-auto-raise
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4062 (raise-frame (window-frame mini))))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4063 (exit-minibuffer)))))))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4064
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
4065 (defun completion-list-mode ()
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4066 "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
4067 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
4068 to select the completion near point.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4069 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
4070 with the mouse."
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4071 (interactive)
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4072 (kill-all-local-variables)
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
4073 (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
4074 (setq mode-name "Completion List")
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
4075 (setq major-mode 'completion-list-mode)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
4076 (make-local-variable 'completion-base-size)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
4077 (setq completion-base-size nil)
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
4078 (run-hooks 'completion-list-mode-hook))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4079
37300
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4080 (defun completion-list-mode-finish ()
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4081 "Finish setup of the completions buffer.
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4082 Called from `temp-buffer-show-hook'."
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4083 (when (eq major-mode 'completion-list-mode)
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4084 (toggle-read-only 1)))
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4085
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4086 (add-hook 'temp-buffer-show-hook 'completion-list-mode-finish)
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4087
20482
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
4088 (defvar completion-setup-hook nil
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
4089 "Normal hook run at the end of setting up a completion list buffer.
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
4090 When this hook is run, the current buffer is the one in which the
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
4091 command to display the completion list buffer was run.
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
4092 The completion list buffer is available as the value of `standard-output'.")
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
4093
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
4094 ;; 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
4095 ;; 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
4096
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4097 (defun completion-setup-function ()
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4098 (save-excursion
49336
d4e6f40cba36 (completion-setup-function): Set default-directory
Richard M. Stallman <rms@gnu.org>
parents: 49312
diff changeset
4099 (let ((mainbuf (current-buffer))
d4e6f40cba36 (completion-setup-function): Set default-directory
Richard M. Stallman <rms@gnu.org>
parents: 49312
diff changeset
4100 (mbuf-contents (minibuffer-contents)))
d4e6f40cba36 (completion-setup-function): Set default-directory
Richard M. Stallman <rms@gnu.org>
parents: 49312
diff changeset
4101 ;; When reading a file name in the minibuffer,
d4e6f40cba36 (completion-setup-function): Set default-directory
Richard M. Stallman <rms@gnu.org>
parents: 49312
diff changeset
4102 ;; set default-directory in the minibuffer
d4e6f40cba36 (completion-setup-function): Set default-directory
Richard M. Stallman <rms@gnu.org>
parents: 49312
diff changeset
4103 ;; so it will get copied into the completion list buffer.
d4e6f40cba36 (completion-setup-function): Set default-directory
Richard M. Stallman <rms@gnu.org>
parents: 49312
diff changeset
4104 (if minibuffer-completing-file-name
d4e6f40cba36 (completion-setup-function): Set default-directory
Richard M. Stallman <rms@gnu.org>
parents: 49312
diff changeset
4105 (with-current-buffer mainbuf
d4e6f40cba36 (completion-setup-function): Set default-directory
Richard M. Stallman <rms@gnu.org>
parents: 49312
diff changeset
4106 (setq default-directory (file-name-directory mbuf-contents))))
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4107 (set-buffer standard-output)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4108 (completion-list-mode)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4109 (make-local-variable 'completion-reference-buffer)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4110 (setq completion-reference-buffer mainbuf)
48628
113fc3ea0bfb (completion-setup-function): Fix last change to use
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48620
diff changeset
4111 (if minibuffer-completing-file-name
18034
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4112 ;; For file name completion,
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4113 ;; use the number of chars before the start of the
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4114 ;; last file name component.
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4115 (setq completion-base-size
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4116 (save-excursion
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4117 (set-buffer mainbuf)
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4118 (goto-char (point-max))
47182
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
4119 (skip-chars-backward "^/")
27096
e200e2db8e99 (completion-setup-function): Count completion-size
Eli Zaretskii <eliz@gnu.org>
parents: 27050
diff changeset
4120 (- (point) (minibuffer-prompt-end))))
19227
84c681e58fd5 (completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents: 19160
diff changeset
4121 ;; Otherwise, in minibuffer, the whole input is being completed.
84c681e58fd5 (completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents: 19160
diff changeset
4122 (save-match-data
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4123 (if (minibufferp mainbuf)
19227
84c681e58fd5 (completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents: 19160
diff changeset
4124 (setq completion-base-size 0))))
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4125 (goto-char (point-min))
28113
bfff8ed76f1c (completion-setup-function): Use display-color-p.
Dave Love <fx@gnu.org>
parents: 27836
diff changeset
4126 (if (display-mouse-p)
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4127 (insert (substitute-command-keys
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4128 "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
4129 (insert (substitute-command-keys
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4130 "In this buffer, type \\[choose-completion] to \
23450
085606778286 (completion-fixup-function): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 23447
diff changeset
4131 select the completion near point.\n\n")))))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4132
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4133 (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
4134
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4135 (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
4136 '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
4137 (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
4138 '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
4139 (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
4140 '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
4141 (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
4142 '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
4143
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4144 (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
4145 "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
4146 (interactive)
12483
ec77cb3940f1 (switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents: 12428
diff changeset
4147 ;; 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
4148 (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
4149 (minibuffer-completion-help))
20663
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4150 (let ((window (get-buffer-window "*Completions*")))
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4151 (when window
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4152 (select-window window)
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4153 (goto-char (point-min))
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4154 (search-forward "\n\n")
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4155 (forward-line 1))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
4156
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4157 ;; Support keyboard commands to turn on various modifiers.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4158
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4159 ;; 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
4160 ;; to the following event.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4161
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4162 (defun event-apply-alt-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4163 "\\<function-key-map>Add the Alt modifier to the following event.
22324
0c5b61cb97c0 (event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22304
diff changeset
4164 For example, type \\[event-apply-alt-modifier] & to enter Alt-&."
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4165 (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
4166 (defun event-apply-super-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4167 "\\<function-key-map>Add the Super modifier to the following event.
22324
0c5b61cb97c0 (event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22304
diff changeset
4168 For example, type \\[event-apply-super-modifier] & to enter Super-&."
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4169 (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
4170 (defun event-apply-hyper-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4171 "\\<function-key-map>Add the Hyper modifier to the following event.
22324
0c5b61cb97c0 (event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22304
diff changeset
4172 For example, type \\[event-apply-hyper-modifier] & to enter Hyper-&."
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4173 (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
4174 (defun event-apply-shift-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4175 "\\<function-key-map>Add the Shift modifier to the following event.
22324
0c5b61cb97c0 (event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22304
diff changeset
4176 For example, type \\[event-apply-shift-modifier] & to enter Shift-&."
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4177 (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
4178 (defun event-apply-control-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4179 "\\<function-key-map>Add the Ctrl modifier to the following event.
22324
0c5b61cb97c0 (event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22304
diff changeset
4180 For example, type \\[event-apply-control-modifier] & to enter Ctrl-&."
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4181 (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
4182 (defun event-apply-meta-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4183 "\\<function-key-map>Add the Meta modifier to the following event.
22324
0c5b61cb97c0 (event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 22304
diff changeset
4184 For example, type \\[event-apply-meta-modifier] & to enter Meta-&."
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4185 (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
4186
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4187 (defun event-apply-modifier (event symbol lshiftby prefix)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4188 "Apply a modifier flag to event EVENT.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4189 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
4190 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
4191 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
4192 (if (numberp event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4193 (cond ((eq symbol 'control)
11201
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
4194 (if (and (<= (downcase event) ?z)
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
4195 (>= (downcase event) ?a))
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4196 (- (downcase event) ?a -1)
11201
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
4197 (if (and (<= (downcase event) ?Z)
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
4198 (>= (downcase event) ?A))
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4199 (- (downcase event) ?A -1)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4200 (logior (lsh 1 lshiftby) event))))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4201 ((eq symbol 'shift)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4202 (if (and (<= (downcase event) ?z)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4203 (>= (downcase event) ?a))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4204 (upcase event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4205 (logior (lsh 1 lshiftby) event)))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4206 (t
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4207 (logior (lsh 1 lshiftby) event)))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4208 (if (memq symbol (event-modifiers event))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4209 event
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4210 (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
4211 (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
4212 (if (symbolp event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4213 event-type
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4214 (cons event-type (cdr event)))))))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4215
11206
60b7ab7d4fec Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents: 11201
diff changeset
4216 (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
4217 (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
4218 (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
4219 (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
4220 (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
4221 (define-key function-key-map [?\C-x ?@ ?c] 'event-apply-control-modifier)
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
4222
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4223 ;;;; Keypad support.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4224
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4225 ;;; 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
4226 ;;; 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
4227 ;;; 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
4228 ;;; bindings.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4229
5342
f38861038093 (setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents: 5324
diff changeset
4230 ;; Also tell read-char how to handle these keys.
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4231 (mapc
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4232 (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
4233 (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
4234 (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
4235 (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
4236 (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
4237 '((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
4238 (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
4239 (kp-space ?\ )
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4240 (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
4241 (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
4242 (kp-multiply ?*)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4243 (kp-add ?+)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4244 (kp-separator ?,)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4245 (kp-subtract ?-)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4246 (kp-decimal ?.)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4247 (kp-divide ?/)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4248 (kp-equal ?=)))
44906
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
4249
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
4250 ;;;;
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4251 ;;;; forking a twin copy of a buffer.
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
4252 ;;;;
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4253
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4254 (defvar clone-buffer-hook nil
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4255 "Normal hook to run in the new buffer at the end of `clone-buffer'.")
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4256
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4257 (defun clone-process (process &optional newname)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4258 "Create a twin copy of PROCESS.
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4259 If NEWNAME is nil, it defaults to PROCESS' name;
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4260 NEWNAME is modified by adding or incrementing <N> at the end as necessary.
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4261 If PROCESS is associated with a buffer, the new process will be associated
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4262 with the current buffer instead.
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4263 Returns nil if PROCESS has already terminated."
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4264 (setq newname (or newname (process-name process)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4265 (if (string-match "<[0-9]+>\\'" newname)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4266 (setq newname (substring newname 0 (match-beginning 0))))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4267 (when (memq (process-status process) '(run stop open))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4268 (let* ((process-connection-type (process-tty-name process))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4269 (new-process
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4270 (if (memq (process-status process) '(open))
43969
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
4271 (let ((args (process-contact process t)))
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
4272 (setq args (plist-put args :name newname))
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
4273 (setq args (plist-put args :buffer
49227
b03a9c537356 (clone-process): Copy process' plist to new process.
Kim F. Storm <storm@cua.dk>
parents: 49103
diff changeset
4274 (if (process-buffer process)
b03a9c537356 (clone-process): Copy process' plist to new process.
Kim F. Storm <storm@cua.dk>
parents: 49103
diff changeset
4275 (current-buffer))))
43969
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
4276 (apply 'make-network-process args))
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4277 (apply 'start-process newname
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4278 (if (process-buffer process) (current-buffer))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4279 (process-command process)))))
43969
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
4280 (set-process-query-on-exit-flag
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
4281 new-process (process-query-on-exit-flag process))
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4282 (set-process-inherit-coding-system-flag
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4283 new-process (process-inherit-coding-system-flag process))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4284 (set-process-filter new-process (process-filter process))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4285 (set-process-sentinel new-process (process-sentinel process))
49227
b03a9c537356 (clone-process): Copy process' plist to new process.
Kim F. Storm <storm@cua.dk>
parents: 49103
diff changeset
4286 (set-process-plist new-process (copy-sequence (process-plist process)))
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4287 new-process)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4288
44152
cd705768cbe9 Fix typo.
Pavel Janík <Pavel@Janik.cz>
parents: 44070
diff changeset
4289 ;; things to maybe add (currently partly covered by `funcall mode'):
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4290 ;; - syntax-table
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4291 ;; - overlays
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4292 (defun clone-buffer (&optional newname display-flag)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4293 "Create a twin copy of the current buffer.
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4294 If NEWNAME is nil, it defaults to the current buffer's name;
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4295 NEWNAME is modified by adding or incrementing <N> at the end as necessary.
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4296
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4297 If DISPLAY-FLAG is non-nil, the new buffer is shown with `pop-to-buffer'.
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4298 This runs the normal hook `clone-buffer-hook' in the new buffer
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4299 after it has been set up properly in other respects."
40966
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4300 (interactive
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4301 (progn
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4302 (if buffer-file-name
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4303 (error "Cannot clone a file-visiting buffer"))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4304 (if (get major-mode 'no-clone)
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4305 (error "Cannot clone a buffer in %s mode" mode-name))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4306 (list (if current-prefix-arg (read-string "Name: "))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4307 t)))
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4308 (if buffer-file-name
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4309 (error "Cannot clone a file-visiting buffer"))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4310 (if (get major-mode 'no-clone)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4311 (error "Cannot clone a buffer in %s mode" mode-name))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4312 (setq newname (or newname (buffer-name)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4313 (if (string-match "<[0-9]+>\\'" newname)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4314 (setq newname (substring newname 0 (match-beginning 0))))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4315 (let ((buf (current-buffer))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4316 (ptmin (point-min))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4317 (ptmax (point-max))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4318 (pt (point))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4319 (mk (if mark-active (mark t)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4320 (modified (buffer-modified-p))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4321 (mode major-mode)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4322 (lvars (buffer-local-variables))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4323 (process (get-buffer-process (current-buffer)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4324 (new (generate-new-buffer (or newname (buffer-name)))))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4325 (save-restriction
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4326 (widen)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4327 (with-current-buffer new
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4328 (insert-buffer-substring buf)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4329 (with-current-buffer new
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4330 (narrow-to-region ptmin ptmax)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4331 (goto-char pt)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4332 (if mk (set-mark mk))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4333 (set-buffer-modified-p modified)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4334
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4335 ;; Clone the old buffer's process, if any.
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4336 (when process (clone-process process))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4337
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4338 ;; Now set up the major mode.
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4339 (funcall mode)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4340
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4341 ;; Set up other local variables.
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4342 (mapcar (lambda (v)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4343 (condition-case () ;in case var is read-only
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4344 (if (symbolp v)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4345 (makunbound v)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4346 (set (make-local-variable (car v)) (cdr v)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4347 (error nil)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4348 lvars)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4349
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4350 ;; Run any hooks (typically set up by the major mode
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4351 ;; for cloning to work properly).
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4352 (run-hooks 'clone-buffer-hook))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4353 (if display-flag (pop-to-buffer new))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4354 new))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4355
28624
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4356
28659
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4357 (defun clone-indirect-buffer (newname display-flag &optional norecord)
28624
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4358 "Create an indirect buffer that is a twin copy of the current buffer.
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4359
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4360 Give the indirect buffer name NEWNAME. Interactively, read NEW-NAME
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4361 from the minibuffer when invoked with a prefix arg. If NEWNAME is nil
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4362 or if not called with a prefix arg, NEWNAME defaults to the current
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4363 buffer's name. The name is modified by adding a `<N>' suffix to it
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4364 or by incrementing the N in an existing suffix.
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4365
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4366 DISPLAY-FLAG non-nil means show the new buffer with `pop-to-buffer'.
28659
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4367 This is always done when called interactively.
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4368
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4369 Optional last arg NORECORD non-nil means do not put this buffer at the
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4370 front of the list of recently selected ones."
40966
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4371 (interactive
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4372 (progn
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4373 (if (get major-mode 'no-clone-indirect)
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4374 (error "Cannot indirectly clone a buffer in %s mode" mode-name))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4375 (list (if current-prefix-arg
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4376 (read-string "BName of indirect buffer: "))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4377 t)))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4378 (if (get major-mode 'no-clone-indirect)
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
4379 (error "Cannot indirectly clone a buffer in %s mode" mode-name))
28624
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4380 (setq newname (or newname (buffer-name)))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4381 (if (string-match "<[0-9]+>\\'" newname)
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4382 (setq newname (substring newname 0 (match-beginning 0))))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4383 (let* ((name (generate-new-buffer-name newname))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4384 (buffer (make-indirect-buffer (current-buffer) name t)))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4385 (when display-flag
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
4386 (pop-to-buffer buffer norecord))
28624
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4387 buffer))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4388
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
4389
28659
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4390 (defun clone-indirect-buffer-other-window (buffer &optional norecord)
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4391 "Create an indirect buffer that is a twin copy of BUFFER.
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4392 Select the new buffer in another window.
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4393 Optional second arg NORECORD non-nil means do not put this buffer at
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4394 the front of the list of recently selected ones."
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4395 (interactive "bClone buffer in other window: ")
45064
6e3c5d67f0fe (clone-indirect-buffer-other-window): Fix a typo in `pop-up-window'.
Eli Zaretskii <eliz@gnu.org>
parents: 44981
diff changeset
4396 (let ((pop-up-windows t))
28659
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4397 (set-buffer buffer)
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4398 (clone-indirect-buffer nil t norecord)))
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
4399
28661
f78d389c773c Fix typo in key binding of clone-indirect-buffer-other-window.
Gerd Moellmann <gerd@gnu.org>
parents: 28659
diff changeset
4400 (define-key ctl-x-4-map "c" 'clone-indirect-buffer-other-window)
44906
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
4401
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4402 ;;; Handling of Backspace and Delete keys.
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4403
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4404 (defcustom normal-erase-is-backspace nil
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4405 "If non-nil, Delete key deletes forward and Backspace key deletes backward.
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4406
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4407 On window systems, the default value of this option is chosen
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4408 according to the keyboard used. If the keyboard has both a Backspace
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4409 key and a Delete key, and both are mapped to their usual meanings, the
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4410 option's default value is set to t, so that Backspace can be used to
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4411 delete backward, and Delete can be used to delete forward.
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4412
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4413 If not running under a window system, customizing this option accomplishes
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4414 a similar effect by mapping C-h, which is usually generated by the
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4415 Backspace key, to DEL, and by mapping DEL to C-d via
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4416 `keyboard-translate'. The former functionality of C-h is available on
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4417 the F1 key. You should probably not use this setting if you don't
34827
0f079e057295 (delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34713
diff changeset
4418 have both Backspace, Delete and F1 keys.
0f079e057295 (delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34713
diff changeset
4419
0f079e057295 (delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34713
diff changeset
4420 Setting this variable with setq doesn't take effect. Programmatically,
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4421 call `normal-erase-is-backspace-mode' (which see) instead."
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4422 :type 'boolean
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4423 :group 'editing-basics
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4424 :version "21.1"
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4425 :set (lambda (symbol value)
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4426 ;; The fboundp is because of a problem with :set when
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4427 ;; dumping Emacs. It doesn't really matter.
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4428 (if (fboundp 'normal-erase-is-backspace-mode)
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4429 (normal-erase-is-backspace-mode (or value 0))
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4430 (set-default symbol value))))
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4431
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4432
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4433 (defun normal-erase-is-backspace-mode (&optional arg)
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4434 "Toggle the Erase and Delete mode of the Backspace and Delete keys.
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4435
37248
dadde28d1d99 (normal-erase-is-backspace-mode): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37194
diff changeset
4436 With numeric arg, turn the mode on if and only if ARG is positive.
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4437
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4438 On window systems, when this mode is on, Delete is mapped to C-d and
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4439 Backspace is mapped to DEL; when this mode is off, both Delete and
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4440 Backspace are mapped to DEL. (The remapping goes via
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4441 `function-key-map', so binding Delete or Backspace in the global or
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4442 local keymap will override that.)
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4443
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4444 In addition, on window systems, the bindings of C-Delete, M-Delete,
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4445 C-M-Delete, C-Backspace, M-Backspace, and C-M-Backspace are changed in
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4446 the global keymap in accordance with the functionality of Delete and
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4447 Backspace. For example, if Delete is remapped to C-d, which deletes
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4448 forward, C-Delete is bound to `kill-word', but if Delete is remapped
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4449 to DEL, which deletes backward, C-Delete is bound to
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4450 `backward-kill-word'.
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4451
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4452 If not running on a window system, a similar effect is accomplished by
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4453 remapping C-h (normally produced by the Backspace key) and DEL via
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4454 `keyboard-translate': if this mode is on, C-h is mapped to DEL and DEL
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4455 to C-d; if it's off, the keys are not remapped.
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4456
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4457 When not running on a window system, and this mode is turned on, the
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4458 former functionality of C-h is available on the F1 key. You should
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4459 probably not turn on this mode on a text-only terminal if you don't
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4460 have both Backspace, Delete and F1 keys.
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4461
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4462 See also `normal-erase-is-backspace'."
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4463 (interactive "P")
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4464 (setq normal-erase-is-backspace
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4465 (if arg
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4466 (> (prefix-numeric-value arg) 0)
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4467 (not normal-erase-is-backspace)))
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4468
34570
f6aeb731a068 (delete-key-deletes-forward-mode): Treat ms-dos and
Eli Zaretskii <eliz@gnu.org>
parents: 34553
diff changeset
4469 (cond ((or (memq window-system '(x w32 mac pc))
f6aeb731a068 (delete-key-deletes-forward-mode): Treat ms-dos and
Eli Zaretskii <eliz@gnu.org>
parents: 34553
diff changeset
4470 (memq system-type '(ms-dos windows-nt)))
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4471 (let ((bindings
36030
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4472 `(([C-delete] [C-backspace])
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4473 ([M-delete] [M-backspace])
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4474 ([C-M-delete] [C-M-backspace])
35346
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
4475 (,esc-map
36030
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4476 [C-delete] [C-backspace])))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4477 (old-state (lookup-key function-key-map [delete])))
35346
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
4478
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4479 (if normal-erase-is-backspace
35346
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
4480 (progn
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
4481 (define-key function-key-map [delete] [?\C-d])
35776
7ae7252c53c9 (delete-key-deletes-forward-mode): Treat `kp-delete'
Gerd Moellmann <gerd@gnu.org>
parents: 35709
diff changeset
4482 (define-key function-key-map [kp-delete] [?\C-d])
35346
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
4483 (define-key function-key-map [backspace] [?\C-?]))
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
4484 (define-key function-key-map [delete] [?\C-?])
35776
7ae7252c53c9 (delete-key-deletes-forward-mode): Treat `kp-delete'
Gerd Moellmann <gerd@gnu.org>
parents: 35709
diff changeset
4485 (define-key function-key-map [kp-delete] [?\C-?])
35346
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
4486 (define-key function-key-map [backspace] [?\C-?]))
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
4487
36030
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4488 ;; Maybe swap bindings of C-delete and C-backspace, etc.
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4489 (unless (equal old-state (lookup-key function-key-map [delete]))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4490 (dolist (binding bindings)
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4491 (let ((map global-map))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4492 (when (keymapp (car binding))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4493 (setq map (car binding) binding (cdr binding)))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4494 (let* ((key1 (nth 0 binding))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4495 (key2 (nth 1 binding))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4496 (binding1 (lookup-key map key1))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4497 (binding2 (lookup-key map key2)))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4498 (define-key map key1 binding2)
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
4499 (define-key map key2 binding1)))))))
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4500 (t
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4501 (if normal-erase-is-backspace
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4502 (progn
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4503 (keyboard-translate ?\C-h ?\C-?)
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4504 (keyboard-translate ?\C-? ?\C-d))
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4505 (keyboard-translate ?\C-h ?\C-h)
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4506 (keyboard-translate ?\C-? ?\C-?))))
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4507
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4508 (run-hooks 'normal-erase-is-backspace-hook)
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
4509 (if (interactive-p)
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4510 (message "Delete key deletes %s"
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
4511 (if normal-erase-is-backspace "forward" "backward"))))
51220
c7730f2ad484 (idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 51219
diff changeset
4512
c7730f2ad484 (idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 51219
diff changeset
4513 (defcustom idle-update-delay 0.5
c7730f2ad484 (idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 51219
diff changeset
4514 "*Idle time delay before updating various things on the screen.
c7730f2ad484 (idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 51219
diff changeset
4515 Various Emacs features that update auxiliary information when point moves
c7730f2ad484 (idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 51219
diff changeset
4516 wait this many seconds after Emacs becomes idle before doing an update."
c7730f2ad484 (idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 51219
diff changeset
4517 :type 'number
c7730f2ad484 (idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 51219
diff changeset
4518 :group 'display
c7730f2ad484 (idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 51219
diff changeset
4519 :version "21.4")
51597
9b14210f4740 (vis-mode): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51461
diff changeset
4520
51606
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
4521 (defvar vis-mode-saved-buffer-invisibility-spec nil
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
4522 "Saved value of `buffer-invisibility-spec' when Visible mode is on.")
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
4523
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
4524 (define-minor-mode visible-mode
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
4525 "Toggle Visible mode.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
4526 With argument ARG turn Visible mode on iff ARG is positive.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
4527
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
4528 Enabling Visible mode makes all invisible text temporarily visible.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
4529 Disabling Visible mode turns off that effect. Visible mode
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
4530 works by saving the value of `buffer-invisibility-spec' and setting it to nil."
51597
9b14210f4740 (vis-mode): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51461
diff changeset
4531 :lighter " Vis"
51606
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
4532 (when (local-variable-p 'vis-mode-saved-buffer-invisibility-spec)
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
4533 (setq buffer-invisibility-spec vis-mode-saved-buffer-invisibility-spec)
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
4534 (kill-local-variable 'vis-mode-saved-buffer-invisibility-spec))
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
4535 (when visible-mode
51606
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
4536 (set (make-local-variable 'vis-mode-saved-buffer-invisibility-spec)
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
4537 buffer-invisibility-spec)
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
4538 (setq buffer-invisibility-spec nil)))
51597
9b14210f4740 (vis-mode): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51461
diff changeset
4539
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4540 ;; Minibuffer prompt stuff.
39271
d56dcab29cce (minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents: 39157
diff changeset
4541
39289
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4542 ;(defun minibuffer-prompt-modification (start end)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4543 ; (error "You cannot modify the prompt"))
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4544 ;
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4545 ;
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4546 ;(defun minibuffer-prompt-insertion (start end)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4547 ; (let ((inhibit-modification-hooks t))
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4548 ; (delete-region start end)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4549 ; ;; Discard undo information for the text insertion itself
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4550 ; ;; and for the text deletion.above.
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4551 ; (when (consp buffer-undo-list)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4552 ; (setq buffer-undo-list (cddr buffer-undo-list)))
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4553 ; (message "You cannot modify the prompt")))
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4554 ;
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4555 ;
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
4556 ;(setq minibuffer-prompt-properties
39289
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4557 ; (list 'modification-hooks '(minibuffer-prompt-modification)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
4558 ; 'insert-in-front-hooks '(minibuffer-prompt-insertion)))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
4559 ;
39271
d56dcab29cce (minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents: 39157
diff changeset
4560
47462
1bbef0cbbf67 Provide `simple'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47408
diff changeset
4561 (provide 'simple)
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52367
diff changeset
4562
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52367
diff changeset
4563 ;;; arch-tag: 24af67c0-2a49-44f6-b3b1-312d8b570dfd
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
4564 ;;; simple.el ends here